From ba5aaf897a3b50eee328857d6574dc83317b6744 Mon Sep 17 00:00:00 2001
From: DFHack-Urist via GitHub Actions
 <63161697+DFHack-Urist@users.noreply.github.com>
Date: Thu, 21 Apr 2022 07:17:14 +0000
Subject: [PATCH 001/854] Auto-update submodules

scripts: master
---
 scripts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts b/scripts
index cb9ec474d..ca963c935 160000
--- a/scripts
+++ b/scripts
@@ -1 +1 @@
-Subproject commit cb9ec474da608db8c7a53fda9bcb921d23c6cc13
+Subproject commit ca963c935c3375a1cf3076b066df44867edf1166

From 9c9a7ef99abf773bfc7b2e52c7ff33e10dc03c16 Mon Sep 17 00:00:00 2001
From: Josh Cooper <cooper.s.josh@outlook.com>
Date: Thu, 21 Apr 2022 18:13:23 -0700
Subject: [PATCH 002/854] Adds consistent interface signatures for Maps module

---
 library/include/modules/Maps.h | 14 ++++---
 library/modules/Maps.cpp       | 67 +++++++++++++++++++++++++++-------
 2 files changed, 62 insertions(+), 19 deletions(-)

diff --git a/library/include/modules/Maps.h b/library/include/modules/Maps.h
index bc6298601..225efae17 100644
--- a/library/include/modules/Maps.h
+++ b/library/include/modules/Maps.h
@@ -233,7 +233,8 @@ extern DFHACK_EXPORT bool ReadGeology(std::vector<std::vector<int16_t> > *layer_
 /**
  * Get pointers to features of a block
  */
-extern DFHACK_EXPORT bool ReadFeatures(uint32_t x, uint32_t y, uint32_t z, t_feature * local, t_feature * global);
+extern DFHACK_EXPORT bool ReadFeatures(int32_t x, int32_t y, int32_t z, t_feature * local, t_feature * global);
+extern DFHACK_EXPORT bool ReadFeatures(uint32_t x, uint32_t y, uint32_t z, t_feature * local, t_feature * global); // todo: deprecate me
 /**
  * Get pointers to features of an already read block
  */
@@ -242,7 +243,7 @@ extern DFHACK_EXPORT bool ReadFeatures(df::map_block * block,t_feature * local,
 
 /**
  * Get a pointer to a specific global feature directly.
- */
+*/
 DFHACK_EXPORT df::feature_init *getGlobalInitFeature(int32_t index);
 /**
  * Get a pointer to a specific local feature directly. rgn_coord is in the world region grid.
@@ -261,9 +262,11 @@ extern DFHACK_EXPORT bool GetGlobalFeature(t_feature &feature, int32_t index);
  */
 
 /// get size of the map in blocks
-extern DFHACK_EXPORT void getSize(uint32_t& x, uint32_t& y, uint32_t& z);
+extern DFHACK_EXPORT void getSize(int32_t& x, int32_t& y, int32_t& z);
+extern DFHACK_EXPORT void getSize(uint32_t& x, uint32_t& y, uint32_t& z); // todo: deprecate me
 /// get size of the map in tiles
-extern DFHACK_EXPORT void getTileSize(uint32_t& x, uint32_t& y, uint32_t& z);
+extern DFHACK_EXPORT void getTileSize(int32_t& x, int32_t& y, int32_t& z);
+extern DFHACK_EXPORT void getTileSize(uint32_t& x, uint32_t& y, uint32_t& z); // todo: deprecate me
 /// get the position of the map on world map
 extern DFHACK_EXPORT void getPosition(int32_t& x, int32_t& y, int32_t& z);
 
@@ -333,7 +336,8 @@ extern DFHACK_EXPORT bool SortBlockEvents(df::map_block *block,
 );
 
 /// remove a block event from the block by address
-extern DFHACK_EXPORT bool RemoveBlockEvent(uint32_t x, uint32_t y, uint32_t z, df::block_square_event * which );
+extern DFHACK_EXPORT bool RemoveBlockEvent(int32_t x, int32_t y, int32_t z, df::block_square_event * which );
+extern DFHACK_EXPORT bool RemoveBlockEvent(uint32_t x, uint32_t y, uint32_t z, df::block_square_event * which ); // todo: deprecate me
 
 DFHACK_EXPORT bool canWalkBetween(df::coord pos1, df::coord pos2);
 DFHACK_EXPORT bool canStepBetween(df::coord pos1, df::coord pos2);
diff --git a/library/modules/Maps.cpp b/library/modules/Maps.cpp
index 889a40104..06f8c9673 100644
--- a/library/modules/Maps.cpp
+++ b/library/modules/Maps.cpp
@@ -107,9 +107,9 @@ bool Maps::IsValid ()
 }
 
 // getter for map size in blocks
-void Maps::getSize (uint32_t& x, uint32_t& y, uint32_t& z)
+inline void getSizeInline (int32_t& x, int32_t& y, int32_t& z)
 {
-    if (!IsValid())
+    if (!Maps::IsValid())
     {
         x = y = z = 0;
         return;
@@ -118,14 +118,38 @@ void Maps::getSize (uint32_t& x, uint32_t& y, uint32_t& z)
     y = world->map.y_count_block;
     z = world->map.z_count_block;
 }
+void Maps::getSize (int32_t& x, int32_t& y, int32_t& z)
+{
+    getSizeInline(x, y, z);
+}
+void Maps::getSize (uint32_t& x, uint32_t& y, uint32_t& z) //todo: deprecate me
+{
+    int32_t sx, sy, sz;
+    getSizeInline(sx, sy, sz);
+    x = uint32_t(sx);
+    y = uint32_t(sy);
+    z = uint32_t(sz);
+}
 
 // getter for map size in tiles
-void Maps::getTileSize (uint32_t& x, uint32_t& y, uint32_t& z)
+inline void getTileSizeInline (int32_t& x, int32_t& y, int32_t& z)
 {
-    getSize(x, y, z);
+    getSizeInline(x, y, z);
     x *= 16;
     y *= 16;
 }
+void Maps::getTileSize (int32_t& x, int32_t& y, int32_t& z)
+{
+    getTileSizeInline(x, y, z);
+}
+void Maps::getTileSize (uint32_t& x, uint32_t& y, uint32_t& z) //todo: deprecate me
+{
+    int32_t sx, sy, sz;
+    getTileSizeInline(sx, sy, sz);
+    x = uint32_t(sx);
+    y = uint32_t(sy);
+    z = uint32_t(sz);
+}
 
 // getter for map position
 void Maps::getPosition (int32_t& x, int32_t& y, int32_t& z)
@@ -375,12 +399,20 @@ bool GetLocalFeature(t_feature &feature, df::coord2d rgn_pos, int32_t index)
     return true;
 }
 
-bool Maps::ReadFeatures(uint32_t x, uint32_t y, uint32_t z, t_feature *local, t_feature *global)
+inline bool ReadFeaturesInline(int32_t x, int32_t y, int32_t z, t_feature *local, t_feature *global)
 {
-    df::map_block *block = getBlock(x,y,z);
+    df::map_block* block = Maps::getBlock(x, y, z);
     if (!block)
         return false;
-    return ReadFeatures(block, local, global);
+    return Maps::ReadFeatures(block, local, global);
+}
+bool Maps::ReadFeatures(int32_t x, int32_t y, int32_t z, t_feature *local, t_feature *global)
+{
+    return ReadFeaturesInline(x, y, z, local, global);
+}
+bool Maps::ReadFeatures(uint32_t x, uint32_t y, uint32_t z, t_feature *local, t_feature *global) //todo: deprecate me
+{
+    return ReadFeaturesInline(int32_t(x), int32_t(y), int32_t(z), local, global);
 }
 
 bool Maps::ReadFeatures(df::map_block * block, t_feature * local, t_feature * global)
@@ -477,12 +509,11 @@ bool Maps::SortBlockEvents(df::map_block *block,
     return true;
 }
 
-bool Maps::RemoveBlockEvent(uint32_t x, uint32_t y, uint32_t z, df::block_square_event * which)
+inline bool RemoveBlockEventInline(int32_t x, int32_t y, int32_t z, df::block_square_event * which)
 {
-    df::map_block * block = getBlock(x,y,z);
+    df::map_block* block = Maps::getBlock(x, y, z);
     if (!block)
         return false;
-
     int idx = linear_index(block->block_events, which);
     if (idx >= 0)
     {
@@ -493,6 +524,14 @@ bool Maps::RemoveBlockEvent(uint32_t x, uint32_t y, uint32_t z, df::block_square
     else
         return false;
 }
+inline bool Maps::RemoveBlockEvent(int32_t x, int32_t y, int32_t z, df::block_square_event * which)
+{
+    return RemoveBlockEventInline(x, y, z, which);
+}
+bool Maps::RemoveBlockEvent(uint32_t x, uint32_t y, uint32_t z, df::block_square_event * which) //todo: deprecate me
+{
+    return RemoveBlockEventInline(int32_t(x), int32_t(y), int32_t(z), which);
+}
 
 static df::coord2d biome_offsets[9] = {
     df::coord2d(-1,-1), df::coord2d(0,-1), df::coord2d(1,-1),
@@ -658,8 +697,8 @@ bool Maps::canStepBetween(df::coord pos1, df::coord pos2)
                     if ( x == 0 && y == 0 )
                         continue;
                     df::tiletype* type = Maps::getTileType(df::coord(pos1.x+x,pos1.y+y,pos1.z));
-                    df::tiletype_shape shape1 = ENUM_ATTR(tiletype,shape,*type);
-                    if ( shape1 == tiletype_shape::WALL ) {
+                    df::tiletype_shape shape3 = ENUM_ATTR(tiletype,shape,*type);
+                    if ( shape3 == tiletype_shape::WALL ) {
                         foundWall = true;
                         x = 2;
                         break;
@@ -695,8 +734,8 @@ bool Maps::canStepBetween(df::coord pos1, df::coord pos2)
                 if ( x == 0 && y == 0 )
                     continue;
                 df::tiletype* type = Maps::getTileType(df::coord(pos1.x+x,pos1.y+y,pos1.z));
-                df::tiletype_shape shape1 = ENUM_ATTR(tiletype,shape,*type);
-                if ( shape1 == tiletype_shape::WALL ) {
+                df::tiletype_shape shape3 = ENUM_ATTR(tiletype,shape,*type);
+                if ( shape3 == tiletype_shape::WALL ) {
                     foundWall = true;
                     x = 2;
                     break;

From 2aa28d34b6f96cc62412b7524807ae14666f475e Mon Sep 17 00:00:00 2001
From: Guilherme Abraham <guilherme.abraham93@gmail.com>
Date: Fri, 22 Apr 2022 00:22:05 -0300
Subject: [PATCH 003/854] Adding ids output to cursecheck (#2093)

Co-authored-by: Guilherme Abraham <guilherme.abraham@zpesystems.com>
Co-authored-by: Myk <myk002@yahoo.com>
---
 docs/Plugins.rst       | 1 +
 docs/changelog.txt     | 1 +
 plugins/cursecheck.cpp | 9 +++++++++
 3 files changed, 11 insertions(+)

diff --git a/docs/Plugins.rst b/docs/Plugins.rst
index 48ecfe453..bad1629f7 100644
--- a/docs/Plugins.rst
+++ b/docs/Plugins.rst
@@ -313,6 +313,7 @@ Options:
 
 :detail:      Print full name, date of birth, date of curse and some status
               info (some vampires might use fake identities in-game, though).
+:ids:         Print the creature and race IDs.
 :nick:        Set the type of curse as nickname (does not always show up
               in-game, some vamps don't like nicknames).
 :all:         Include dead and passive cursed creatures (can result in a quite
diff --git a/docs/changelog.txt b/docs/changelog.txt
index 26329f0d1..330f6e8b2 100644
--- a/docs/changelog.txt
+++ b/docs/changelog.txt
@@ -57,6 +57,7 @@ changelog.txt uses a syntax similar to RST, with a few special sequences:
 - `autochop`: preferably designate larger trees over smaller ones
 - `blueprint`: ``track`` phase renamed to ``carve``. carved fortifications and (optionally) engravings are now captured in blueprints
 - `tweak` stable-cursor: Keep the cursor stable even when the viewport moves a small amount
+- `cursecheck`: Added a new parameter, ``ids``, to print creature and race IDs of the cursed creature.
 
 ## Documentation
 - Add more examples to the plugin skeleton files so they are more informative for a newbie
diff --git a/plugins/cursecheck.cpp b/plugins/cursecheck.cpp
index 69cfbc275..d20c645ab 100644
--- a/plugins/cursecheck.cpp
+++ b/plugins/cursecheck.cpp
@@ -146,6 +146,7 @@ command_result cursecheck (color_ostream &out, vector <string> & parameters)
     Gui::getCursorCoords(cursorX,cursorY,cursorZ);
 
     bool giveDetails = false;
+    bool giveUnitID = false;
     bool giveNick = false;
     bool ignoreDead = true;
     bool verbose = false;
@@ -162,6 +163,7 @@ command_result cursecheck (color_ostream &out, vector <string> & parameters)
                         "  By default dead and passive creatures (aka really dead) are ignored.\n"
                         "Options:\n"
                         "  detail  - show details (name and age shown ingame might differ)\n"
+                        "  ids     - add creature and race IDs to be show on the  output\n"
                         "  nick    - try to set cursetype as nickname (does not always work)\n"
                         "  all     - include dead and passive creatures\n"
                         "  verbose - show all curse tags (if you really want to know it all)\n"
@@ -170,6 +172,8 @@ command_result cursecheck (color_ostream &out, vector <string> & parameters)
         }
         if(parameters[i] == "detail")
             giveDetails = true;
+        if(parameters[i] == "ids")
+            giveUnitID = true;
         if(parameters[i] == "nick")
             giveNick = true;
         if(parameters[i] == "all")
@@ -269,6 +273,11 @@ command_result cursecheck (color_ostream &out, vector <string> & parameters)
                         << bitfield_to_string(unit->curse.add_tags2) << endl;
                 }
             }
+
+            if (giveUnitID)
+            {
+                out.print("Creature %d, race %d (%x)\n", unit->id, unit->race, unit->race);
+            }
         }
     }
 

From 809f9316fdf24b42dbdf103980fee69f7b91bf5e Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Fri, 22 Apr 2022 08:30:53 -0700
Subject: [PATCH 004/854] make frame inset configurable for ListBox list

---
 library/lua/gui/dialogs.lua | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/library/lua/gui/dialogs.lua b/library/lua/gui/dialogs.lua
index 5d2a35197..687c7176e 100644
--- a/library/lua/gui/dialogs.lua
+++ b/library/lua/gui/dialogs.lua
@@ -158,6 +158,7 @@ ListBox.ATTRS{
     on_select2 = DEFAULT_NIL,
     select2_hint = DEFAULT_NIL,
     row_height = DEFAULT_NIL,
+    list_frame_inset = DEFAULT_NIL,
 }
 
 function ListBox:preinit(info)
@@ -198,7 +199,8 @@ function ListBox:init(info)
                 if cb then cb(obj, sel) end
             end,
             on_submit2 = on_submit2,
-            frame = { l = 0, r = 0 },
+            frame = { l = 0, r = 0},
+            frame_inset = self.list_frame_inset,
             row_height = info.row_height,
         }
     }

From ed5523152cdad2070e8726de116665cd3380cb9c Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Fri, 22 Apr 2022 09:53:10 -0700
Subject: [PATCH 005/854] factor text wrapping out of TooltipLabel into
 WrappedLabel

---
 docs/Lua API.rst            | 41 ++++++++++++++++++++----------
 docs/changelog.txt          |  3 ++-
 library/lua/gui/widgets.lua | 50 ++++++++++++++++++++++++-------------
 3 files changed, 62 insertions(+), 32 deletions(-)

diff --git a/docs/Lua API.rst b/docs/Lua API.rst
index 64b6dbf0d..a0764df99 100644
--- a/docs/Lua API.rst	
+++ b/docs/Lua API.rst	
@@ -3864,28 +3864,43 @@ The Label widget implements the following methods:
 
   Computes the width of the text.
 
-TooltipLabel class
+WrappedLabel class
 ------------------
 
 This Label subclass represents text that you want to be able to dynamically
-hide, like help text in a tooltip.
+wrap. This frees you from having to pre-split long strings into multiple lines
+in the Label ``text`` list.
+
+It has the following attributes:
+
+:text_to_wrap: The string (or a table of strings or a function that returns a
+    string or a table of strings) to display. The text will be autowrapped to
+    the width of the widget, though any existing newlines will be kept.
+:indent: The number of spaces to indent the text from the left margin. The
+    default is ``0``.
+
+The displayed text is refreshed and rewrapped whenever the widget bounds change.
+To force a refresh (to pick up changes in the string that ``text_to_wrap``
+returns, for example), all ``updateLayout()`` on this widget or on a widget that
+contains this widget.
+
+TooltipLabel class
+------------------
+
+This WrappedLabel subclass represents text that you want to be able to
+dynamically hide, like help text in a tooltip.
 
 It has the following attributes:
 
-:tooltip: The string (or a table of strings or a function that returns a string
-    or a table of strings) to display. The text will be autowrapped to the
-    width of the widget, though any existing newlines will be kept.
-:show_tooltip: Boolean or a callback; if true, the widget is visible. Defaults
-    to ``true``.
-:indent: The number of spaces to indent the tooltip from the left margin. The
-    default is ``2``.
+:show_tooltip: Boolean or a callback; if true, the widget is visible.
 
 The ``text_pen`` attribute of the ``Label`` class is overridden with a default
-of COLOR_GREY.
+of ``COLOR_GREY`` and the ``indent`` attribute of the ``WrappedLabel`` class is
+overridden with a default of ``2``.
 
-Note that the text of the tooltip is only refreshed when the widget layout is
-updated (i.e. ``updateLayout()`` is called on this widget or a widget that
-contains this widget) and the tooltip needs to be rewrapped.
+The text of the tooltip can be passed in the inherited ``text_to_wrap``
+attribute so it can be autowrapped, or in the basic ``text`` attribute if no
+wrapping is required.
 
 HotkeyLabel class
 -----------------
diff --git a/docs/changelog.txt b/docs/changelog.txt
index 330f6e8b2..1a3bf64b4 100644
--- a/docs/changelog.txt
+++ b/docs/changelog.txt
@@ -80,7 +80,8 @@ changelog.txt uses a syntax similar to RST, with a few special sequences:
 - New string class function: ``string:escape_pattern()`` escapes regex special characters within a string
 - ``widgets.Panel``: if ``autoarrange_subviews`` is set, ``Panel``\s will now automatically lay out widgets vertically according to their current height.  This allows you to have widgets dynamically change height or become visible/hidden and you don't have to worry about recalculating frame layouts
 - ``widgets.ResizingPanel``: new ``Panel`` subclass that automatically recalculates it's own frame height based on the size, position, and visibility of its subviews
-- ``widgets.TooltipLabel``:  new ``Label`` subclass that provides tooltip-like behavior
+- ``widgets.WrappedLabel``:  new ``Label`` subclass that provides autowrapping of text
+- ``widgets.TooltipLabel``:  new ``WrappedLabel`` subclass that provides tooltip-like behavior
 - ``widgets.HotkeyLabel``: new ``Label`` subclass that displays and reacts to hotkeys
 - ``widgets.CycleHotkeyLabel``: new ``Label`` subclass that allows users to cycle through a list of options by pressing a hotkey
 - ``widgets.ToggleHotkeyLabel``: new ``CycleHotkeyLabel`` subclass that toggles between ``On`` and ``Off`` states
diff --git a/library/lua/gui/widgets.lua b/library/lua/gui/widgets.lua
index 7a83346b1..9306a75fa 100644
--- a/library/lua/gui/widgets.lua
+++ b/library/lua/gui/widgets.lua
@@ -494,41 +494,55 @@ function Label:onInput(keys)
 end
 
 ------------------
--- TooltipLabel --
+-- WrappedLabel --
 ------------------
 
-TooltipLabel = defclass(TooltipLabel, Label)
+WrappedLabel = defclass(WrappedLabel, Label)
 
-TooltipLabel.ATTRS{
-    tooltip=DEFAULT_NIL,
-    show_tooltip=true,
-    indent=2,
-    text_pen=COLOR_GREY,
+WrappedLabel.ATTRS{
+    text_to_wrap=DEFAULT_NIL,
+    indent=0,
 }
 
-function TooltipLabel:getWrappedTooltip()
-    local tooltip = getval(self.tooltip)
-    if type(tooltip) == 'table' then
-        tooltip = table.concat(tooltip, NEWLINE)
+function WrappedLabel:getWrappedText(width)
+    if not self.text_to_wrap then return nil end
+    local text_to_wrap = getval(self.text_to_wrap)
+    if type(text_to_wrap) == 'table' then
+        text_to_wrap = table.concat(text_to_wrap, NEWLINE)
     end
-    return tooltip:wrap(self.frame_body.width - self.indent)
-end
-
-function TooltipLabel:preUpdateLayout()
-    self.visible = getval(self.show_tooltip)
+    return text_to_wrap:wrap(width - self.indent)
 end
 
 -- we can't set the text in init() since we may not yet have a frame that we
 -- can get wrapping bounds from.
-function TooltipLabel:postComputeFrame()
+function WrappedLabel:postComputeFrame()
+    local wrapped_text = self:getWrappedText(self.frame_body.width)
+    if not wrapped_text then return end
     local text = {}
-    for _,line in ipairs(self:getWrappedTooltip():split(NEWLINE)) do
+    for _,line in ipairs(wrapped_text:split(NEWLINE)) do
         table.insert(text, {gap=self.indent, text=line})
+        -- a trailing newline will get ignored so we don't have to manually trim
         table.insert(text, NEWLINE)
     end
     self:setText(text)
 end
 
+------------------
+-- TooltipLabel --
+------------------
+
+TooltipLabel = defclass(TooltipLabel, WrappedLabel)
+
+TooltipLabel.ATTRS{
+    show_tooltip=DEFAULT_NIL,
+    indent=2,
+    text_pen=COLOR_GREY,
+}
+
+function TooltipLabel:preUpdateLayout()
+    self.visible = getval(self.show_tooltip)
+end
+
 -----------------
 -- HotkeyLabel --
 -----------------

From cb18ce69cca151807f82579e3a3fe94fe9cab2f8 Mon Sep 17 00:00:00 2001
From: DFHack-Urist via GitHub Actions
 <63161697+DFHack-Urist@users.noreply.github.com>
Date: Sat, 23 Apr 2022 07:17:26 +0000
Subject: [PATCH 006/854] Auto-update submodules

scripts: master
---
 scripts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts b/scripts
index ca963c935..d9e390cd5 160000
--- a/scripts
+++ b/scripts
@@ -1 +1 @@
-Subproject commit ca963c935c3375a1cf3076b066df44867edf1166
+Subproject commit d9e390cd5509458bfbc0c1e2ecb01ae96bddc015

From fe0b33d9c4e3d0da9b30fd500b45160f929661b3 Mon Sep 17 00:00:00 2001
From: Nik Nyby <nikolas@gnu.org>
Date: Tue, 26 Apr 2022 10:59:51 -0400
Subject: [PATCH 007/854] fix typo: equiptment

---
 docs/Plugins.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/Plugins.rst b/docs/Plugins.rst
index bad1629f7..b068e3c95 100644
--- a/docs/Plugins.rst
+++ b/docs/Plugins.rst
@@ -696,7 +696,7 @@ also tries to have dwarves specialize in specific skills.
 The key is that, for almost all labors, once a dwarf begins a job it will finish that
 job even if the associated labor is removed. Autolabor therefore frequently checks
 which dwarf or dwarves should take new jobs for that labor, and sets labors accordingly.
-Labors with equiptment (mining, hunting, and woodcutting), which are abandoned
+Labors with equipment (mining, hunting, and woodcutting), which are abandoned
 if labors change mid-job, are handled slightly differently to minimise churn.
 
 .. warning::

From dc2a14c0c2d05ba1be2bc823312a0c875dfe523a Mon Sep 17 00:00:00 2001
From: Quietust <quietust@gmail.com>
Date: Tue, 26 Apr 2022 20:52:24 -0600
Subject: [PATCH 008/854] Add "partial-items" tweak.

When active, the displayed names of partially-consumed items (e.g.
hospital cloth) will display a percentage indicator at the end.

Also re-sort a few Tweaks so they're in alphabetical order again.
---
 docs/Plugins.rst                     |  1 +
 docs/changelog.txt                   |  3 +++
 plugins/tweak/tweak.cpp              | 24 ++++++++++++++++++++----
 plugins/tweak/tweaks/partial-items.h | 23 +++++++++++++++++++++++
 4 files changed, 47 insertions(+), 4 deletions(-)
 create mode 100644 plugins/tweak/tweaks/partial-items.h

diff --git a/docs/Plugins.rst b/docs/Plugins.rst
index b068e3c95..3b42bc16a 100644
--- a/docs/Plugins.rst
+++ b/docs/Plugins.rst
@@ -159,6 +159,7 @@ Subcommands that persist until disabled or DF quits:
                         i.e. stop the rightmost list of the Positions page of the military
                         screen from constantly resetting to the top.
 :nestbox-color:         Fixes the color of built nestboxes
+:partial-items:         Displays percentages on partially-consumed items such as hospital cloth
 :reaction-gloves:       Fixes reactions to produce gloves in sets with correct handedness (:bug:`6273`)
 :shift-8-scroll:        Gives Shift-8 (or :kbd:`*`) priority when scrolling menus, instead of scrolling the map
 :stable-cursor:         Saves the exact cursor position between t/q/k/d/b/etc menus of fortress mode, if the
diff --git a/docs/changelog.txt b/docs/changelog.txt
index 1a3bf64b4..05fe533ba 100644
--- a/docs/changelog.txt
+++ b/docs/changelog.txt
@@ -38,6 +38,9 @@ changelog.txt uses a syntax similar to RST, with a few special sequences:
 
 ## Removed
 
+## New Tweaks
+- `tweak` partial-items: displays percentages on partially-consumed items such as hospital cloth
+
 ## Fixes
 - `autofarm` removed restriction on only planting 'discovered' plants
 - `luasocket` (and others): return correct status code when closing socket connections
diff --git a/plugins/tweak/tweak.cpp b/plugins/tweak/tweak.cpp
index 1ea958f5b..38ece6970 100644
--- a/plugins/tweak/tweak.cpp
+++ b/plugins/tweak/tweak.cpp
@@ -49,11 +49,14 @@
 #include "df/item_glovesst.h"
 #include "df/item_shoesst.h"
 #include "df/item_pantsst.h"
+#include "df/item_drinkst.h"
+#include "df/item_globst.h"
 #include "df/item_liquid_miscst.h"
 #include "df/item_powder_miscst.h"
 #include "df/item_barst.h"
 #include "df/item_threadst.h"
 #include "df/item_clothst.h"
+#include "df/item_sheetst.h"
 #include "df/spatter.h"
 #include "df/layer_object.h"
 #include "df/reaction.h"
@@ -68,6 +71,7 @@
 #include "df/job.h"
 #include "df/general_ref_building_holderst.h"
 #include "df/unit_health_info.h"
+#include "df/caste_body_info.h"
 #include "df/activity_entry.h"
 #include "df/activity_event_combat_trainingst.h"
 #include "df/activity_event_individual_skill_drillst.h"
@@ -101,14 +105,15 @@
 #include "tweaks/kitchen-prefs-empty.h"
 #include "tweaks/max-wheelbarrow.h"
 #include "tweaks/military-assign.h"
-#include "tweaks/pausing-fps-counter.h"
 #include "tweaks/nestbox-color.h"
+#include "tweaks/partial-items.h"
+#include "tweaks/pausing-fps-counter.h"
+#include "tweaks/reaction-gloves.h"
 #include "tweaks/shift-8-scroll.h"
 #include "tweaks/stable-cursor.h"
 #include "tweaks/stone-status-all.h"
 #include "tweaks/title-start-rename.h"
 #include "tweaks/tradereq-pet-gender.h"
-#include "tweaks/reaction-gloves.h"
 
 using std::set;
 using std::vector;
@@ -244,6 +249,8 @@ DFhackCExport command_result plugin_init (color_ostream &out, std::vector <Plugi
         "    Preserve list order and cursor position when assigning to squad,\n"
         "    i.e. stop the rightmost list of the Positions page of the military\n"
         "    screen from constantly jumping to the top.\n"
+        "  tweak partial-items [disable]\n"
+        "    Displays percentages on partially-consumed items such as hospital cloth\n"
         "  tweak pausing-fps-counter [disable]\n"
         "    Replace fortress mode FPS counter with one that stops counting \n"
         "    when paused.\n"
@@ -329,9 +336,20 @@ DFhackCExport command_result plugin_init (color_ostream &out, std::vector <Plugi
 
     TWEAK_HOOK("nestbox-color", nestbox_color_hook, drawBuilding);
 
+    TWEAK_HOOK("partial-items", partial_items_hook_bar, getItemDescription);
+    TWEAK_HOOK("partial-items", partial_items_hook_drink, getItemDescription);
+    TWEAK_HOOK("partial-items", partial_items_hook_glob, getItemDescription);
+    TWEAK_HOOK("partial-items", partial_items_hook_liquid_misc, getItemDescription);
+    TWEAK_HOOK("partial-items", partial_items_hook_powder_misc, getItemDescription);
+    TWEAK_HOOK("partial-items", partial_items_hook_cloth, getItemDescription);
+    TWEAK_HOOK("partial-items", partial_items_hook_sheet, getItemDescription);
+    TWEAK_HOOK("partial-items", partial_items_hook_thread, getItemDescription);
+
     TWEAK_HOOK("pausing-fps-counter", dwarfmode_pausing_fps_counter_hook, render);
     TWEAK_HOOK("pausing-fps-counter", title_pausing_fps_counter_hook, render);
 
+    TWEAK_HOOK("reaction-gloves", reaction_gloves_hook, produce);
+
     TWEAK_HOOK("shift-8-scroll", shift_8_scroll_hook, feed);
 
     TWEAK_HOOK("stable-cursor", stable_cursor_hook, feed);
@@ -344,8 +362,6 @@ DFhackCExport command_result plugin_init (color_ostream &out, std::vector <Plugi
 
     TWEAK_HOOK("tradereq-pet-gender", pet_gender_hook, render);
 
-    TWEAK_HOOK("reaction-gloves", reaction_gloves_hook, produce);
-
     return CR_OK;
 }
 
diff --git a/plugins/tweak/tweaks/partial-items.h b/plugins/tweak/tweaks/partial-items.h
new file mode 100644
index 000000000..9bf94a9f0
--- /dev/null
+++ b/plugins/tweak/tweaks/partial-items.h
@@ -0,0 +1,23 @@
+// When displaying the names of partially-consumed items, show the percentage remaining
+// Potentially useful for revealing why random pieces of cloth or thread aren't suitable for jobs
+
+#define DEFINE_PARTIAL_ITEM_TWEAK(TYPE, DIM) \
+struct partial_items_hook_##TYPE : df::item_##TYPE##st { \
+    typedef df::item_##TYPE##st interpose_base; \
+    DEFINE_VMETHOD_INTERPOSE(void, getItemDescription, (std::string *str, int8_t plurality)) \
+    { \
+        INTERPOSE_NEXT(getItemDescription)(str, plurality); \
+        if (dimension != DIM) \
+            str->append(stl_sprintf(" (%i%%)", std::max(1, dimension * 100 / DIM))); \
+    } \
+}; \
+IMPLEMENT_VMETHOD_INTERPOSE(partial_items_hook_##TYPE, getItemDescription);
+
+DEFINE_PARTIAL_ITEM_TWEAK(bar, 150)
+DEFINE_PARTIAL_ITEM_TWEAK(drink, 150)
+DEFINE_PARTIAL_ITEM_TWEAK(glob, 150)
+DEFINE_PARTIAL_ITEM_TWEAK(liquid_misc, 150)
+DEFINE_PARTIAL_ITEM_TWEAK(powder_misc, 150)
+DEFINE_PARTIAL_ITEM_TWEAK(cloth, 10000)
+DEFINE_PARTIAL_ITEM_TWEAK(sheet, 10000)
+DEFINE_PARTIAL_ITEM_TWEAK(thread, 15000)

From 6ad362d6987673f3e08097c864f18e54a19e9366 Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Wed, 27 Apr 2022 11:51:46 -0700
Subject: [PATCH 009/854] return a reference to the created dialogs

---
 docs/changelog.txt          |  1 +
 library/lua/gui/dialogs.lua | 26 +++++++++++++++++---------
 2 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/docs/changelog.txt b/docs/changelog.txt
index 05fe533ba..9b449f4c9 100644
--- a/docs/changelog.txt
+++ b/docs/changelog.txt
@@ -90,6 +90,7 @@ changelog.txt uses a syntax similar to RST, with a few special sequences:
 - ``widgets.ToggleHotkeyLabel``: new ``CycleHotkeyLabel`` subclass that toggles between ``On`` and ``Off`` states
 - ``safe_index`` now properly handles lua sparse tables that are indexed by numbers
 - ``widgets``: unset values in ``frame_inset``-table default to ``0``
+- ``dialogs``: ``show*`` functions now return a reference to the created dialog
 
 # 0.47.05-r4
 
diff --git a/library/lua/gui/dialogs.lua b/library/lua/gui/dialogs.lua
index 687c7176e..51f346bbd 100644
--- a/library/lua/gui/dialogs.lua
+++ b/library/lua/gui/dialogs.lua
@@ -69,22 +69,26 @@ function MessageBox:onInput(keys)
 end
 
 function showMessage(title, text, tcolor, on_close)
-    MessageBox{
+    local mb = MessageBox{
         frame_title = title,
         text = text,
         text_pen = tcolor,
         on_close = on_close
-    }:show()
+    }
+    mb:show()
+    return mb
 end
 
 function showYesNoPrompt(title, text, tcolor, on_accept, on_cancel)
-    MessageBox{
+    local mb = MessageBox{
         frame_title = title,
         text = text,
         text_pen = tcolor,
         on_accept = on_accept,
         on_cancel = on_cancel,
-    }:show()
+    }
+    mb:show()
+    return mb
 end
 
 InputBox = defclass(InputBox, MessageBox)
@@ -133,7 +137,7 @@ function InputBox:onInput(keys)
 end
 
 function showInputPrompt(title, text, tcolor, input, on_input, on_cancel, min_width)
-    InputBox{
+    local ib = InputBox{
         frame_title = title,
         text = text,
         text_pen = tcolor,
@@ -141,7 +145,9 @@ function showInputPrompt(title, text, tcolor, input, on_input, on_cancel, min_wi
         on_input = on_input,
         on_cancel = on_cancel,
         frame_width = min_width,
-    }:show()
+    }
+    ib:show()
+    return ib
 end
 
 ListBox = defclass(ListBox, MessageBox)
@@ -201,7 +207,7 @@ function ListBox:init(info)
             on_submit2 = on_submit2,
             frame = { l = 0, r = 0},
             frame_inset = self.list_frame_inset,
-            row_height = info.row_height,
+            row_height = self.row_height,
         }
     }
 end
@@ -232,7 +238,7 @@ function ListBox:onInput(keys)
 end
 
 function showListPrompt(title, text, tcolor, choices, on_select, on_cancel, min_width, filter)
-    ListBox{
+    local lb = ListBox{
         frame_title = title,
         text = text,
         text_pen = tcolor,
@@ -241,7 +247,9 @@ function showListPrompt(title, text, tcolor, choices, on_select, on_cancel, min_
         on_cancel = on_cancel,
         frame_width = min_width,
         with_filter = filter,
-    }:show()
+    }
+    lb:show()
+    return lb
 end
 
 return _ENV

From dcadde38d77c5c9a77cf15eca2f2a90e8e764277 Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Wed, 27 Apr 2022 12:16:53 -0700
Subject: [PATCH 010/854] add new global function: ensure_key

---
 docs/Lua API.rst       | 6 ++++++
 docs/changelog.txt     | 1 +
 library/lua/dfhack.lua | 7 +++++++
 3 files changed, 14 insertions(+)

diff --git a/docs/Lua API.rst b/docs/Lua API.rst
index a0764df99..acc9174b1 100644
--- a/docs/Lua API.rst	
+++ b/docs/Lua API.rst	
@@ -2643,6 +2643,12 @@ environment by the mandatory init file dfhack.lua:
   Walks a sequence of dereferences, which may be represented by numbers or strings.
   Returns *nil* if any of obj or indices is *nil*, or a numeric index is out of array bounds.
 
+* ``ensure_key(t, key[, default_value])``
+
+  If the Lua table ``t`` doesn't include the specified ``key``, ``t[key]`` is
+  set to the value of ``default_value``, which defaults to ``{}`` if not set.
+  The new or existing value of ``t[key]`` is then returned.
+
 .. _lua-string:
 
 String class extentions
diff --git a/docs/changelog.txt b/docs/changelog.txt
index 9b449f4c9..adc25327a 100644
--- a/docs/changelog.txt
+++ b/docs/changelog.txt
@@ -91,6 +91,7 @@ changelog.txt uses a syntax similar to RST, with a few special sequences:
 - ``safe_index`` now properly handles lua sparse tables that are indexed by numbers
 - ``widgets``: unset values in ``frame_inset``-table default to ``0``
 - ``dialogs``: ``show*`` functions now return a reference to the created dialog
+- ``ensure_key``: new global function for retrieving or dynamically creating Lua table mappings
 
 # 0.47.05-r4
 
diff --git a/library/lua/dfhack.lua b/library/lua/dfhack.lua
index 26e20f748..671029015 100644
--- a/library/lua/dfhack.lua
+++ b/library/lua/dfhack.lua
@@ -385,6 +385,13 @@ function safe_index(obj,idx,...)
     end
 end
 
+function ensure_key(t, key, default_value)
+    if t[key] == nil then
+        t[key] = (default_value ~= nil) and default_value or {}
+    end
+    return t[key]
+end
+
 -- String class extentions
 
 -- prefix is a literal string, not a pattern

From 8eb2831b7ed1b3062f9fde1b541da55b89bbf6ac Mon Sep 17 00:00:00 2001
From: Josh Cooper <cppcooper@users.noreply.github.com>
Date: Wed, 27 Apr 2022 19:53:05 -0700
Subject: [PATCH 011/854] Adds plugins/external/ and auto-populates the cmake
 within upon creation (#2095)

* Adds a plugins sub-directory

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* Auto-adds plugins/external sub-directories

* Moves plugins/external globbing as to generate plugins/external/cmake

* Removes plugins/external/.gitignore since the directory is generated

* Fixes cmake error

* Moves gitignore for plugins/external to ensure existence for fresh clone

* Adds missing EOF newline

* Adds requested changes
---
 .gitignore                  |  1 -
 plugins/CMakeLists.txt      | 20 ++++++++++++++++++--
 plugins/external/.gitignore |  2 ++
 3 files changed, 20 insertions(+), 3 deletions(-)
 create mode 100644 plugins/external/.gitignore

diff --git a/.gitignore b/.gitignore
index 3867b9dbf..8e401a7df 100644
--- a/.gitignore
+++ b/.gitignore
@@ -72,5 +72,4 @@ tags
 .idea
 
 # external plugins
-/plugins/external/
 /plugins/CMakeLists.custom.txt
diff --git a/plugins/CMakeLists.txt b/plugins/CMakeLists.txt
index 22983d617..b8cd25860 100644
--- a/plugins/CMakeLists.txt
+++ b/plugins/CMakeLists.txt
@@ -189,6 +189,17 @@ if(BUILD_SKELETON)
     add_subdirectory(skeleton)
 endif()
 
+macro(subdirlist result subdir)
+    file(GLOB children ABSOLUTE ${subdir}/ ${subdir}/*/)
+    set(dirlist "")
+    foreach(child ${children})
+        if(IS_DIRECTORY ${child})
+            file(RELATIVE_PATH child ${CMAKE_CURRENT_SOURCE_DIR}/${subdir} ${child})
+            list(APPEND dirlist ${child})
+        endif()
+    endforeach()
+    set(${result} ${dirlist})
+endmacro()
 
 # To add "external" plugins without committing them to the DFHack repo:
 #
@@ -204,7 +215,7 @@ endif()
 # 4. build DFHack as normal. The plugins you added will be built as well.
 
 if(NOT EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/external/CMakeLists.txt")
-    file(WRITE "${CMAKE_CURRENT_SOURCE_DIR}/external/CMakeLists.txt"
+    set(content_str
 "# Add external plugins here - this file is ignored by git
 
 # Recommended: use add_subdirectory() for folders that you have created within
@@ -212,9 +223,14 @@ if(NOT EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/external/CMakeLists.txt")
 
 # See the end of /plugins/CMakeLists.txt for more details.
 ")
+    subdirlist(SUBDIRS external)
+    foreach(subdir ${SUBDIRS})
+        set(content_str "${content_str}add_subdirectory(${subdir})\n")
+    endforeach()
+    file(WRITE "${CMAKE_CURRENT_SOURCE_DIR}/external/CMakeLists.txt" ${content_str})
 endif()
 
-include("${CMAKE_CURRENT_SOURCE_DIR}/external/CMakeLists.txt")
+add_subdirectory(external)
 
 # for backwards compatibility
 if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.custom.txt")
diff --git a/plugins/external/.gitignore b/plugins/external/.gitignore
new file mode 100644
index 000000000..d6b7ef32c
--- /dev/null
+++ b/plugins/external/.gitignore
@@ -0,0 +1,2 @@
+*
+!.gitignore

From f08a268e8a8e4c7d6e3299be1cf70f2b8f951d86 Mon Sep 17 00:00:00 2001
From: Timur Kelman <tymur.gubayev@gmail.com>
Date: Fri, 29 Apr 2022 15:55:08 +0200
Subject: [PATCH 012/854] add scroll icons to Label widget (#2101)

* WIP: add scroll icons to Label widget

It's an opt-out. The icons are rendered in the right-most column of the 1st and last row. They are only rendered when text can actually be scrolled in the corresponding direction.

WIP: Currently, the icons might overlay text characters, there is no mechanism preventing it

* gui.lua: expose the `parse_inset()` function

* refactor Label's scroll icon code

* since `render_scroll_icons` only works with a label, it's now a class function
* `update_scroll_inset` ensures `frame_inset.r` or `.l` is at least 1, according to `show_scroll_icons`
* `show_scroll_icons` has 4 possible values: `false` for no icons, `left` for icons on the first column on the left (also ensuring `frame_inset.l >= 1`), `right` - last column on the right, `DEFAULT_NIL` - same as `right` if text height greater than `frame_body.height`, else same as `false`.

* make `render_scroll_icons` always draw icons

The check now happens in `onRenderFrame`

* draw frame's background

calling `Label.super.onRenderFrame(self, dc, rect)` makes frame's background invisible for some reason

* remove trailing spaces

* fix scroll icons placed far above/below text

 With `Label.frame_inset = 1` the text could be vertically centered with plenty of space below and above,
but not all rendered. Before this change, the scroll icons would be at the very top and bottom of the frame
instead of near the first and last rendered text line.

* always `update_scroll_inset` to react to resized window

* draw scroll icons next to text

* update `Lua API.rst` with new `Label` parameters

* move comment separator up

This way every scroll related parameter is in one group

* list default values for new parameters in docs

* add missing description of `Label.scroll_keys`
---
 docs/Lua API.rst            |  8 ++++++
 library/lua/gui.lua         |  2 +-
 library/lua/gui/widgets.lua | 53 +++++++++++++++++++++++++++++++++++++
 3 files changed, 62 insertions(+), 1 deletion(-)

diff --git a/docs/Lua API.rst b/docs/Lua API.rst
index acc9174b1..a61264c86 100644
--- a/docs/Lua API.rst	
+++ b/docs/Lua API.rst	
@@ -3782,6 +3782,14 @@ It has the following attributes:
 :auto_width: Sets self.frame.w from the text width.
 :on_click: A callback called when the label is clicked (optional)
 :on_rclick: A callback called when the label is right-clicked (optional)
+:scroll_keys: Specifies which keys the label should react to as a table. Default is ``STANDARDSCROLL`` (up or down arrows, page up or down).
+:show_scroll_icons: Controls scroll icons' behaviour: ``false`` for no icons, ``'right'`` or ``'left'`` for
+     icons next to the text in an additional column (``frame_inset`` is adjusted to have ``.r`` or ``.l`` greater than ``0``),
+     ``nil`` same as ``'right'`` but changes ``frame_inset`` only if a scroll icon is actually necessary
+     (if ``getTextHeight()`` is greater than ``frame_body.height``). Default is ``nil``.
+:up_arrow_icon: The symbol for scroll up arrow. Default is ``string.char(24)`` (``↑``).
+:down_arrow_icon: The symbol for scroll down arrow. Default is ``string.char(25)`` (``↓``).
+:scroll_icon_pen: Specifies the pen for scroll icons. Default is ``COLOR_LIGHTCYAN``.
 
 The text itself is represented as a complex structure, and passed
 to the object via the ``text`` argument of the constructor, or via
diff --git a/library/lua/gui.lua b/library/lua/gui.lua
index a4541a6d8..8521e1dfe 100644
--- a/library/lua/gui.lua
+++ b/library/lua/gui.lua
@@ -96,7 +96,7 @@ function compute_frame_rect(wavail,havail,spec,xgap,ygap)
     return rect
 end
 
-local function parse_inset(inset)
+function parse_inset(inset)
     local l,r,t,b
     if type(inset) == 'table' then
         l,r = inset.l or inset.x or 0, inset.r or inset.x or 0
diff --git a/library/lua/gui/widgets.lua b/library/lua/gui/widgets.lua
index 9306a75fa..8a091804c 100644
--- a/library/lua/gui/widgets.lua
+++ b/library/lua/gui/widgets.lua
@@ -412,7 +412,12 @@ Label.ATTRS{
     auto_width = false,
     on_click = DEFAULT_NIL,
     on_rclick = DEFAULT_NIL,
+    --
     scroll_keys = STANDARDSCROLL,
+    show_scroll_icons = DEFAULT_NIL, -- DEFAULT_NIL, 'right', 'left', false
+    up_arrow_icon = string.char(24),
+    down_arrow_icon = string.char(25),
+    scroll_icon_pen = COLOR_LIGHTCYAN,
 }
 
 function Label:init(args)
@@ -435,6 +440,39 @@ function Label:setText(text)
     end
 end
 
+function Label:update_scroll_inset()
+    if self.show_scroll_icons == nil then
+        self._show_scroll_icons = self:getTextHeight() > self.frame_body.height and 'right' or false
+    else
+        self._show_scroll_icons = self.show_scroll_icons
+    end
+    if self._show_scroll_icons then
+        -- here self._show_scroll_icons can only be either
+        -- 'left' or any true value which we interpret as right
+        local l,t,r,b = gui.parse_inset(self.frame_inset)
+        if self._show_scroll_icons == 'left' and l <= 0 then
+            l = 1
+        elseif r <= 0 then
+            r = 1
+        end
+        self.frame_inset = {l=l,t=t,r=r,b=b}
+    end
+end
+
+function Label:render_scroll_icons(dc, x, y1, y2)
+    if self.start_line_num ~= 1 then
+        dc:seek(x, y1):char(self.up_arrow_icon, self.scroll_icon_pen)
+    end
+    local last_visible_line = self.start_line_num + self.frame_body.height - 1
+    if last_visible_line < self:getTextHeight() then
+        dc:seek(x, y2):char(self.down_arrow_icon, self.scroll_icon_pen)
+    end
+end
+
+function Label:postComputeFrame()
+    self:update_scroll_inset()
+end
+
 function Label:preUpdateLayout()
     if self.auto_width then
         self.frame = self.frame or {}
@@ -465,6 +503,21 @@ function Label:onRenderBody(dc)
     render_text(self,dc,0,0,text_pen,self.text_dpen,is_disabled(self))
 end
 
+function Label:onRenderFrame(dc, rect)
+    if self._show_scroll_icons
+    and self:getTextHeight() > self.frame_body.height
+    then
+        local x = self._show_scroll_icons == 'left'
+                and self.frame_body.x1-dc.x1-1
+                or  self.frame_body.x2-dc.x1+1
+        self:render_scroll_icons(dc,
+            x,
+            self.frame_body.y1-dc.y1,
+            self.frame_body.y2-dc.y1
+        )
+    end
+end
+
 function Label:scroll(nlines)
     local n = self.start_line_num + nlines
     n = math.min(n, self:getTextHeight() - self.frame_body.height + 1)

From b9c36c1e632571a2257a071e2c2843959ae2ed0b Mon Sep 17 00:00:00 2001
From: Tachytaenius <henryfthomson@gmail.com>
Date: Fri, 29 Apr 2022 16:39:59 +0100
Subject: [PATCH 013/854] Added custom-raw-tokens utility (#2038)

* Added (chain) for [CHAIN_METAL_TEXT] armours in gui/materials.lua used by gui/create-item-- again (oops)

* Added customRawData utility

* Oops, whitespace

* Revised rawStringsFieldNames

* Dialed down on lua trickery and fixed wrongly formatted changelog entry

* Fixed changelog in wrong place and made customRawData a proper module

* Fixed not caching not-present tags, revised examples and fixed error

* Fixed whitespace. Changing settings in editor!

* customRawData docs

* Added getCreatureTag for respecting caste tags, "fixed" bizarre caching error (quotes because I don't even know what was causing it) and updated docs

* Added line limiting for docs, I guess

* Added missing string convert argument

* docs indent fix, code block fix, and revision

* Major revision

* gdi, docs error

* Another? But... huh.

* ...

* Made requested changes

* Whoops

* Rearrange docs lines

* Followed example, should fix linter issues

* fix typo. linted offline this time......

* Make it so that last instance of tag is what is read from

* Added requested change

* eventful key change

* i to lenArgs

* change eventful key

* add test for broken caste selection

* Major redesign

* tags --> tokens

* Added plant growth behaviour and did some requested changes

* More error handling

* fix docs

* Added basic error suppression

* Docs clarification.

* Docs registering example and fix error

* Strip errors on frame after onWorldLoad, not on map load

* Revert "Strip errors on frame after onWorldLoad, not on map load"

This reverts commit e20a0ef8d3743f79d961077f46910b77b16f36b9.

* Revert "Docs registering example and fix error"

This reverts commit 9c848c54c3f84e0ecc1dc421137c8a8b4a52280d.

* Revert "Docs clarification."

This reverts commit 6b4b6a1aa40c50398504f37ecf1ff0f93d6459b1.

* Revert "Added basic error suppression"

This reverts commit d11cb1438cf1e56ff700469e944f0b9af64651d7.

* Use more eventful key more consistent with other files

* use onStateChange instead of eventful and remove redundant utils require

* Code review stuff

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* Update docs/Lua API.rst

committing a suggestion

Co-authored-by: Alan <lethosor@users.noreply.github.com>

* Prepend examples with DFHACK_

* Remove unused parameters

* Use new ensure_key global

* Named a couple of unnamed arguments (untested)

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: Alan <lethosor@users.noreply.github.com>
---
 docs/Lua API.rst                  |  74 ++++++
 docs/changelog.txt                |   1 +
 library/lua/custom-raw-tokens.lua | 361 ++++++++++++++++++++++++++++++
 3 files changed, 436 insertions(+)
 create mode 100644 library/lua/custom-raw-tokens.lua

diff --git a/docs/Lua API.rst b/docs/Lua API.rst
index a61264c86..4615aaf4f 100644
--- a/docs/Lua API.rst	
+++ b/docs/Lua API.rst	
@@ -3198,6 +3198,80 @@ Predefined instance methods:
 
 To avoid confusion, these methods cannot be redefined.
 
+.. _custom-raw-tokens:
+
+custom-raw-tokens
+=================
+
+A module for reading custom tokens added to the raws by mods.
+
+* ``customRawTokens.getToken(typeDefinition, token)``
+
+  Where ``typeDefinition`` is a type definition struct as seen in ``df.global.world.raws``
+  (e.g.: ``dfhack.gui.getSelectedItem().subtype``) and ``token`` is the name of the custom token
+  you want read. The arguments from the token will then be returned as strings using single or
+  multiple return values. If the token is not present, the result is false; if it is present
+  but has no arguments, the result is true. For ``creature_raw``, it checks against no caste.
+  For ``plant_raw``, it checks against no growth.
+
+* ``customRawTokens.getToken(typeInstance, token)``
+
+  Where ``typeInstance`` is a unit, entity, item, job, projectile, building, plant, or interaction
+  instance. Gets ``typeDefinition`` and then returns the same as ``getToken(typeDefinition, token)``.
+  For units, it gets the token from the race or caste instead if appplicable. For plants growth items,
+  it gets the token from the plant or plant growth instead if applicable. For plants it does the same
+  but with growth number -1.
+
+* ``customRawTokens.getToken(raceDefinition, casteNumber, token)``
+
+  The same as ``getToken(unit, token)`` but with a specified race and caste. Caste number -1 is no caste.
+
+* ``customRawTokens.getToken(raceDefinition, casteName, token)``
+
+  The same as ``getToken(unit, token)`` but with a specified race and caste, using caste name (e.g. "FEMALE")
+  instead of number.
+
+* ``customRawTokens.getToken(plantDefinition, growthNumber, token)``
+
+  The same as ``getToken(plantGrowthItem, token)`` but with a specified plant and growth. Growth number -1
+  is no growth.
+
+* ``customRawTokens.getToken(plantDefinition, growthName, token)``
+
+  The same as ``getToken(plantGrowthItem, token)`` but with a specified plant and growth, using growth name
+  (e.g. "LEAVES") instead of number.
+
+Examples:
+
+* Using an eventful onReactionComplete hook, something for disturbing dwarven science::
+
+    if customRawTokens.getToken(reaction, "DFHACK_CAUSES_INSANITY") then
+        -- make unit who performed reaction go insane
+
+* Using an eventful onProjItemCheckMovement hook, a fast or slow-firing crossbow::
+
+    -- check projectile distance flown is zero, get firer, etc...
+    local multiplier = tonumber(customRawTokens.getToken(bow, "DFHACK_FIRE_RATE_MULTIPLIER")) or 1
+    firer.counters.think_counter = firer.counters.think_counter * multiplier
+
+* Something for a script that prints help text about different types of units::
+
+    local unit = dfhack.gui.getSelectedUnit()
+    if not unit then return end
+    local helpText = customRawTokens.getToken(unit, "DFHACK_HELP_TEXT")
+    if helpText then print(helpText) end
+
+* Healing armour::
+
+    -- (per unit every tick)
+    local healAmount = 0
+    for _, entry in ipairs(unit.inventory) do
+        if entry.mode == 2 then -- Worn
+            healAmount = healAmount + tonumber((customRawTokens.getToken(entry.item, "DFHACK_HEAL_AMOUNT")) or 0)
+        end
+    end
+    unit.body.blood_count = math.min(unit.body.blood_max, unit.body.blood_count + healAmount)
+
 ==================
 In-game UI Library
 ==================
diff --git a/docs/changelog.txt b/docs/changelog.txt
index adc25327a..8495f6717 100644
--- a/docs/changelog.txt
+++ b/docs/changelog.txt
@@ -78,6 +78,7 @@ changelog.txt uses a syntax similar to RST, with a few special sequences:
 - ``widgets.FilteredList`` now allows all punctuation to be typed into the filter and can match search keys that start with punctuation.
 - ``widgets.ListBox``: minimum height of dialog is now calculated correctly when there are no items in the list (e.g. when a filter doesn't match anything)
 - Lua wrappers for functions reverse-engineered from ambushing unit code: ``isHidden(unit)``, ``isFortControlled(unit)``, ``getOuterContainerRef(unit)``, ``getOuterContainerRef(item)``
+- Added `custom-raw-tokens` utility to Lua library for reading tokens added to raws by mods.
 - ``dwarfmode.MenuOverlay``: if ``sidebar_mode`` attribute is set, automatically manage entering a specific sidebar mode on show and restoring the previous sidebar mode on dismiss
 - ``dwarfmode.enterSidebarMode()``: passing ``df.ui_sidebar_mode.DesignateMine`` now always results in you entering ``DesignateMine`` mode and not ``DesignateChopTrees``, even when you looking at the surface where the default designation mode is ``DesignateChopTrees``
 - New string class function: ``string:escape_pattern()`` escapes regex special characters within a string
diff --git a/library/lua/custom-raw-tokens.lua b/library/lua/custom-raw-tokens.lua
new file mode 100644
index 000000000..6c19deb72
--- /dev/null
+++ b/library/lua/custom-raw-tokens.lua
@@ -0,0 +1,361 @@
+--[[
+custom-raw-tokens
+Allows for reading custom tokens added to raws by mods
+by Tachytaenius (wolfboyft)
+
+Yes, non-vanilla raw tokens do quietly print errors into the error log but the error log gets filled with garbage anyway
+
+NOTE: This treats plant growths similarly to creature castes but there is no way to deselect a growth, so don't put a token you want to apply to a whole plant after any growth definitions
+]]
+
+local _ENV = mkmodule("custom-raw-tokens")
+
+local customRawTokensCache = {}
+dfhack.onStateChange.customRawTokens = function(code)
+    if code == SC_WORLD_UNLOADED then
+        customRawTokensCache = {}
+    end
+end
+
+local function doToken(cacheTable, token, iter)
+    local args, lenArgs = {}, 0
+    for arg in iter do
+        lenArgs = lenArgs + 1
+        args[lenArgs] = arg
+    end
+    if lenArgs == 0 then
+        cacheTable[token] = true
+        return true
+    else
+        cacheTable[token] = args
+        return table.unpack(args)
+    end
+end
+
+local function getSubtype(item)
+    if item:getSubtype() == -1 then return nil end -- number
+    return dfhack.items.getSubtypeDef(item:getType(), item:getSubtype()) -- struct
+end
+
+local rawStringsFieldNames = {
+    [df.inorganic_raw] = "str",
+    [df.plant_raw] = "raws",
+    [df.creature_raw] = "raws",
+    [df.itemdef_weaponst] = "raw_strings",
+    [df.itemdef_trapcompst] = "raw_strings",
+    [df.itemdef_toyst] = "raw_strings",
+    [df.itemdef_toolst] = "raw_strings",
+    [df.itemdef_instrumentst] = "raw_strings",
+    [df.itemdef_armorst] = "raw_strings",
+    [df.itemdef_ammost] = "raw_strings",
+    [df.itemdef_siegeammost] = "raw_strings",
+    [df.itemdef_glovesst] = "raw_strings",
+    [df.itemdef_shoesst] = "raw_strings",
+    [df.itemdef_shieldst] = "raw_strings",
+    [df.itemdef_helmst] = "raw_strings",
+    [df.itemdef_pantsst] = "raw_strings",
+    [df.itemdef_foodst] = "raw_strings",
+    [df.entity_raw] = "raws",
+    [df.language_word] = "str",
+    [df.language_symbol] = "str",
+    [df.language_translation] = "str",
+    [df.reaction] = "raw_strings",
+    [df.interaction] = "str"
+}
+
+local function getTokenCore(typeDefinition, token)
+    -- Have we got a table for this item subtype/reaction/whatever?
+    -- tostring is needed here because the same raceDefinition key won't give the same value every time
+    local thisTypeDefCache = ensure_key(customRawTokensCache, tostring(typeDefinition))
+
+    -- Have we already extracted and stored this custom raw token for this type definition?
+    local tokenData = thisTypeDefCache[token]
+    if tokenData ~= nil then
+        if type(tokenData) == "table" then
+            return table.unpack(tokenData)
+        else
+            return tokenData
+        end
+    end
+
+    -- Get data anew
+    local success, dftype = pcall(function() return typeDefinition._type end)
+    local rawStrings = typeDefinition[rawStringsFieldNames[dftype]]
+    if not success or not rawStrings then
+        error("Expected a raw type definition or instance in argument 1")
+    end
+    local currentTokenIterator
+    for _, rawString in ipairs(rawStrings) do -- e.g. "[CUSTOM_TOKEN:FOO:2]"
+        local noBrackets = rawString.value:sub(2, -2)
+        local iter = noBrackets:gmatch("[^:]*") -- iterate over all the text between colons between the brackets
+        if token == iter() then
+            currentTokenIterator = iter -- we return for last instance of token if multiple instances are present
+        end
+    end
+    if currentTokenIterator then
+        return doToken(thisTypeDefCache, token, currentTokenIterator)
+    end
+    -- Not present
+    thisTypeDefCache[token] = false
+    return false
+end
+
+local function getRaceCasteTokenCore(raceDefinition, casteNumber, token)
+    -- Have we got tables for this race/caste pair?
+    local thisRaceDefCache = ensure_key(customRawTokensCache, tostring(raceDefinition))
+    local thisRaceDefCacheCaste = ensure_key(thisRaceDefCache, casteNumber)
+
+    -- Have we already extracted and stored this custom raw token for this race/caste pair?
+    local tokenData = thisRaceDefCacheCaste[token]
+    if tokenData ~= nil then
+        if type(tokenData) == "table" then
+            return table.unpack(tokenData)
+        elseif tokenData == false and casteNumber ~= -1 then
+            return getRaceCasteTokenCore(raceDefinition, -1, token)
+        else
+            return tokenData
+        end
+    end
+
+    -- Get data anew. Here we have to track what caste is currently being written to
+    local casteId, thisCasteActive
+    if casteNumber ~= -1 then
+        casteId = raceDefinition.caste[casteNumber].caste_id
+        thisCasteActive = false
+    else
+        thisCasteActive = true
+    end
+    local currentTokenIterator
+    for _, rawString in ipairs(raceDefinition.raws) do
+        local noBrackets = rawString.value:sub(2, -2)
+        local iter = noBrackets:gmatch("[^:]*")
+        local rawStringToken = iter()
+        if rawStringToken == "CASTE" or rawStringToken == "SELECT_CASTE" or rawStringToken == "SELECT_ADDITIONAL_CASTE" or rawStringToken == "USE_CASTE" then
+            local newCaste = iter()
+            if newCaste then
+                thisCasteActive = newCaste == casteId or rawStringToken == "SELECT_CASTE" and newCaste == "ALL"
+            end
+        elseif thisCasteActive and token == rawStringToken then
+            currentTokenIterator = iter
+        end
+    end
+    if currentTokenIterator then
+        return doToken(thisRaceDefCache, token, currentTokenIterator)
+    end
+    thisRaceDefCacheCaste[token] = false
+    if casteNumber == -1 then
+        return false -- Don't get into an infinite loop!
+    end
+    -- Not present, try with no caste
+    return getRaceCasteTokenCore(raceDefinition, -1, token)
+end
+
+local function getPlantGrowthTokenCore(plantDefinition, growthNumber, token)
+    -- Have we got tables for this plant/growth pair?
+    local thisPlantDefCache = ensure_key(customRawTokensCache, tostring(plantDefinition))
+    local thisPlantDefCacheGrowth = ensure_key(thisPlantDefCache, growthNumber)
+
+    -- Have we already extracted and stored this custom raw token for this plant/growth pair?
+    local tokenData = thisPlantDefCacheGrowth[token]
+    if tokenData ~= nil then
+        if type(tokenData) == "table" then
+            return table.unpack(tokenData)
+        elseif tokenData == false and growthNumber ~= -1 then
+            return getPlantGrowthTokenCore(plantDefinition, -1, token)
+        else
+            return tokenData
+        end
+    end
+
+    -- Get data anew. Here we have to track what growth is currently being written to
+    local growthId, thisGrowthActive
+    if growthNumber ~= -1 then
+        growthId = plantDefinition.growths[growthNumber].id
+        thisGrowthActive = false
+    else
+        thisGrowthActive = true
+    end
+    local currentTokenIterator
+    for _, rawString in ipairs(plantDefinition.raws) do
+        local noBrackets = rawString.value:sub(2, -2)
+        local iter = noBrackets:gmatch("[^:]*")
+        local rawStringToken = iter()
+        if rawStringToken == "GROWTH" then
+            local newGrowth = iter()
+            if newGrowth then
+                thisGrowthActive = newGrowth == growthId
+            end
+        elseif thisGrowthActive and token == rawStringToken then
+            currentTokenIterator = iter
+        end
+    end
+    if currentTokenIterator then
+        return doToken(thisPlantDefCache, token, currentTokenIterator)
+    end
+    thisPlantDefCacheGrowth[token] = false
+    if growthNumber == -1 then
+        return false
+    end
+    return getPlantGrowthTokenCore(plantDefinition, -1, token)
+end
+
+--[[
+Function signatures:
+getToken(rawStruct, token)
+getToken(rawStructInstance, token)
+getToken(raceDefinition, casteNumber, token)
+getToken(raceDefinition, casteString, token)
+getToken(plantDefinition, growthNumber, token)
+getToken(plantDefinition, growthString, token)
+]]
+
+local function getTokenArg1RaceDefinition(raceDefinition, b, c)
+    local casteNumber, token
+    if not c then
+        -- 2 arguments
+        casteNumber = -1
+        assert(type(b) == "string", "Invalid argument 2 to getToken, must be a string")
+        token = b
+    elseif type(b) == "number" then
+        -- 3 arguments, casteNumber
+        assert(b == -1 or b < #raceDefinition.caste and math.floor(b) == b and b >= 0, "Invalid argument 2 to getToken, must be -1 or a caste name or number present in the creature raw")
+        casteNumber = b
+        assert(type(c) == "string", "Invalid argument 3 to getToken, must be a string")
+        token = c
+    else
+        -- 3 arguments, casteString
+        assert(type(b) == "string", "Invalid argument 2 to getToken, must be -1 or a caste name or number present in the creature raw")
+        local casteString = b
+        for i, v in ipairs(raceDefinition.caste) do
+            if v.caste_id == casteString then
+                casteNumber = i
+                break
+            end
+        end
+        assert(casteNumber, "Invalid argument 2 to getToken, caste name \"" .. casteString .. "\" not found")
+        assert(type(c) == "string", "Invalid argument 3 to getToken, must be a string")
+        token = c
+    end
+    return getRaceCasteTokenCore(raceDefinition, casteNumber, token)
+end
+
+local function getTokenArg1PlantDefinition(plantDefinition, b, c)
+    local growthNumber, token
+    if not c then
+        -- 2 arguments
+        growthNumber = -1
+        assert(type(b) == "string", "Invalid argument 2 to getToken, must be a string")
+        token = b
+    elseif type(b) == "number" then
+        -- 3 arguments, growthNumber
+        assert(b == -1 or b < #plantDefinition.growths and math.floor(b) == b and b >= 0, "Invalid argument 2 to getToken, must be -1 or a growth name or number present in the plant raw")
+        growthNumber = b
+        assert(type(c) == "string", "Invalid argument 3 to getToken, must be a string")
+        token = c
+    else
+        -- 3 arguments, growthString
+        assert(type(b) == "string", "Invalid argument 2 to getToken, must be -1 or a growth name or number present in the plant raw")
+        local growthString = b
+        for i, v in ipairs(plantDefinition.growths) do
+            if v.id == growthString then
+                growthNumber = i
+                break
+            end
+        end
+        assert(growthNumber, "Invalid argument 2 to getToken, growth name \"" .. growthString .. "\" not found")
+        assert(type(c) == "string", "Invalid argument 3 to getToken, must be a string")
+        token = c
+    end
+    return getPlantGrowthTokenCore(plantDefinition, growthNumber, token)
+end
+
+local function getTokenArg1Else(userdata, token)
+    assert(type(token) == "string", "Invalid argument 2 to getToken, must be a string")
+    local rawStruct
+    if df.is_instance(df.historical_entity, userdata) then
+        rawStruct = userdata.entity_raw
+    elseif df.is_instance(df.item, userdata) then
+        rawStruct = getSubtype(userdata)
+    elseif df.is_instance(df.job, userdata) then
+        if job.job_type == df.job_type.CustomReaction then
+            for i, v in ipairs(df.global.world.raws.reactions.reactions) do
+                if job.reaction_name == v.code then
+                    rawStruct = v
+                    break
+                end
+            end
+        end
+    elseif df.is_instance(df.proj_itemst, userdata) then
+        if not userdata.item then return false end
+        if df.is_instance(df.item_plantst, userdata.item) or df.is_instance(df.item_plant_growthst, userdata.item) then
+            -- use plant behaviour from getToken
+            return getToken(userdata.item, token)
+        end
+        rawStruct = userdata.item and userdata.item.subtype
+    elseif df.is_instance(df.proj_unitst, userdata) then
+        if not usertdata.unit then return false end
+        -- special return so do tag here
+        local unit = userdata.unit
+        return getRaceCasteTokenCore(df.global.world.raws.creatures.all[unit.race], unit.caste, token)
+    elseif df.is_instance(df.building_workshopst, userdata) or df.is_instance(df.building_furnacest, userdata) then
+        rawStruct = df.building_def.find(userdata.custom_type)
+    elseif df.is_instance(df.interaction_instance, userdata) then
+        rawStruct = df.global.world.raws.interactions[userdata.interaction_id]
+    else
+        -- Assume raw struct *is* argument 1
+        rawStruct = userdata
+    end
+    if not rawStruct then return false end
+    return getTokenCore(rawStruct, token)
+end
+
+function getToken(from, b, c)
+    -- Argument processing
+    assert(from and type(from) == "userdata", "Expected userdata for argument 1 to getToken")
+    if df.is_instance(df.creature_raw, from) then
+        -- Signatures from here:
+        -- getToken(raceDefinition, casteNumber, token)
+        -- getToken(raceDefinition, casteString, token)
+        return getTokenArg1RaceDefinition(from, b, c)
+    elseif df.is_instance(df.unit, from) then
+        -- Signatures from here:
+        -- getToken(rawStructInstance, token)
+        assert(type(b) == "string", "Invalid argument 2 to getToken, must be a string")
+        local unit, token = from, b
+        return getRaceCasteTokenCore(df.global.world.raws.creatures.all[unit.race], unit.caste, token)
+    elseif df.is_instance(df.plant_raw, from) then
+        -- Signatures from here:
+        -- getToken(plantDefinition, growthNumber, token)
+        -- getToken(plantDefinition, growthString, token)
+        return getTokenArg1PlantDefinition(from, b, c)
+    elseif df.is_instance(df.plant, from) then
+        -- Signatures from here:
+        -- getToken(rawStructInstance, token)
+        assert(type(b) == "string", "Invalid argument 2 to getToken, must be a string")
+        local plantDefinition, plantGrowthNumber, token = df.global.world.raws.plants.all[from.material], -1, b
+        return getPlantGrowthTokenCore(plantDefinition, plantGrowthNumber, token)
+    elseif df.is_instance(df.item_plantst, from) then
+        -- Signatures from here:
+        -- getToken(rawStructInstance, token)
+        local matInfo = dfhack.matinfo.decode(from)
+        if matInfo.mode ~= "plant" then return false end
+        assert(type(b) == "string", "Invalid argument 2 to getToken, must be a string")
+        local plantDefinition, plantGrowthNumber, token = matInfo.plant, -1, b
+        return getPlantGrowthTokenCore(plantDefinition, plantGrowthNumber, token)
+    elseif df.is_instance(df.item_plant_growthst, from) then
+        -- Signatures from here:
+        -- getToken(rawStructInstance, token)
+        local matInfo = dfhack.matinfo.decode(from)
+        if matInfo.mode ~= "plant" then return false end
+        assert(type(b) == "string", "Invalid argument 2 to getToken, must be a string")
+        local plantDefinition, plantGrowthNumber, token = matInfo.plant, from.growth_print, b
+        return getPlantGrowthTokenCore(plantDefinition, plantGrowthNumber, token)
+    else
+        -- Signatures from here:
+        -- getToken(rawStruct, token)
+        -- getToken(rawStructInstance, token)
+        return getTokenArg1Else(from, b)
+    end
+end
+
+return _ENV

From af47434f52b2bfb1b3e85f0dbbf46c88e4bb110d Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Fri, 29 Apr 2022 11:29:00 -0700
Subject: [PATCH 014/854] protect against 0 width in string:wrap()

---
 library/lua/dfhack.lua      | 1 +
 library/lua/gui/widgets.lua | 3 ++-
 test/library/string.lua     | 2 ++
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/library/lua/dfhack.lua b/library/lua/dfhack.lua
index 671029015..e476ffa11 100644
--- a/library/lua/dfhack.lua
+++ b/library/lua/dfhack.lua
@@ -439,6 +439,7 @@ end
 -- multiple lines. If width is not specified, 72 is used.
 function string:wrap(width)
     width = width or 72
+    if width <= 0 then error('expected width > 0; got: '..tostring(width)) end
     local wrapped_text = {}
     for line in self:gmatch('[^\n]*') do
         local line_start_pos = 1
diff --git a/library/lua/gui/widgets.lua b/library/lua/gui/widgets.lua
index 8a091804c..b8782bd04 100644
--- a/library/lua/gui/widgets.lua
+++ b/library/lua/gui/widgets.lua
@@ -558,7 +558,8 @@ WrappedLabel.ATTRS{
 }
 
 function WrappedLabel:getWrappedText(width)
-    if not self.text_to_wrap then return nil end
+    -- 0 width can happen if the parent has 0 width
+    if not self.text_to_wrap or width <= 0 then return nil end
     local text_to_wrap = getval(self.text_to_wrap)
     if type(text_to_wrap) == 'table' then
         text_to_wrap = table.concat(text_to_wrap, NEWLINE)
diff --git a/test/library/string.lua b/test/library/string.lua
index d45be4b3f..d22f262bf 100644
--- a/test/library/string.lua
+++ b/test/library/string.lua
@@ -67,6 +67,8 @@ function test.wrap()
     expect.eq('hel\nlo\nwor\nld', ('hello world'):wrap(3))
     expect.eq('hel\nloo\nwor\nldo', ('helloo  worldo'):wrap(3))
     expect.eq('', (''):wrap())
+
+    expect.error_match('expected width > 0', function() ('somestr'):wrap(0) end)
 end
 
 function test.escape_pattern()

From e603fee3ce89301a170cde9147e57795fae7d730 Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Fri, 29 Apr 2022 12:10:05 -0700
Subject: [PATCH 015/854] move sidebar mode management code to init

from onAboutToShow(). this allows the frames to be calculated correctly
during widget instantiation. otherwise widgets can end up with -1 width
---
 library/lua/gui/dwarfmode.lua | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/library/lua/gui/dwarfmode.lua b/library/lua/gui/dwarfmode.lua
index b79f7a9b7..15b8cd1e8 100644
--- a/library/lua/gui/dwarfmode.lua
+++ b/library/lua/gui/dwarfmode.lua
@@ -443,11 +443,7 @@ MenuOverlay.ATTRS {
     sidebar_mode = DEFAULT_NIL,
 }
 
-function MenuOverlay:computeFrame(parent_rect)
-    return self.df_layout.menu, gui.inset_frame(self.df_layout.menu, self.frame_inset)
-end
-
-function MenuOverlay:onAboutToShow(parent)
+function MenuOverlay:init()
     if not dfhack.isMapLoaded() then
         -- sidebar menus are only valid when a fort map is loaded
         error('A fortress map must be loaded.')
@@ -471,7 +467,13 @@ function MenuOverlay:onAboutToShow(parent)
 
         enterSidebarMode(self.sidebar_mode)
     end
+end
 
+function MenuOverlay:computeFrame(parent_rect)
+    return self.df_layout.menu, gui.inset_frame(self.df_layout.menu, self.frame_inset)
+end
+
+function MenuOverlay:onAboutToShow(parent)
     self:updateLayout()
     if not self.df_layout.menu then
         error("The menu panel of dwarfmode is not visible")

From 24dd4d8ac0170a5559cb409d26b09a455fc099bf Mon Sep 17 00:00:00 2001
From: Myk <myk002@yahoo.com>
Date: Fri, 29 Apr 2022 20:24:09 -0700
Subject: [PATCH 016/854] Update init files (#2117)

* update example init files

replace onLoad.init-example with documentation on how to create scripts that run on world/map load
it was confusing to show it being loaded with sc-script since it gets autorun anyway if it is just named properly

* update changelog

* add quickfort keybinding

* move standard tweaks from dreamfort init to main
---
 data/examples/init/onMapLoad_dreamfort.init | 33 +++++++++++----------
 dfhack.init-example                         | 19 +++++++-----
 docs/changelog.txt                          |  1 +
 library/CMakeLists.txt                      |  2 +-
 onLoad.init-example                         |  1 -
 5 files changed, 31 insertions(+), 25 deletions(-)
 delete mode 100644 onLoad.init-example

diff --git a/data/examples/init/onMapLoad_dreamfort.init b/data/examples/init/onMapLoad_dreamfort.init
index 8e9c0134d..c75620846 100644
--- a/data/examples/init/onMapLoad_dreamfort.init
+++ b/data/examples/init/onMapLoad_dreamfort.init
@@ -3,29 +3,31 @@
 # configuration here is useful for any fort! Feed free to edit or override
 # to your liking.
 
-# Disallow cooking of otherwise useful item types
-on-new-fortress ban-cooking tallow; ban-cooking honey; ban-cooking oil; ban-cooking seeds; ban-cooking brew; ban-cooking fruit; ban-cooking mill; ban-cooking thread; ban-cooking milk; ban-cooking booze
-
 # Uncomment this next line if you want buildingplan (and quickfort) to use only
-# blocks for construction. If you do uncomment, be sure to bring some blocks
-# with you for starting workshops!
+# blocks (not bars or logs) for constructions and workshops. If you do
+# uncomment, be sure to bring some blocks with you for starting workshops!
 #on-new-fortress buildingplan set boulders false; buildingplan set logs false
 
+# Disable cooking of useful item types when you start a new fortress.
+on-new-fortress ban-cooking tallow; ban-cooking honey; ban-cooking oil; ban-cooking seeds; ban-cooking brew; ban-cooking fruit; ban-cooking mill; ban-cooking thread; ban-cooking milk; ban-cooking booze
+
+# Show a warning dialog when units are starving
 repeat -name warn-starving -time 10 -timeUnits days -command [ warn-starving ]
-repeat -name burial -time 7 -timeUnits days -command [ burial -pets ]
+
+# Force dwarves to drop tattered clothing instead of clinging to the scraps
 repeat -name cleanowned -time 1 -timeUnits months -command [ cleanowned X ]
-repeat -name clean -time 1 -timeUnits months -command [ clean all ]
-repeat -name feeding-timers -time 1 -timeUnits months -command [ fix/feeding-timers ]
-repeat -name stuckdoors -time 1 -timeUnits months -command [ fix/stuckdoors ]
+
+# Automatically enqueue orders to shear and milk animals
 repeat -name autoShearCreature -time 14 -timeUnits days -command [ workorder ShearCreature ]
 repeat -name autoMilkCreature -time 14 -timeUnits days -command [ workorder "{\"job\":\"MilkCreature\",\"item_conditions\":[{\"condition\":\"AtLeast\",\"value\":2,\"flags\":[\"empty\"],\"item_type\":\"BUCKET\"}]}" ]
+
+# Fulfill high-volume orders before slower once-daily orders
 repeat -name orders-sort -time 1 -timeUnits days -command [ orders sort ]
 
-tweak fast-heat 100
-tweak do-job-now
-fix/blood-del enable
+# Don't let caravans bring barrels of blood and other useless liquids
+fix/blood-del
 
-# manages crop assignment for farm plots
+# Manages crop assignment for farm plots
 enable autofarm
 autofarm default 30
 autofarm threshold 150 GRASS_TAIL_PIG
@@ -37,7 +39,8 @@ enable automelt
 enable tailor
 tailor enable
 
-# auto-assigns nesting birds to nestbox zones
+# auto-assigns nesting birds to nestbox zones and protects fertile eggs from
+# being cooked/eaten
 enable zone nestboxes
 autonestbox start
 
@@ -77,7 +80,7 @@ on-new-fortress autobutcher target 50 50 14 2 BIRD_GOOSE
 on-new-fortress autobutcher target 2 2 4 2 ALPACA SHEEP LLAMA
 # pigs give milk and meat and are zero-maintenance.
 on-new-fortress autobutcher target 5 5 6 2 PIG
-# generally unprofitable animals
+# butcher all unprofitable animals
 on-new-fortress autobutcher target 0 0 0 0 HORSE YAK DONKEY WATER_BUFFALO GOAT CAVY BIRD_DUCK BIRD_GUINEAFOWL
 # start it up!
 on-new-fortress autobutcher start; autobutcher watch all; autobutcher autowatch
diff --git a/dfhack.init-example b/dfhack.init-example
index 702ce5276..d181fcaa7 100644
--- a/dfhack.init-example
+++ b/dfhack.init-example
@@ -34,6 +34,9 @@ keybinding add Ctrl-K autodump-destroy-item
 # quicksave, only in main dwarfmode screen and menu page
 keybinding add Ctrl-Alt-S@dwarfmode/Default quicksave
 
+# gui/quickfort script - apply pre-made blueprints to the map
+keybinding add Ctrl-Shift-Q@dwarfmode gui/quickfort
+
 # gui/rename script - rename units and buildings
 keybinding add Ctrl-Shift-N gui/rename
 keybinding add Ctrl-Shift-T "gui/rename unit-profession"
@@ -155,9 +158,6 @@ keybinding add Alt-W@dfhack/lua/status_overlay "gui/workflow status"
 # autobutcher front-end
 keybinding add Shift-B@pet/List/Unit "gui/autobutcher"
 
-# assign weapon racks to squads so that they can be used
-keybinding add P@dwarfmode/QueryBuilding/Some/Weaponrack gui/assign-rack
-
 # view pathable tiles from active cursor
 keybinding add Alt-Shift-P@dwarfmode/LookAround gui/pathable
 
@@ -186,9 +186,6 @@ tweak military-stable-assign
 # in same list, color units already assigned to squads in brown & green
 tweak military-color-assigned
 
-# remove inverse dependency of squad training speed on unit list size and use more sparring
-# tweak military-training
-
 # make crafted cloth items wear out with time like in old versions (bug 6003)
 tweak craft-age-wear
 
@@ -210,17 +207,22 @@ tweak hotkey-clear
 # Allows lowercase letters in embark profile names, and allows exiting the name prompt without saving
 tweak embark-profile-name
 
+# Reduce performance impact of temperature changes
+tweak fast-heat 100
+
 # Misc. UI tweaks
 tweak block-labors              # Prevents labors that can't be used from being toggled
 tweak burrow-name-cancel
 tweak cage-butcher
 tweak civ-view-agreement
+tweak do-job-now
 tweak eggs-fertile
 tweak fps-min
 tweak hide-priority
 tweak kitchen-prefs-all
 tweak kitchen-prefs-empty
 tweak max-wheelbarrow
+tweak partial-items
 tweak shift-8-scroll
 tweak stone-status-all
 tweak title-start-rename
@@ -289,5 +291,6 @@ gui/load-screen enable
 # Extra DFHack command files #
 ##############################
 
-# Run commands in this file when a world loads
-sc-script add SC_WORLD_LOADED onLoad.init-example
+# Create a file named "onLoad.init" to run commands when a world is loaded
+# and/or create a file named "onMapLoad.init" to run commands when a map is
+# loaded. See the hack/examples/init/ directory for useful pre-made init files.
diff --git a/docs/changelog.txt b/docs/changelog.txt
index 8495f6717..f4d283099 100644
--- a/docs/changelog.txt
+++ b/docs/changelog.txt
@@ -61,6 +61,7 @@ changelog.txt uses a syntax similar to RST, with a few special sequences:
 - `blueprint`: ``track`` phase renamed to ``carve``. carved fortifications and (optionally) engravings are now captured in blueprints
 - `tweak` stable-cursor: Keep the cursor stable even when the viewport moves a small amount
 - `cursecheck`: Added a new parameter, ``ids``, to print creature and race IDs of the cursed creature.
+- Include recently-added tweaks in example dfhack.init file, clean up dreamfort onMapLoad.init file
 
 ## Documentation
 - Add more examples to the plugin skeleton files so they are more informative for a newbie
diff --git a/library/CMakeLists.txt b/library/CMakeLists.txt
index 026558ab0..4ec165308 100644
--- a/library/CMakeLists.txt
+++ b/library/CMakeLists.txt
@@ -461,7 +461,7 @@ endif()
 install(FILES xml/symbols.xml
     DESTINATION ${DFHACK_DATA_DESTINATION})
 # install the example autoexec file
-install(FILES ../dfhack.init-example ../onLoad.init-example
+install(FILES ../dfhack.init-example
     DESTINATION ${DFHACK_BINARY_DESTINATION})
 
 install(TARGETS dfhack-run dfhack-client binpatch
diff --git a/onLoad.init-example b/onLoad.init-example
deleted file mode 100644
index 1d32f07c9..000000000
--- a/onLoad.init-example
+++ /dev/null
@@ -1 +0,0 @@
-repeat -name warn-starving -time 10 -timeUnits days -command [ warn-starving ]

From e2fb15a3a548968a24ca180df95b9e09de49e421 Mon Sep 17 00:00:00 2001
From: Myk <myk002@yahoo.com>
Date: Fri, 29 Apr 2022 20:32:22 -0700
Subject: [PATCH 017/854] add dwarfmode.MenuOverlay:renderMapOverlay() (#2119)

* add dwarfmode.MenuOverlay:renderMapOverlay()

* ensure we move with the viewport when bounds_rect is nil
---
 docs/changelog.txt            |  1 +
 library/lua/gui/dwarfmode.lua | 49 +++++++++++++++++++++++++++++++++++
 2 files changed, 50 insertions(+)

diff --git a/docs/changelog.txt b/docs/changelog.txt
index f4d283099..56d743171 100644
--- a/docs/changelog.txt
+++ b/docs/changelog.txt
@@ -81,6 +81,7 @@ changelog.txt uses a syntax similar to RST, with a few special sequences:
 - Lua wrappers for functions reverse-engineered from ambushing unit code: ``isHidden(unit)``, ``isFortControlled(unit)``, ``getOuterContainerRef(unit)``, ``getOuterContainerRef(item)``
 - Added `custom-raw-tokens` utility to Lua library for reading tokens added to raws by mods.
 - ``dwarfmode.MenuOverlay``: if ``sidebar_mode`` attribute is set, automatically manage entering a specific sidebar mode on show and restoring the previous sidebar mode on dismiss
+- ``dwarfmode.MenuOverlay``: new class function ``renderMapOverlay`` to assist with drawing tiles over the visible map
 - ``dwarfmode.enterSidebarMode()``: passing ``df.ui_sidebar_mode.DesignateMine`` now always results in you entering ``DesignateMine`` mode and not ``DesignateChopTrees``, even when you looking at the surface where the default designation mode is ``DesignateChopTrees``
 - New string class function: ``string:escape_pattern()`` escapes regex special characters within a string
 - ``widgets.Panel``: if ``autoarrange_subviews`` is set, ``Panel``\s will now automatically lay out widgets vertically according to their current height.  This allows you to have widgets dynamically change height or become visible/hidden and you don't have to worry about recalculating frame layouts
diff --git a/library/lua/gui/dwarfmode.lua b/library/lua/gui/dwarfmode.lua
index 15b8cd1e8..e56211233 100644
--- a/library/lua/gui/dwarfmode.lua
+++ b/library/lua/gui/dwarfmode.lua
@@ -504,6 +504,55 @@ function MenuOverlay:render(dc)
         MenuOverlay.super.render(self, dc)
     end
 end
+
+-- Framework for managing rendering over the map area. This function is intended
+-- to be called from a subclass's onRenderBody() function.
+--
+-- get_overlay_char_fn takes a coordinate position and an is_cursor boolean and
+-- returns the char to render at that position and, optionally, the foreground
+-- and background colors to use to draw the char. If nothing should be rendered
+-- at that position, the function should return nil. If no foreground color is
+-- specified, it defaults to COLOR_GREEN. If no background color is specified,
+-- it defaults to COLOR_BLACK.
+--
+-- bounds_rect has elements {x1, x2, y1, y2} in global map coordinates (not
+-- screen coordinates). The rect is intersected with the visible map viewport to
+-- get the range over which get_overlay_char_fn is called. If bounds_rect is not
+-- specified, the entire viewport is scanned.
+--
+-- example call from a subclass:
+-- function MyMenuOverlaySubclass:onRenderBody()
+--     local function get_overlay_char(pos)
+--         return safe_index(self.overlay_chars, pos.z, pos.y, pos.x), COLOR_RED
+--     end
+--     self:renderMapOverlay(get_overlay_char, self.overlay_bounds)
+-- end
+function MenuOverlay:renderMapOverlay(get_overlay_char_fn, bounds_rect)
+    local vp = self:getViewport()
+    local rect = gui.ViewRect{rect=vp,
+                              clip_view=bounds_rect and gui.ViewRect{rect=bounds_rect} or nil}
+
+    -- nothing to do if the viewport is completely separate from the bounds_rect
+    if rect:isDefunct() then return end
+
+    local dc = gui.Painter.new(self.df_layout.map)
+    local z = df.global.window_z
+    local cursor = getCursorPos()
+    for y=rect.clip_y1,rect.clip_y2 do
+        for x=rect.clip_x1,rect.clip_x2 do
+            local pos = xyz2pos(x, y, z)
+            local overlay_char, fg_color, bg_color = get_overlay_char_fn(
+                    pos, same_xy(cursor, pos))
+            if not overlay_char then goto continue end
+            local stile = vp:tileToScreen(pos)
+            dc:map(true):seek(stile.x, stile.y):
+                    pen(fg_color or COLOR_GREEN, bg_color or COLOR_BLACK):
+                    char(overlay_char):map(false)
+            ::continue::
+        end
+    end
+end
+
 --fakes a "real" workshop sidebar menu, but on exactly selected workshop
 WorkshopOverlay = defclass(WorkshopOverlay, MenuOverlay)
 WorkshopOverlay.focus_path="WorkshopOverlay"

From e9a2de08cdcbdcd283198a8cf74ac4e4619bc544 Mon Sep 17 00:00:00 2001
From: DFHack-Urist via GitHub Actions
 <63161697+DFHack-Urist@users.noreply.github.com>
Date: Sat, 30 Apr 2022 07:17:43 +0000
Subject: [PATCH 018/854] Auto-update submodules

library/xml: master
---
 library/xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/library/xml b/library/xml
index b8d48430a..9c3164994 160000
--- a/library/xml
+++ b/library/xml
@@ -1 +1 @@
-Subproject commit b8d48430aa13570a668464ce40294a589f1f0b1f
+Subproject commit 9c31649940797f00ed0bc75c11467ed957802eff

From 9643246b185e605c29e1e7dfd205e7dbb63faed5 Mon Sep 17 00:00:00 2001
From: DFHack-Urist via GitHub Actions
 <63161697+DFHack-Urist@users.noreply.github.com>
Date: Sat, 30 Apr 2022 19:20:07 +0000
Subject: [PATCH 019/854] Auto-update submodules

library/xml: master
---
 library/xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/library/xml b/library/xml
index 9c3164994..54dcb842c 160000
--- a/library/xml
+++ b/library/xml
@@ -1 +1 @@
-Subproject commit 9c31649940797f00ed0bc75c11467ed957802eff
+Subproject commit 54dcb842c2215f9551c2930a294aeeec8f730578

From fe29bff845e3cd2494c6a63898c5797b886e2a81 Mon Sep 17 00:00:00 2001
From: Josh Cooper <cppcooper@users.noreply.github.com>
Date: Sat, 30 Apr 2022 21:46:47 -0700
Subject: [PATCH 020/854] Adds cxxrandom unit test and fixes interface problems
 (#2099)

* Adds cxxrandom unit test and fixes interface problems

* Tightens braces

* Adds detection code for Shuffle's seqID/engID

* Adds usage examples for cxxrandom

* Gives cxxrandom objects id ranges, sort of

* Updates changelog

* Updates changelog.txt

* Increases id space for cxxrandom

* Fixes bool distribution error message and improves check

* Adds comment explaining the seeded RNG tests for cxxrandom

* Fixes type problem for 32bit builds

* Reduces loop count a few magnitudes

* Fixes a mistake in test.cxxrandom_seed
---
 docs/Lua API.rst           |  39 +++++++-
 docs/changelog.txt         |   3 +
 plugins/cxxrandom.cpp      | 192 ++++++++++++++++---------------------
 plugins/lua/cxxrandom.lua  |   6 +-
 test/plugins/cxxrandom.lua |  76 +++++++++++++++
 5 files changed, 202 insertions(+), 114 deletions(-)
 create mode 100644 test/plugins/cxxrandom.lua

diff --git a/docs/Lua API.rst b/docs/Lua API.rst
index 4615aaf4f..c0dec4b6e 100644
--- a/docs/Lua API.rst	
+++ b/docs/Lua API.rst	
@@ -4401,7 +4401,7 @@ Native functions (exported to Lua)
 
   adds a number to the sequence
 
-- ``ShuffleSequence(rngID, seqID)``
+- ``ShuffleSequence(seqID, rngID)``
 
   shuffles the number sequence
 
@@ -4464,7 +4464,7 @@ Lua plugin classes
 ``bool_distribution``
 ~~~~~~~~~~~~~~~~~~~~~
 
-- ``init(min, max)``: constructor
+- ``init(chance)``: constructor
 - ``next(id)``: returns next boolean in the distribution
 
   - ``id``: engine ID to pass to native function
@@ -4477,6 +4477,41 @@ Lua plugin classes
 - ``shuffle()``: shuffles the sequence of numbers
 - ``next()``: returns next number in the sequence
 
+Usage
+-----
+
+The basic idea is you create a number distribution which you generate random numbers along. The C++ relies
+on engines keeping state information to determine the next number along the distribution.
+You're welcome to try and (ab)use this knowledge for your RNG purposes.
+
+Example::
+
+    local rng = require('plugins.cxxrandom')
+    local norm_dist = rng.normal_distribution(6820,116) // avg, stddev
+    local engID = rng.MakeNewEngine(0)
+    -- somewhat reminiscent of the C++ syntax
+    print(norm_dist:next(engID))
+
+    -- a bit more streamlined
+    local cleanup = true --delete engine on cleanup
+    local number_generator = rng.crng:new(engID, cleanup, norm_dist)
+    print(number_generator:next())
+
+    -- simplified
+    print(rng.rollNormal(engID,6820,116))
+
+The number sequences are much simpler. They're intended for where you need to randomly generate an index, perhaps in a loop for an array. You technically don't need an engine to use it, if you don't mind never shuffling.
+
+Example::
+
+    local rng = require('plugins.cxxrandom')
+    local g = rng.crng:new(rng.MakeNewEngine(0), true, rng.num_sequence:new(0,table_size))
+    g:shuffle()
+    for _ = 1, table_size do
+        func(array[g:next()])
+    end
+
+
 dig-now
 =======
 
diff --git a/docs/changelog.txt b/docs/changelog.txt
index 56d743171..06406087a 100644
--- a/docs/changelog.txt
+++ b/docs/changelog.txt
@@ -42,6 +42,8 @@ changelog.txt uses a syntax similar to RST, with a few special sequences:
 - `tweak` partial-items: displays percentages on partially-consumed items such as hospital cloth
 
 ## Fixes
+- `cxxrandom`: fixed exception when calling ``bool_distribution``
+- `cxxrandom`: fixed id order for ShuffleSequence, but adds code to detect which parameter is which so each id is used correctly. 16000 limit before things get weird (previous was 16 bits)
 - `autofarm` removed restriction on only planting 'discovered' plants
 - `luasocket` (and others): return correct status code when closing socket connections
 
@@ -64,6 +66,7 @@ changelog.txt uses a syntax similar to RST, with a few special sequences:
 - Include recently-added tweaks in example dfhack.init file, clean up dreamfort onMapLoad.init file
 
 ## Documentation
+- `cxxrandom`: added usage examples
 - Add more examples to the plugin skeleton files so they are more informative for a newbie
 - Lua API.rst added: ``isHidden(unit)``, ``isFortControlled(unit)``, ``getOuterContainerRef(unit)``, ``getOuterContainerRef(item)``
 - Update download link and installation instructions for Visual C++ 2015 build tools on Windows
diff --git a/plugins/cxxrandom.cpp b/plugins/cxxrandom.cpp
index 159edaefc..12f043214 100644
--- a/plugins/cxxrandom.cpp
+++ b/plugins/cxxrandom.cpp
@@ -37,94 +37,82 @@ DFHACK_PLUGIN("cxxrandom");
 #define PLUGIN_VERSION 2.0
 color_ostream *cout = nullptr;
 
-DFhackCExport command_result plugin_init (color_ostream &out, std::vector <PluginCommand> &commands)
-{
+DFhackCExport command_result plugin_init (color_ostream &out, std::vector <PluginCommand> &commands) {
     cout = &out;
     return CR_OK;
 }
 
-DFhackCExport command_result plugin_shutdown (color_ostream &out)
-{
+DFhackCExport command_result plugin_shutdown (color_ostream &out) {
     return CR_OK;
 }
 
-DFhackCExport command_result plugin_onstatechange(color_ostream &out, state_change_event event)
-{
+DFhackCExport command_result plugin_onstatechange(color_ostream &out, state_change_event event) {
     return CR_OK;
 }
 
+#define EK_ID_BASE (1ll << 40)
 
 class EnginesKeeper
 {
 private:
-    EnginesKeeper() {}
-    std::unordered_map<uint16_t, std::mt19937_64> m_engines;
-    uint16_t counter = 0;
+    EnginesKeeper() = default;
+    std::unordered_map<uint64_t, std::mt19937_64> m_engines;
+    uint64_t id_counter = EK_ID_BASE;
 public:
-    static EnginesKeeper& Instance()
-    {
+    static EnginesKeeper& Instance() {
         static EnginesKeeper instance;
         return instance;
     }
-    uint16_t NewEngine( uint64_t seed )
-    {
+    uint64_t NewEngine( uint64_t seed ) {
+        auto id = ++id_counter;
+        CHECK_INVALID_ARGUMENT(m_engines.count(id) == 0);
         std::mt19937_64 engine( seed != 0 ? seed : std::chrono::system_clock::now().time_since_epoch().count() );
-        m_engines[++counter] = engine;
-        return counter;
+        m_engines[id] = engine;
+        return id;
     }
-    void DestroyEngine( uint16_t id )
-    {
+    void DestroyEngine( uint64_t id ) {
         m_engines.erase( id );
     }
-    void NewSeed( uint16_t id, uint64_t seed )
-    {
+    void NewSeed( uint64_t id, uint64_t seed ) {
         CHECK_INVALID_ARGUMENT( m_engines.find( id ) != m_engines.end() );
         m_engines[id].seed( seed != 0 ? seed : std::chrono::system_clock::now().time_since_epoch().count() );
     }
-    std::mt19937_64& RNG( uint16_t id )
-    {
+    std::mt19937_64& RNG( uint64_t id ) {
         CHECK_INVALID_ARGUMENT( m_engines.find( id ) != m_engines.end() );
         return m_engines[id];
     }
 };
 
 
-uint16_t GenerateEngine( uint64_t seed )
-{
+uint64_t GenerateEngine( uint64_t seed ) {
     return EnginesKeeper::Instance().NewEngine( seed );
 }
 
-void DestroyEngine( uint16_t id )
-{
+void DestroyEngine( uint64_t id ) {
     EnginesKeeper::Instance().DestroyEngine( id );
 }
 
-void NewSeed( uint16_t id, uint64_t seed )
-{
+void NewSeed( uint64_t id, uint64_t seed ) {
     EnginesKeeper::Instance().NewSeed( id, seed );
 }
 
 
-int      rollInt(uint16_t id, int min, int max)
-{
+int      rollInt(uint64_t id, int min, int max) {
     std::uniform_int_distribution<int> ND(min, max);
     return ND(EnginesKeeper::Instance().RNG(id));
 }
 
-double   rollDouble(uint16_t id, double min, double max)
-{
+double   rollDouble(uint64_t id, double min, double max) {
     std::uniform_real_distribution<double> ND(min, max);
     return ND(EnginesKeeper::Instance().RNG(id));
 }
 
-double   rollNormal(uint16_t id, double mean, double stddev)
-{
+double   rollNormal(uint64_t id, double mean, double stddev) {
     std::normal_distribution<double> ND(mean, stddev);
     return ND(EnginesKeeper::Instance().RNG(id));
 }
 
-bool     rollBool(uint16_t id, float p)
-{
+bool     rollBool(uint64_t id, float p) {
     std::bernoulli_distribution ND(p);
     return ND(EnginesKeeper::Instance().RNG(id));
 }
@@ -137,118 +125,104 @@ private:
     std::vector<int64_t> m_numbers;
 public:
     NumberSequence(){}
-    NumberSequence( int64_t start, int64_t end )
-    {
-        for( int64_t i = start; i <= end; ++i )
-        {
+    NumberSequence( int64_t start, int64_t end ) {
+        for( int64_t i = start; i <= end; ++i ) {
             m_numbers.push_back( i );
         }
     }
     void Add( int64_t num ) { m_numbers.push_back( num ); }
-    void Reset()            { m_numbers.clear(); }
-    int64_t Next()
-    {
-        if(m_position >= m_numbers.size())
-        {
+    void Reset() { m_numbers.clear(); }
+    int64_t Next() {
+        if(m_position >= m_numbers.size()) {
             m_position = 0;
         }
         return m_numbers[m_position++];
     }
-    void Shuffle( uint16_t id )
-    {
-        std::shuffle( std::begin( m_numbers ), std::end( m_numbers ), EnginesKeeper::Instance().RNG( id ) );
+    void Shuffle( uint64_t engID ) {
+        std::shuffle( std::begin( m_numbers ), std::end( m_numbers ), EnginesKeeper::Instance().RNG(engID));
     }
-    void Print()
-    {
-        for( auto v : m_numbers )
-        {
+    void Print() {
+        for( auto v : m_numbers ) {
             cout->print( "%" PRId64 " ", v );
         }
     }
 };
 
+#define SK_ID_BASE 0
+
 class SequenceKeeper
 {
 private:
-    SequenceKeeper() {}
-    std::unordered_map<uint16_t, NumberSequence> m_sequences;
-    uint16_t counter = 0;
+    SequenceKeeper() = default;
+    std::unordered_map<uint64_t, NumberSequence> m_sequences;
+    uint64_t id_counter = SK_ID_BASE;
 public:
-    static SequenceKeeper& Instance()
-    {
+    static SequenceKeeper& Instance() {
         static SequenceKeeper instance;
         return instance;
     }
-    uint16_t MakeNumSequence( int64_t start, int64_t end )
-    {
-        m_sequences[++counter] = NumberSequence( start, end );
-        return counter;
-    }
-    uint16_t MakeNumSequence()
-    {
-        m_sequences[++counter] = NumberSequence();
-        return counter;
-    }
-    void DestroySequence( uint16_t id )
-    {
-        m_sequences.erase( id );
-    }
-    void AddToSequence( uint16_t id, int64_t num )
-    {
-        CHECK_INVALID_ARGUMENT( m_sequences.find( id ) != m_sequences.end() );
-        m_sequences[id].Add( num );
-    }
-    void Shuffle( uint16_t id, uint16_t rng_id )
-    {
-        CHECK_INVALID_ARGUMENT( m_sequences.find( id ) != m_sequences.end() );
-        m_sequences[id].Shuffle( rng_id );
-    }
-    int64_t NextInSequence( uint16_t id )
-    {
-        CHECK_INVALID_ARGUMENT( m_sequences.find( id ) != m_sequences.end() );
-        return m_sequences[id].Next();
-    }
-    void PrintSequence( uint16_t id )
-    {
-        CHECK_INVALID_ARGUMENT( m_sequences.find( id ) != m_sequences.end() );
-        auto seq = m_sequences[id];
+    uint64_t MakeNumSequence( int64_t start, int64_t end ) {
+        auto id = ++id_counter;
+        CHECK_INVALID_ARGUMENT(m_sequences.count(id) == 0);
+        m_sequences[id] = NumberSequence(start, end);
+        return id;
+    }
+    uint64_t MakeNumSequence() {
+        auto id = ++id_counter;
+        CHECK_INVALID_ARGUMENT(m_sequences.count(id) == 0);
+        m_sequences[id] = NumberSequence();
+        return id;
+    }
+    void DestroySequence( uint64_t seqID ) {
+        m_sequences.erase(seqID);
+    }
+    void AddToSequence(uint64_t seqID, int64_t num ) {
+        CHECK_INVALID_ARGUMENT(m_sequences.find(seqID) != m_sequences.end());
+        m_sequences[seqID].Add(num);
+    }
+    void Shuffle(uint64_t seqID, uint64_t engID ) {
+        uint64_t sid = seqID >= SK_ID_BASE ? seqID : engID;
+        uint64_t eid = engID >= EK_ID_BASE ? engID : seqID;
+        CHECK_INVALID_ARGUMENT(m_sequences.find(sid) != m_sequences.end());
+        m_sequences[sid].Shuffle(eid);
+    }
+    int64_t NextInSequence( uint64_t seqID ) {
+        CHECK_INVALID_ARGUMENT(m_sequences.find(seqID) != m_sequences.end());
+        return m_sequences[seqID].Next();
+    }
+    void PrintSequence( uint64_t seqID ) {
+        CHECK_INVALID_ARGUMENT(m_sequences.find(seqID) != m_sequences.end());
+        auto seq = m_sequences[seqID];
         seq.Print();
     }
 };
 
 
-uint16_t MakeNumSequence( int64_t start, int64_t end )
-{
-    if( start == end )
-    {
+uint64_t MakeNumSequence( int64_t start, int64_t end ) {
+    if (start == end) {
         return SequenceKeeper::Instance().MakeNumSequence();
     }
-    return SequenceKeeper::Instance().MakeNumSequence( start, end );
+    return SequenceKeeper::Instance().MakeNumSequence(start, end);
 }
 
-void     DestroyNumSequence( uint16_t id )
-{
-    SequenceKeeper::Instance().DestroySequence( id );
+void     DestroyNumSequence( uint64_t seqID ) {
+    SequenceKeeper::Instance().DestroySequence(seqID);
 }
 
-void     AddToSequence( uint16_t id, int64_t num )
-{
-    SequenceKeeper::Instance().AddToSequence( id, num );
+void     AddToSequence(uint64_t seqID, int64_t num ) {
+    SequenceKeeper::Instance().AddToSequence(seqID, num);
 }
 
-void     ShuffleSequence( uint16_t rngID, uint16_t id )
-{
-    SequenceKeeper::Instance().Shuffle( id, rngID );
+void     ShuffleSequence(uint64_t seqID, uint64_t engID ) {
+    SequenceKeeper::Instance().Shuffle(seqID, engID);
 }
 
-int64_t  NextInSequence( uint16_t id )
-{
-    return SequenceKeeper::Instance().NextInSequence( id );
+int64_t  NextInSequence( uint64_t seqID ) {
+    return SequenceKeeper::Instance().NextInSequence(seqID);
 }
 
-void DebugSequence( uint16_t id )
-{
-    SequenceKeeper::Instance().PrintSequence( id );
+void DebugSequence( uint64_t seqID ) {
+    SequenceKeeper::Instance().PrintSequence(seqID);
 }
 
 
diff --git a/plugins/lua/cxxrandom.lua b/plugins/lua/cxxrandom.lua
index 78e363bef..542575b9c 100644
--- a/plugins/lua/cxxrandom.lua
+++ b/plugins/lua/cxxrandom.lua
@@ -151,8 +151,8 @@ bool_distribution = {}
 function bool_distribution:new(chance)
     local o = {}
     self.__index = self
-    if type(min) ~= 'number' or type(max) ~= 'number' then
-        error("Invalid arguments in bool_distribution construction. min and max must be numbers.")
+    if type(chance) ~= 'number' or chance < 0 or chance > 1 then
+        error("Invalid arguments in bool_distribution construction. chance must be a number between 0.0 and 1.0 (both included).")
     end
     o.p = chance
     setmetatable(o,self)
@@ -208,7 +208,7 @@ function num_sequence:shuffle()
     if self.rngID == 'nil' then
         error("Add num_sequence object to crng as distribution, before attempting to shuffle.")
     end
-    ShuffleSequence(self.rngID, self.seqID)
+    ShuffleSequence(self.seqID, self.rngID)
 end
 
 return _ENV
diff --git a/test/plugins/cxxrandom.lua b/test/plugins/cxxrandom.lua
new file mode 100644
index 000000000..6b11e1937
--- /dev/null
+++ b/test/plugins/cxxrandom.lua
@@ -0,0 +1,76 @@
+local rng = require('plugins.cxxrandom')
+
+function test.cxxrandom_distributions()
+    rng.normal_distribution:new(0,5)
+    rng.real_distribution:new(-1,1)
+    rng.int_distribution:new(-20,20)
+    rng.bool_distribution:new(0.00000000001)
+    rng.num_sequence:new(-1000,1000)
+    -- no errors, no problem
+end
+
+--[[
+The below tests pass with their given seeds, if they begin failing
+for a given platform, or all around, new seeds should be found.
+
+Note: these tests which assert RNG, are mere sanity checks
+to ensure things haven't been severely broken by any changes
+]]
+
+function test.cxxrandom_seed()
+    local nd = rng.normal_distribution:new(0,500000)
+    local e1 = rng.MakeNewEngine(1)
+    local e2 = rng.MakeNewEngine(1)
+    local e3 = rng.MakeNewEngine(2)
+    local g1 = rng.crng:new(e1, true, nd)
+    local g2 = rng.crng:new(e2, true, nd)
+    local g3 = rng.crng:new(e3, true, nd)
+    local v1 = g1:next()
+    expect.eq(v1, g2:next())
+    expect.ne(v1, g3:next())
+end
+
+function test.cxxrandom_ranges()
+    local e1 = rng.MakeNewEngine(1)
+    local g1 = rng.crng:new(e1, true, rng.normal_distribution:new(0,1))
+    local g2 = rng.crng:new(e1, true, rng.real_distribution:new(-5,5))
+    local g3 = rng.crng:new(e1, true, rng.int_distribution:new(-5,5))
+    local g4 = rng.crng:new(e1, true, rng.num_sequence:new(-5,5))
+    for i = 1, 10 do
+        local a = g1:next()
+        local b = g2:next()
+        local c = g3:next()
+        local d = g4:next()
+        expect.ge(a, -5)
+        expect.ge(b, -5)
+        expect.ge(c, -5)
+        expect.ge(d, -5)
+        expect.le(a, 5)
+        expect.le(b, 5)
+        expect.le(c, 5)
+        expect.le(d, 5)
+    end
+    local gb = rng.crng:new(e1, true, rng.bool_distribution:new(0.00000000001))
+    for i = 1, 10 do
+        expect.false_(gb:next())
+    end
+end
+
+function test.cxxrandom_exports()
+    local id = rng.GenerateEngine(0)
+    rng.NewSeed(id, 2022)
+    expect.ge(rng.rollInt(id, 0, 1000), 0)
+    expect.ge(rng.rollDouble(id, 0, 1), 0)
+    expect.ge(rng.rollNormal(id, 5, 1), 0)
+    expect.true_(rng.rollBool(id, 0.9999999999))
+    local sid = rng.MakeNumSequence(0,8)
+    rng.AddToSequence(sid, 9)
+    rng.ShuffleSequence(sid, id)
+    for i = 1, 10 do
+        local v = rng.NextInSequence(sid)
+        expect.ge(v, 0)
+        expect.le(v, 9)
+    end
+    rng.DestroyNumSequence(sid)
+    rng.DestroyEngine(id)
+end

From 88f3627ef489c8ef575fd2fd582a7946ff028543 Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Sun, 1 May 2022 01:04:47 -0400
Subject: [PATCH 021/854] CI: Pass --color to sphinx

---
 .github/workflows/build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 4af9f5653..252b97a43 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -121,7 +121,7 @@ jobs:
         submodules: true
     - name: Build docs
       run: |
-        sphinx-build -W --keep-going -j3 . docs/html
+        sphinx-build -W --keep-going -j3 --color . docs/html
     - name: Upload docs
       uses: actions/upload-artifact@v1
       with:

From 71209880446ae77df3b092dd99aff54d47dce452 Mon Sep 17 00:00:00 2001
From: DFHack-Urist via GitHub Actions
 <63161697+DFHack-Urist@users.noreply.github.com>
Date: Sun, 1 May 2022 07:17:58 +0000
Subject: [PATCH 022/854] Auto-update submodules

library/xml: master
scripts: master
---
 library/xml | 2 +-
 scripts     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/library/xml b/library/xml
index 54dcb842c..e41298cfb 160000
--- a/library/xml
+++ b/library/xml
@@ -1 +1 @@
-Subproject commit 54dcb842c2215f9551c2930a294aeeec8f730578
+Subproject commit e41298cfb52427eb9a30366b292ffee80bedbd9a
diff --git a/scripts b/scripts
index d9e390cd5..d7220a486 160000
--- a/scripts
+++ b/scripts
@@ -1 +1 @@
-Subproject commit d9e390cd5509458bfbc0c1e2ecb01ae96bddc015
+Subproject commit d7220a4869d428a6c51f74282e45754d424e79da

From 876d9132b1b07fa7128d9096e1395f10667e7206 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pierre=20Lul=C3=A9?= <pierre@lule.fr>
Date: Sun, 1 May 2022 15:31:59 +0200
Subject: [PATCH 023/854] Add a link to the rust library for interacting with
 the remote API (#2121)

* Add link to the rust api client library

Add a link to https://docs.rs/dfhack-remote/latest/dfhack_remote/index.html a library interacting with DFHack remote API for the Rust programming language

* Use the docs.rs link

* Fix duplicate link label, included the change in the changelog

Co-authored-by: pierre <pierre>
---
 docs/Remote.rst    | 3 ++-
 docs/changelog.txt | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/docs/Remote.rst b/docs/Remote.rst
index c41a14058..de741f66a 100644
--- a/docs/Remote.rst
+++ b/docs/Remote.rst
@@ -75,10 +75,11 @@ from other (non-C++) languages, including:
 
 - `RemoteClientDF-Net <https://github.com/RosaryMala/RemoteClientDF-Net>`_ for C#
 - `dfhackrpc <https://github.com/BenLubar/dfhackrpc>`_ for Go
-- `dfhack-remote <https://github.com/alexchandel/dfhack-remote>`_ for JavaScript
+- `dfhack-remote <https://github.com/alexchandel/dfhack-remote>`__ for JavaScript
 - `dfhack-client-qt <https://github.com/cvuchener/dfhack-client-qt>`_ for C++ with Qt
 - `dfhack-client-python <https://github.com/McArcady/dfhack-client-python>`_ for Python (adapted from :forums:`"Blendwarf" <178089>`)
 - `dfhack-client-java <https://github.com/McArcady/dfhack-client-java>`_ for Java
+- `dfhack-remote <https://docs.rs/dfhack-remote/latest/dfhack_remote/index.html>`__ for Rust
 
 
 Protocol description
diff --git a/docs/changelog.txt b/docs/changelog.txt
index 06406087a..cc7f2af06 100644
--- a/docs/changelog.txt
+++ b/docs/changelog.txt
@@ -74,6 +74,7 @@ changelog.txt uses a syntax similar to RST, with a few special sequences:
 - `confirm`: Correct the command name in the plugin help text
 - ``Quickfort Blueprint Editing Guide``: added screenshots to the Dreamfort case study and overall clarified text
 - Document DFHack `lua-string` (``startswith``, ``endswith``, ``split``, ``trim``, ``wrap``, and ``escape_pattern``).
+- Added a Rust client library to the `remote interface docs <remote-client-libs>`
 
 ## API
 - Added functions reverse-engineered from ambushing unit code: ``Units::isHidden``, ``Units::isFortControlled``, ``Units::getOuterContainerRef``, ``Items::getOuterContainerRef``

From 5f1d2a08e49b1b3d6e0ed41fc6cdf84cc134e4b6 Mon Sep 17 00:00:00 2001
From: DFHack-Urist via GitHub Actions
 <63161697+DFHack-Urist@users.noreply.github.com>
Date: Sun, 1 May 2022 13:33:50 +0000
Subject: [PATCH 024/854] Auto-update submodules

library/xml: master
scripts: master
---
 library/xml | 2 +-
 scripts     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/library/xml b/library/xml
index e41298cfb..5fe90d06e 160000
--- a/library/xml
+++ b/library/xml
@@ -1 +1 @@
-Subproject commit e41298cfb52427eb9a30366b292ffee80bedbd9a
+Subproject commit 5fe90d06ebad4f9686545b7c961c2c07b8bcb799
diff --git a/scripts b/scripts
index d7220a486..74f03c0e4 160000
--- a/scripts
+++ b/scripts
@@ -1 +1 @@
-Subproject commit d7220a4869d428a6c51f74282e45754d424e79da
+Subproject commit 74f03c0e4a5a7818b7a1cbc3576ce2c3d30d3696

From 4439333f58061063ec463ae2943ed79cd637afa2 Mon Sep 17 00:00:00 2001
From: Josh Cooper <cppcooper@users.noreply.github.com>
Date: Sun, 1 May 2022 08:55:25 -0700
Subject: [PATCH 025/854] Adds ccache to build workflow (#2122)

* Adds ccache to build workflow

* Revises ccache actions cache key
---
 .github/workflows/build.yml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 252b97a43..e8506ae9b 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -29,6 +29,7 @@ jobs:
       run: |
         sudo apt-get update
         sudo apt-get install \
+            ccache \
             libgtk2.0-0 \
             libncursesw5 \
             libsdl-image1.2-dev \
@@ -60,6 +61,11 @@ jobs:
       with:
         path: ~/DF
         key: ${{ steps.env_setup.outputs.df_version }}
+    - name: Fetch ccache
+      uses: actions/cache@v2
+      with:
+        path: ~/.ccache
+        key: ccache-${{ matrix.os }}-gcc-${{ matrix.gcc }}
     - name: Download DF
       run: |
         sh ci/download-df.sh

From e077e95f690c7163d832e2a3f31028c92d3dcdbd Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Sun, 1 May 2022 13:23:41 -0400
Subject: [PATCH 026/854] Add pre-commit hook to check Authors.rst

---
 .pre-commit-config.yaml | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 47f314e2a..26d135ca2 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -32,4 +32,12 @@ repos:
       exclude_types:
         - json
 # specific to dfhack:
+- repo: local
+  hooks:
+    - id: authors-rst
+      name: Check Authors.rst
+      language: python
+      entry: python3 ci/authors-rst.py
+      files: docs/Authors\.rst
+      pass_filenames: false
 exclude: '^(depends/|data/examples/.*\.json$|.*\.diff$)'

From cc20d9fbb797c3da00c6318714ef595994ab57e7 Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Sun, 1 May 2022 13:35:30 -0400
Subject: [PATCH 027/854] Update Authors.rst

Checked as far back as 0.47.04-r1.
Oldest missing was chrismdp from before 0.47.05-r3.
---
 docs/Authors.rst | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/docs/Authors.rst b/docs/Authors.rst
index a6fa5a3d8..38fe19862 100644
--- a/docs/Authors.rst
+++ b/docs/Authors.rst
@@ -34,6 +34,7 @@ brndd                   brndd                   burneddi
 Caldfir                 caldfir
 Carter Bray             Qartar
 Chris Dombroski         cdombroski
+Chris Parsons           chrismdp
 Clayton Hughes
 Clément Vuchener        cvuchener
 daedsidog               daedsidog
@@ -47,6 +48,7 @@ Deon
 DoctorVanGogh           DoctorVanGogh
 Donald Ruegsegger       hashaash
 doomchild               doomchild
+DwarvenM                DwarvenM
 ElMendukol              ElMendukol
 enjia2000
 Eric Wald               eswald
@@ -59,6 +61,7 @@ Gabe Rau                gaberau
 gchristopher            gchristopher
 George Murray           GitOnUp
 grubsteak               grubsteak
+Guilherme Abraham       GuilhermeAbraham
 Harlan Playford         playfordh
 Hayati Ayguen           hayguen
 Herwig Hochleitner      bendlas
@@ -112,6 +115,7 @@ napagokc                napagokc
 Neil Little             nmlittle
 Nick Rart               nickrart                comestible
 Nicolas Ayala           nicolasayala
+Nik Nyby                nikolas
 Nikolay Amiantov        abbradar
 nocico                  nocico
 Omniclasm
@@ -123,6 +127,7 @@ Paul Fenwick            pjf
 PeridexisErrant         PeridexisErrant
 Petr Mrázek             peterix
 Pfhreak                 Pfhreak
+Pierre Lulé             plule
 Pierre-David Bélanger   pierredavidbelanger
 potato
 Priit Laes              plaes
@@ -173,6 +178,7 @@ Theo Kalfas             teolandon
 therahedwig             therahedwig
 ThiagoLira              ThiagoLira
 thurin                  thurin
+Tim Siegel              softmoth
 Tim Walberg             twalberg
 Timothy Collett         danaris
 Timur Kelman            TymurGubayev

From 2328c530e26e966742cb4c075f6d403011db1bc1 Mon Sep 17 00:00:00 2001
From: DFHack-Urist via GitHub Actions
 <63161697+DFHack-Urist@users.noreply.github.com>
Date: Mon, 2 May 2022 07:18:18 +0000
Subject: [PATCH 028/854] Auto-update submodules

scripts: master
---
 scripts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts b/scripts
index 74f03c0e4..714ef87ae 160000
--- a/scripts
+++ b/scripts
@@ -1 +1 @@
-Subproject commit 74f03c0e4a5a7818b7a1cbc3576ce2c3d30d3696
+Subproject commit 714ef87aef713af94874c6441e7810b9cf9ef312

From 8703eeef9128433dfcbebf9c27bf67d48c5ff36a Mon Sep 17 00:00:00 2001
From: Myk <myk002@yahoo.com>
Date: Mon, 2 May 2022 09:29:02 -0700
Subject: [PATCH 029/854] [dreamfort] pull in changes from Google Drive sources
 (#2124)

* update dreamfort from online spreadsheets

* add zones for guildhall level
---
 data/blueprints/library/dreamfort.csv | 66 ++++++++++++++++++++-------
 1 file changed, 50 insertions(+), 16 deletions(-)

diff --git a/data/blueprints/library/dreamfort.csv b/data/blueprints/library/dreamfort.csv
index c58ce9111..07aeb09a0 100644
--- a/data/blueprints/library/dreamfort.csv
+++ b/data/blueprints/library/dreamfort.csv
@@ -28,7 +28,7 @@
 ""
 "Dreamfort works best at an embark site that is flat and has at least one soil layer. New players should avoid embarks with aquifers if they are not prepared to deal with them. Bring picks for mining, an axe for woodcutting, and an anvil for a forge. Bring a few blocks to speed up initial workshop construction as well. That's all you really need, but see the example embark profile in the online spreadsheets for a more complete setup."
 ""
-"Other DFHack scripts and plugins also work very well with Dreamfort, such as autofarm, automelt, autonestbox, burial, prioritize, seedwatch, tailor, and, of course, buildingplan. An init file that configures all these plugins is distributed with DFHack as hack/examples/init/onMapLoad_dreamfort.init."
+"Other DFHack commands also work very well with Dreamfort, such as autofarm, autonestbox, prioritize, seedwatch, tailor, and, of course, buildingplan. An init file that gets everything configured for you is distributed with DFHack as hack/examples/init/onMapLoad_dreamfort.init."
 Put that file in your Dwarf Fortress directory -- the same directory that has dfhack.init.
 ""
 "Also copy the files in hack/examples/orders/ to dfhack-config/orders/ and the files in hack/examples/professions/ to professions/. We'll be using these files later. See https://docs.dfhack.org/en/stable/docs/guides/examples-guide.html for more information, including suggestions on how many dwarves of each profession you are likely to need at each stage of fort maturity."
@@ -46,7 +46,7 @@ interactively."
 "# The dreamfort.csv distributed with DFHack is generated with the following command:
   for fname in dreamfort*.xlsx; do xlsx2csv -a -p '' ""$fname""; done | sed 's/,*$//'"
 #notes label(checklist) command checklist
-"Here is the recommended order for Dreamfort commands. You can copy/paste the command lines directly into the DFHack terminal, or, if you prefer, you can run the blueprints in the UI with gui/quickfort. See the level walkthroughs for context and details. Also remember to read the messages the blueprints print out after you run them so you don't miss any important manual steps."
+"Here is the recommended order for Dreamfort commands. You can copy/paste the command lines directly into the DFHack terminal, or, if you prefer, you can run the blueprints in the UI with gui/quickfort. See the walkthroughs (the ""help"" blueprints) for context and details. Also remember to read the messages the blueprints print out after you run them so you don't miss any important manual steps."
 ""
 -- Preparation (before you embark!) --
 Copy hack/examples/init/onMapLoad_dreamfort.init to your DF directory
@@ -67,7 +67,7 @@ quickfort run library/dreamfort.csv -n /surface1,# Run when you find your center
 quickfort run library/dreamfort.csv -n /dig_all,"# Run when you find a suitable rock layer for the industry level. It designates digging for industry, services, guildhall, suites, and apartments all in one go. This list does not include the farming level, which we'll dig in the uppermost soil layer a bit later. Note that it is more efficient for your miners if you designate your digging before they dig the central stairs past that level since the stairs are dug at a low priority. This keeps your miners focused on one level at a time. If you need to designate your levels individually due to caverns interrupting the sequence or just because it is your preference, run the level-specific dig blueprints (i.e. /industry1, /services1, /guildhall1, /suites1, and 5 levels of /apartments1) instead of running /dig_all."
 ""
 -- Core fort (should finish at about the third migration wave) --
-quickfort run library/dreamfort.csv -n /surface2,# Run after initial trees are cleared.
+quickfort run library/dreamfort.csv -n /surface2,"# Run after initial trees are cleared. If you are deconstructing the wagon now, wait until after the wagon is deconstructed so the jobs that depend on wagon contents (e.g. blocks) don't get canceled later."
 quickfort run library/dreamfort.csv -n /farming1,# Run when channels are dug and the additional designated trees are cleared.
 quickfort run library/dreamfort.csv -n /farming2,# Run when the farming level has been dug out.
 quickfort run library/dreamfort.csv -n /surface3,# Run right after /farming2.
@@ -78,7 +78,7 @@ quickfort run library/dreamfort.csv -n /surface4,"# Run after the walls and floo
 "quickfort run,orders library/dreamfort.csv -n /services2",# Run when the services levels have been dug out. Feel free to remove the orders for the ropes if you already brought them with you.
 orders import basic,"# Run after the first migration wave, so you have dorfs to do all the basic tasks. Note that this is the ""orders"" plugin, not the ""quickfort orders"" command."
 "quickfort run,orders library/dreamfort.csv -n /surface5","# Run when all marked trees on the surface are chopped down and walls and floors have been constructed, including the roof section over the future barracks."
-prioritize ConstructBuilding,# Run when you see the bridges ready to be built so the masons come and actually build them.
+prioritize ConstructBuilding,# Run when you see the bridges ready to be built so the busy masons come and build them.
 "quickfort run,orders library/dreamfort.csv -n /surface6",# Run when at least the beehives and weapon rack are constructed and you have linked all levers to their respective bridges.
 "quickfort run,orders library/dreamfort.csv -n /surface7",# Run after the surface walls are completed and any marked trees are chopped down.
 ""
@@ -94,6 +94,7 @@ orders import furnace,# Automated production of basic furnace-related items. Don
 "quickfort run,orders library/dreamfort.csv -n /apartments3",# Run when all beds have been constructed on the first apartments level.
 "quickfort run,orders library/dreamfort.csv -n /services3","# Run after the dining table and chair, weapon rack, and archery targets have been constructed. Also wait until after you complete /surface7, though, because surface defenses are more important than a grand dining hall."
 "quickfort run,orders library/dreamfort.csv -n /guildhall2",# Run when the guildhall level has been dug out.
+"quickfort run,orders library/dreamfort.csv -n /guildhall3",# Optionally run after /guildhall2 to build default furnishings.
 "quickfort run,orders library/dreamfort.csv -n /farming4",# Run once you have a cache of potash.
 orders import military,# Automated production of military equipment. Turn on automelt in the meltables piles on the industry level to automatically upgrade all metal military equipment to masterwork quality. These orders are optional if you are not using a military.
 orders import smelting,# Automated production of all types of metal bars.
@@ -104,7 +105,7 @@ orders import glassstock,# Maintains a small stock of all types of glass furnitu
 -- Repeat for each remaining apartments level as needed --
 "quickfort run,orders library/dreamfort.csv -n /apartments2",# Run when the apartment level has been dug out.
 "quickfort run,orders library/dreamfort.csv -n /apartments3",# Run when all beds have been constructed.
-burial -pets,# Run once the coffins are placed to set them to allow for burial. This is handled for you if you are using the provided onMapLoad_dreamfort.init file.
+burial -pets,# Run once the coffins are placed to set them to allow for burial.
 
 See this checklist online at https://docs.google.com/spreadsheets/d/13PVZ2h3Mm3x_G1OXQvwKd7oIR2lK4A1Ahf6Om1kFigw/edit#gid=1459509569
 #notes label(setup_help)
@@ -113,14 +114,14 @@ Makes common initial adjustments to in-game settings.
 "The /setup blueprint is intended to be run once at the start of the game, before anything else is changed. Players are welcome to make any further customizations after this blueprint is run. Please be sure to run the /setup blueprint before making any other changes, though, so your settings are not overwritten!"
 ""
 The following settings are changed:
-"- The manager, chief medical dwarf, broker, and bookkeeper noble roles are assigned to the first suggested dwarf. This is likely to be the expedition leader, but the game could suggest others if they have relevant skills. Bookkeeping is also set to the highest precision."
+"- The manager, chief medical dwarf, broker, and bookkeeper noble roles are assigned to the first suggested dwarf. This is likely to be the expedition leader, but the game could suggest others if they have relevant skills. Bookkeeping is set to the highest precision."
 ""
 - Standing orders are set to:
   - only farmers harvest
   - gather refuse from outside (incl. vermin)
-  - no autoloom (we'll be managing cloth production with automated orders)
+  - no autoloom (so the hospital always has thread -- we'll be managing cloth production with automated orders)
 ""
-"- A burrow named ""Inside"" is created (it's up to the player to define the area). It is intended for use in getting your civilians to safety during sieges. An alert named ""Siege"" is also created and associated with the ""Inside"" burrow."
+"- A burrow named ""Inside"" is created, but it's up to the player to define the area as the fort expands. It is intended for use in getting your civilians to safety during sieges. A military alert named ""Siege"" is also created and associated with the ""Inside"" burrow."
 ""
 - Military uniforms get the following modifications:
   - all default uniforms set to replace clothing
@@ -144,7 +145,7 @@ starthotkeys: H{sethotkey fkey={F2} name=Farming}{sethotkey fkey={F3} name=Indus
 ""
 "#config label(setup) message(Please set the zoom targets of the hotkeys (the 'H' menu) according to where you actually end up digging the levels.
 As you build your fort, expand the ""Inside"" burrow to include new civilian-safe areas.
-Optionally, add a leather cloak to your military uniforms to enhance the protection of the uniforms.
+Optionally, add a leather cloak to your military uniforms to enhance their protection rating.
 Nothing in Dreamfort depends on these settings staying as they are. Feel free to change any setting to your personal preference.) assign nobles, set standing orders, create burrows, make adjustments to military uniforms, and set hotkey names"
 {startnobles}{startorders}{startburrows}{startmilitary}{starthotkeys}
 "#meta label(dig_all) start(central stairs on industry level) dig industry, services, guildhall, suites, and apartments levels. does not include farming."
@@ -532,7 +533,7 @@ Feel free to assign an unimportant animal to the pasture in the main entranceway
 
 
 
-"#place label(surface_place_start) start(19; 19) hidden() message(if you haven't already, now is a good time to deconstruct the wagon) starting stockpiles"
+#place label(surface_place_start) start(19; 19) hidden() starting stockpiles
 
 
 
@@ -974,7 +975,7 @@ You might also want to set the ""trade goods quantum"" stockpile to Auto Trade i
 ,,,`,,`,nocontainers,crafts,,,,,,,`,,,,"{givename name=""inner main gate""}",,,,`,,,,,,,,,`,,`
 ,,,`,,`,"{givename name=""trade goods""}",,,,,,,,,,,,,,,,,,,,,,,,,`,,`
 ,,,`,,`,{forbidmasterworkfinishedgoods}{forbidartifactfinishedgoods},,,,,,,,"{givename name=""trade depo gate""}",,,,,,,,"{givename name=""barracks gate""}",,,,,,,,,`,,`
-,,,`,,`,,"{quantumstopfromnorth name=""Trade Goods Dumper""}",,,,,,,,,,,,,,,,,"{quantumstop name=""Prisoner quantum"" move={Up 5} move_back={Down 5} route_enable={prisoner_route_enable}}{givename name=""prisoner dumper""}",,,,,,,`,,`
+,,,`,,`,,"{quantumstopfromnorth name=""Trade Goods quantum""}",,,,,,,,,,,,,,,,,"{quantumstop name=""Prisoner quantum"" move={Up 5} move_back={Down 5} route_enable={prisoner_route_enable}}{givename name=""prisoner dumper""}",,,,,,,`,,`
 ,,,`,,`,,"{quantum name=""trade goods quantum""}",,,,,,,`,,,,,,,,`,,"{quantum name=""prisoner quantum"" quantum_enable={enableanimals}}",,,,,,,`,,`
 ,,,`,,`,`,`,`,`,`,`,`,`,`,,,,,,,,`,`,`,`,`,`,`,`,`,`,,`
 ,,,`,,"{givename name=""left outer gate""}",,,,,,,,,"{givename name=""left inner gate""}",,,,,,,,"{givename name=""right inner gate""}",,,,,,,,,"{givename name=""right outer gate""}",,`
@@ -2554,14 +2555,14 @@ query_jail/services_query_jail
 Screenshot: https://drive.google.com/file/d/17jHiCKeZm6FSS-CI4V0r0GJZh09nzcO_
 ""
 Features:
-"- Big rooms, optionally pre-furnished. Double-thick walls to ensure engravings add value to the ""correct"" side. Fill with furniture and assign as needed."
+"- Big rooms, optionally pre-furnished. Double-thick walls to ensure engravings add value to the ""correct"" side. Declare locations as needed."
 ""
 Guildhall Walkthrough:
 1) Dig out the rooms with /guildhall1.
 ""
-"2) Once the area is dug out, add doors and a few statues with /guildhall2. Run ""quickfort orders"" for /guildhall2."
+"2) Once the area is dug out, pre-create the zones and add doors and a few statues with /guildhall2. Run ""quickfort orders"" for /guildhall2."
 ""
-"3) Furnish individual rooms manually, or alternately get default furnishings for a variety of room types by running /guildhall3. Declare appropriate locations as you need guildhalls, libraries, and temples. If you need more rooms, you can dig another /guildhall1 in an unused z-level."
+"3) Furnish individual rooms manually, or get default furnishings for a variety of room types by running /guildhall3. Declare appropriate locations from the pre-created zones as you need guildhalls, libraries, and temples. If you need more rooms, you can dig another /guildhall1 in an unused z-level."
 "#dig label(guildhall1) start(15; 15; central stairs) message(Once the area is dug out, continue with /guildhall2.)"
 
 
@@ -2592,7 +2593,10 @@ Guildhall Walkthrough:
 ,,d,d,d,d,d,d,d,,,d,d,d,d,d,d,d,,,d,d,d,d,d,d,d
 
 
-"#build label(guildhall2) start(15; 15; central stairs) message(Remember to enqueue manager orders for this blueprint.
+#meta label(guildhall2)
+doors/guildhall_doors
+zones/guildhall_zones
+"#build label(guildhall_doors) start(15; 15; central stairs) hidden() message(Remember to enqueue manager orders for this blueprint.
 Smooth/engrave tiles, furnish rooms, and declare locations as required.) build doors"
 
 
@@ -2623,6 +2627,36 @@ Smooth/engrave tiles, furnish rooms, and declare locations as required.) build d
 ,,`,`,`,`,`,`,`,,,`,`,`,`,`,`,`,,,`,`,`,`,`,`,`
 
 
+#zone label(guildhall_zones) start(15; 15; central stairs) hidden() designate zones
+
+,m(9x9),,,,,,,,,m(9x9),,,,,,,,,m(9x9)
+,,`,`,`,`,`,`,`,,,`,`,`,`,`,`,`,,,`,`,`,`,`,`,`
+,,`,`,`,`,`,`,`,,,`,`,`,`,`,`,`,,,`,`,`,`,`,`,`
+,,`,`,`,`,`,`,`,,,`,`,`,`,`,`,`,,,`,`,`,`,`,`,`
+,,`,`,`,`,`,`,`,,,`,`,`,`,`,`,`,,,`,`,`,`,`,`,`
+,,`,`,`,`,`,`,`,,,`,`,`,`,`,`,`,,,`,`,`,`,`,`,`
+,,`,`,`,`,`,`,`,~,~,`,`,`,`,`,`,`,~,~,`,`,`,`,`,`,`
+,,`,`,`,`,`,`,`,,,`,`,`,`,`,`,`,,,`,`,`,`,`,`,`
+,,,,,,,~,,,,,,~,,~,,,,,,~
+,m(9x9),,,,,,~,,,,,,`,~,`,,,,m(9x9),,~
+,,`,`,`,`,`,`,`,,,,,~,,~,,,,,`,`,`,`,`,`,`
+,,`,`,`,`,`,`,`,,,,`,`,`,`,`,,,,`,`,`,`,`,`,`
+,,`,`,`,`,`,`,`,~,`,~,`,,,,`,~,`,~,`,`,`,`,`,`,`
+,,`,`,`,`,`,`,`,,~,,`,,`,,`,,~,,`,`,`,`,`,`,`
+,,`,`,`,`,`,`,`,~,`,~,`,,,,`,~,`,~,`,`,`,`,`,`,`
+,,`,`,`,`,`,`,`,,,,`,`,`,`,`,,,,`,`,`,`,`,`,`
+,,`,`,`,`,`,`,`,,,,,~,,~,,,,,`,`,`,`,`,`,`
+,,,,,,,~,,,,,,`,~,`,,,,,,~
+,m(9x9),,,,,,~,,,m(9x9),,,~,,~,,,,m(9x9),,~
+,,`,`,`,`,`,`,`,,,`,`,`,`,`,`,`,,,`,`,`,`,`,`,`
+,,`,`,`,`,`,`,`,~,~,`,`,`,`,`,`,`,~,~,`,`,`,`,`,`,`
+,,`,`,`,`,`,`,`,,,`,`,`,`,`,`,`,,,`,`,`,`,`,`,`
+,,`,`,`,`,`,`,`,,,`,`,`,`,`,`,`,,,`,`,`,`,`,`,`
+,,`,`,`,`,`,`,`,,,`,`,`,`,`,`,`,,,`,`,`,`,`,`,`
+,,`,`,`,`,`,`,`,,,`,`,`,`,`,`,`,,,`,`,`,`,`,`,`
+,,`,`,`,`,`,`,`,,,`,`,`,`,`,`,`,,,`,`,`,`,`,`,`
+
+
 "#build label(guildhall3) start(15; 15; central stairs) message(Remember to enqueue manager orders for this blueprint.) furnish 4 guildhalls, 3 temples, and a library"
 
 
@@ -2676,7 +2710,7 @@ Apartments Walkthrough:
 ""
 "3) Once the beds are built, configure the rooms and build the remaining furniture with /apartments3. Run ""quickfort orders"" for /apartments3."
 ""
-"4) Once the coffins are all in place, run ""burial -pets"" to set them all to accept burials. This is handled for you if you're using the onMapLoad_dreamfort.init file included with DFHack."
+"4) Once the coffins are all in place, run ""burial -pets"" to set them all to accept burials."
 "#dig label(suites1) start(18; 18; central ramp) message(Once the area is dug out, run /suites2) noble suites"
 
 ,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d

From 0389637ac89520cba35dcd539adadb87d1e4330e Mon Sep 17 00:00:00 2001
From: Myk <myk002@yahoo.com>
Date: Mon, 2 May 2022 21:08:09 -0700
Subject: [PATCH 030/854] clean up changelog.txt

---
 docs/changelog.txt | 90 +++++++++++++++++++++++-----------------------
 1 file changed, 44 insertions(+), 46 deletions(-)

diff --git a/docs/changelog.txt b/docs/changelog.txt
index cc7f2af06..315f1a4b9 100644
--- a/docs/changelog.txt
+++ b/docs/changelog.txt
@@ -34,71 +34,69 @@ changelog.txt uses a syntax similar to RST, with a few special sequences:
 # Future
 
 ## New Plugins
-- `spectate`: automates the following of dwarves more often than not based on job zlevel activity levels, sometimes randomly though.
-
-## Removed
+- `spectate`: "spectator mode" -- automatically follows dwarves doing things in your fort
 
 ## New Tweaks
-- `tweak` partial-items: displays percentages on partially-consumed items such as hospital cloth
+- `tweak`: ``partial-items`` displays percentage remaining for partially-consumed items such as hospital cloth
 
 ## Fixes
+- `autofarm`: removed restriction on only planting "discovered" plants
 - `cxxrandom`: fixed exception when calling ``bool_distribution``
-- `cxxrandom`: fixed id order for ShuffleSequence, but adds code to detect which parameter is which so each id is used correctly. 16000 limit before things get weird (previous was 16 bits)
-- `autofarm` removed restriction on only planting 'discovered' plants
-- `luasocket` (and others): return correct status code when closing socket connections
+- `luasocket`: return correct status code when closing socket connections so clients can know when to retry
 
 ## Misc Improvements
+- `autochop`: only designate the amount of trees required to reach ``max_logs``
+- `autochop`: preferably designate larger trees over smaller ones
+- `blueprint`: ``track`` phase renamed to ``carve``
+- `blueprint`: carved fortifications and (optionally) engravings are now captured in generated blueprints
+- `cursecheck`: new option, ``--ids`` prints creature and race IDs of the cursed creature
+- `debug`: DFHack log messages now have configurable headers (e.g. timestamp, origin plugin name, etc.) via the ``debugfilter`` command of the `debug` plugin
+- `debug`: script execution log messages (e.g. "Loading script: dfhack_extras.init" can now be controlled with the ``debugfilter`` command. To hide the messages, add this line to your ``dfhack.init`` file: ``debugfilter set Warning core script``
+- `dfhack-examples-guide`: add mugs to ``basic`` manager orders
+- `dfhack-examples-guide`: ``onMapLoad_dreamfort.init`` remove "cheaty" commands and new tweaks that are now in the default ``dfhack.init-example`` file
+- ``dfhack.init-example``: recently-added tweaks added to example ``dfhack.init`` file
 - `dig-now`: handle fortification carving
 - `EventManager`: add new event type ``JOB_STARTED``, triggered when a job first gains a worker
-- `EventManager`: add new event type ``NEW_UNIT_ACTIVE``, triggered when a new unit appears on the active list
-- `EventManager`: now each registered handler for an event can have its own frequency instead of all handlers using the lowest frequency of all handlers
-- `stocks`: allow search terms to match the full item label, even when the label is truncated for length
-- `dfhack-examples-guide`: add mugs to ``basic`` manager orders
+- `EventManager`: add new event type ``UNIT_NEW_ACTIVE``, triggered when a new unit appears on the active list
 - `gui/create-item`: Added "(chain)" annotation text for armours with the [CHAIN_METAL_TEXT] flag set
-- DFHack log messages now have configurable headers (e.g. timestamp, origin plugin name, etc.) via the ``debugfilter`` command of the `debug` plugin
-- Script execution log messages (e.g. "Loading script: dfhack_extras.init" can now be controlled with the ``debugfilter`` command. To hide the messages, add this line to your ``dfhack.init`` file: ``debugfilter set Warning core script``
-- `manipulator`: Tweak colors to make the cursor easier to locate
-- `autochop`: only designate the amount of trees required to reach ``max_logs``
-- `autochop`: preferably designate larger trees over smaller ones
-- `blueprint`: ``track`` phase renamed to ``carve``. carved fortifications and (optionally) engravings are now captured in blueprints
-- `tweak` stable-cursor: Keep the cursor stable even when the viewport moves a small amount
-- `cursecheck`: Added a new parameter, ``ids``, to print creature and race IDs of the cursed creature.
-- Include recently-added tweaks in example dfhack.init file, clean up dreamfort onMapLoad.init file
+- `manipulator`: tweak colors to make the cursor easier to locate
+- `stocks`: allow search terms to match the full item label, even when the label is truncated for length
+- `tweak`: ``stable-cursor`` now keeps the cursor stable even when the viewport moves a small amount
 
 ## Documentation
+- add more examples to the plugin example skeleton files so they are more informative for a newbie
+- `confirm`: correct the command name in the plugin help text
 - `cxxrandom`: added usage examples
-- Add more examples to the plugin skeleton files so they are more informative for a newbie
-- Lua API.rst added: ``isHidden(unit)``, ``isFortControlled(unit)``, ``getOuterContainerRef(unit)``, ``getOuterContainerRef(item)``
-- Update download link and installation instructions for Visual C++ 2015 build tools on Windows
-- Updated information regarding obtaining a compatible Windows build environment
-- `confirm`: Correct the command name in the plugin help text
-- ``Quickfort Blueprint Editing Guide``: added screenshots to the Dreamfort case study and overall clarified text
-- Document DFHack `lua-string` (``startswith``, ``endswith``, ``split``, ``trim``, ``wrap``, and ``escape_pattern``).
-- Added a Rust client library to the `remote interface docs <remote-client-libs>`
+- ``Lua API.rst``:  added ``isHidden(unit)``, ``isFortControlled(unit)``, ``getOuterContainerRef(unit)``, ``getOuterContainerRef(item)``
+- `lua-string`: document DFHack string extensions (``startswith()``, ``endswith()``, ``split()``, ``trim()``, ``wrap()``, and ``escape_pattern()``)
+- `quickfort-blueprint-guide`: added screenshots to the Dreamfort case study and overall clarified text
+- `remote-client-libs`: add new Rust client library
+- update download link and installation instructions for Visual C++ 2015 build tools on Windows
+- update information regarding obtaining a compatible Windows build environment
 
 ## API
-- Added functions reverse-engineered from ambushing unit code: ``Units::isHidden``, ``Units::isFortControlled``, ``Units::getOuterContainerRef``, ``Items::getOuterContainerRef``
+- add functions reverse-engineered from ambushing unit code: ``Units::isHidden()``, ``Units::isFortControlled()``, ``Units::getOuterContainerRef()``, ``Items::getOuterContainerRef()``
 
 ## Lua
-- ``widgets.FilteredList`` now allows all punctuation to be typed into the filter and can match search keys that start with punctuation.
-- ``widgets.ListBox``: minimum height of dialog is now calculated correctly when there are no items in the list (e.g. when a filter doesn't match anything)
-- Lua wrappers for functions reverse-engineered from ambushing unit code: ``isHidden(unit)``, ``isFortControlled(unit)``, ``getOuterContainerRef(unit)``, ``getOuterContainerRef(item)``
-- Added `custom-raw-tokens` utility to Lua library for reading tokens added to raws by mods.
-- ``dwarfmode.MenuOverlay``: if ``sidebar_mode`` attribute is set, automatically manage entering a specific sidebar mode on show and restoring the previous sidebar mode on dismiss
-- ``dwarfmode.MenuOverlay``: new class function ``renderMapOverlay`` to assist with drawing tiles over the visible map
-- ``dwarfmode.enterSidebarMode()``: passing ``df.ui_sidebar_mode.DesignateMine`` now always results in you entering ``DesignateMine`` mode and not ``DesignateChopTrees``, even when you looking at the surface where the default designation mode is ``DesignateChopTrees``
-- New string class function: ``string:escape_pattern()`` escapes regex special characters within a string
-- ``widgets.Panel``: if ``autoarrange_subviews`` is set, ``Panel``\s will now automatically lay out widgets vertically according to their current height.  This allows you to have widgets dynamically change height or become visible/hidden and you don't have to worry about recalculating frame layouts
-- ``widgets.ResizingPanel``: new ``Panel`` subclass that automatically recalculates it's own frame height based on the size, position, and visibility of its subviews
-- ``widgets.WrappedLabel``:  new ``Label`` subclass that provides autowrapping of text
-- ``widgets.TooltipLabel``:  new ``WrappedLabel`` subclass that provides tooltip-like behavior
-- ``widgets.HotkeyLabel``: new ``Label`` subclass that displays and reacts to hotkeys
-- ``widgets.CycleHotkeyLabel``: new ``Label`` subclass that allows users to cycle through a list of options by pressing a hotkey
-- ``widgets.ToggleHotkeyLabel``: new ``CycleHotkeyLabel`` subclass that toggles between ``On`` and ``Off`` states
-- ``safe_index`` now properly handles lua sparse tables that are indexed by numbers
-- ``widgets``: unset values in ``frame_inset``-table default to ``0``
+- `custom-raw-tokens`: library for accessing tokens added to raws by mods
+- ``dfhack.units``: Lua wrappers for functions reverse-engineered from ambushing unit code: ``isHidden(unit)``, ``isFortControlled(unit)``, ``getOuterContainerRef(unit)``, ``getOuterContainerRef(item)``
 - ``dialogs``: ``show*`` functions now return a reference to the created dialog
+- ``dwarfmode.enterSidebarMode()``: passing ``df.ui_sidebar_mode.DesignateMine`` now always results in you entering ``DesignateMine`` mode and not ``DesignateChopTrees``, even when you looking at the surface (where the default designation mode is ``DesignateChopTrees``)
+- ``dwarfmode.MenuOverlay``: if ``sidebar_mode`` attribute is set, automatically manage entering a specific sidebar mode on show and restoring the previous sidebar mode on dismiss
+- ``dwarfmode.MenuOverlay``: new class function ``renderMapOverlay`` to assist with painting tiles over the visible map
 - ``ensure_key``: new global function for retrieving or dynamically creating Lua table mappings
+- ``safe_index``: now properly handles lua sparse tables that are indexed by numbers
+- ``string``: new function ``escape_pattern()`` escapes regex special characters within a string
+- ``widgets``: unset values in ``frame_inset`` table default to ``0``
+- ``widgets``: ``FilteredList`` class now allows all punctuation to be typed into the filter and can match search keys that start with punctuation
+- ``widgets``: minimum height of ``ListBox`` dialog is now calculated correctly when there are no items in the list (e.g. when a filter doesn't match anything)
+- ``widgets``: if ``autoarrange_subviews`` is set, ``Panel``\s will now automatically lay out widgets vertically according to their current height.  This allows you to have widgets dynamically change height or become visible/hidden and you don't have to worry about recalculating frame layouts
+- ``widgets``: new class ``ResizingPanel`` (subclass of ``Panel``) automatically recalculates its own frame height based on the size, position, and visibility of its subviews
+- ``widgets``: new class ``HotkeyLabel`` (subclass of ``Label``) that displays and reacts to hotkeys
+- ``widgets``: new class ``CycleHotkeyLabel`` (subclass of ``Label``) allows users to cycle through a list of options by pressing a hotkey
+- ``widgets``: new class ``ToggleHotkeyLabel`` (subclass of ``CycleHotkeyLabel``) toggles between ``On`` and ``Off`` states
+- ``widgets``:  new class ``WrappedLabel`` (subclass of ``Label``) provides autowrapping of text
+- ``widgets``:  new class ``TooltipLabel`` (subclass of ``WrappedLabel``) provides tooltip-like behavior
 
 # 0.47.05-r4
 

From d4ba946d2b0dedfa6e15af8ce1c71651ad308bed Mon Sep 17 00:00:00 2001
From: DFHack-Urist via GitHub Actions
 <63161697+DFHack-Urist@users.noreply.github.com>
Date: Tue, 3 May 2022 07:18:10 +0000
Subject: [PATCH 031/854] Auto-update submodules

library/xml: master
scripts: master
---
 library/xml | 2 +-
 scripts     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/library/xml b/library/xml
index 5fe90d06e..165680bb6 160000
--- a/library/xml
+++ b/library/xml
@@ -1 +1 @@
-Subproject commit 5fe90d06ebad4f9686545b7c961c2c07b8bcb799
+Subproject commit 165680bb6babc0d5023f987ec89622e5daacb365
diff --git a/scripts b/scripts
index 714ef87ae..39c3226af 160000
--- a/scripts
+++ b/scripts
@@ -1 +1 @@
-Subproject commit 714ef87aef713af94874c6441e7810b9cf9ef312
+Subproject commit 39c3226affd3959b15b296b59bd89a54c32cb5b8

From 585888c2d36593882f756c5f5de459ec6b42b9ab Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Wed, 4 May 2022 17:21:31 -0700
Subject: [PATCH 032/854] update version, changelog, modules for 0.47.05-r5

---
 CMakeLists.txt     |  2 +-
 docs/changelog.txt | 16 ++++++++++++++++
 library/xml        |  2 +-
 scripts            |  2 +-
 4 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 054430ba6..7cbf13789 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -192,7 +192,7 @@ endif()
 
 # set up versioning.
 set(DF_VERSION "0.47.05")
-set(DFHACK_RELEASE "r4")
+set(DFHACK_RELEASE "r5")
 set(DFHACK_PRERELEASE FALSE)
 
 set(DFHACK_VERSION "${DF_VERSION}-${DFHACK_RELEASE}")
diff --git a/docs/changelog.txt b/docs/changelog.txt
index 315f1a4b9..80c52e046 100644
--- a/docs/changelog.txt
+++ b/docs/changelog.txt
@@ -33,6 +33,22 @@ changelog.txt uses a syntax similar to RST, with a few special sequences:
 
 # Future
 
+## New Plugins
+
+## New Tweaks
+
+## Fixes
+
+## Misc Improvements
+
+## Documentation
+
+## API
+
+## Lua
+
+# 0.47.05-r5
+
 ## New Plugins
 - `spectate`: "spectator mode" -- automatically follows dwarves doing things in your fort
 
diff --git a/library/xml b/library/xml
index 165680bb6..7ec5d8699 160000
--- a/library/xml
+++ b/library/xml
@@ -1 +1 @@
-Subproject commit 165680bb6babc0d5023f987ec89622e5daacb365
+Subproject commit 7ec5d86996269df5e01d64ea5bae67d0c29afd77
diff --git a/scripts b/scripts
index 39c3226af..b808050d4 160000
--- a/scripts
+++ b/scripts
@@ -1 +1 @@
-Subproject commit 39c3226affd3959b15b296b59bd89a54c32cb5b8
+Subproject commit b808050d4a3885aa0e250e726708b2b28fe28260

From a646ed7313b13f2f97cd4c93c85f341f4681762c Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Sun, 1 May 2022 13:48:54 -0400
Subject: [PATCH 033/854] Split configure + build into separate steps for more
 granular timing

---
 .github/workflows/build.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index e8506ae9b..07febaa63 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -69,7 +69,7 @@ jobs:
     - name: Download DF
       run: |
         sh ci/download-df.sh
-    - name: Build DFHack
+    - name: Configure DFHack
       env:
         CC: gcc-${{ matrix.gcc }}
         CXX: g++-${{ matrix.gcc }}
@@ -85,6 +85,8 @@ jobs:
           -DBUILD_STONESENSE:BOOL=${{ matrix.plugins == 'all' }} \
           -DBUILD_SUPPORTED:BOOL=1 \
           -DCMAKE_INSTALL_PREFIX="$DF_FOLDER"
+    - name: Build DFHack
+      run: |
         ninja -C build-ci install
     - name: Run tests
       id: run_tests

From c44a2cfa6a90fe98d68f4a4c9533fb14d4ed3cb7 Mon Sep 17 00:00:00 2001
From: DFHack-Urist via GitHub Actions
 <63161697+DFHack-Urist@users.noreply.github.com>
Date: Mon, 9 May 2022 07:18:27 +0000
Subject: [PATCH 034/854] Auto-update submodules

depends/luacov: dfhack
---
 depends/luacov | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/depends/luacov b/depends/luacov
index 87d6ae018..cc76184af 160000
--- a/depends/luacov
+++ b/depends/luacov
@@ -1 +1 @@
-Subproject commit 87d6ae018cb8d288d854f632e9d8d959d75d7db4
+Subproject commit cc76184af85d371c5ad95ea3bb14283fd1c2a42b

From e95d8c729621df2a28fc562f746771075cf8f95c Mon Sep 17 00:00:00 2001
From: DFHack-Urist via GitHub Actions
 <63161697+DFHack-Urist@users.noreply.github.com>
Date: Mon, 9 May 2022 16:39:47 +0000
Subject: [PATCH 035/854] Auto-update submodules

scripts: master
depends/luacov: dfhack
---
 depends/luacov | 2 +-
 scripts        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/depends/luacov b/depends/luacov
index cc76184af..99d068278 160000
--- a/depends/luacov
+++ b/depends/luacov
@@ -1 +1 @@
-Subproject commit cc76184af85d371c5ad95ea3bb14283fd1c2a42b
+Subproject commit 99d06827848583232dd77afb34cd7ab589567086
diff --git a/scripts b/scripts
index b808050d4..64626c814 160000
--- a/scripts
+++ b/scripts
@@ -1 +1 @@
-Subproject commit b808050d4a3885aa0e250e726708b2b28fe28260
+Subproject commit 64626c81481a2f938f071b7347d07c10312b223d

From 55e4008925ee5af3a07ca3225ed73d2414423a0d Mon Sep 17 00:00:00 2001
From: Tim Siegel <siegeltr@gmail.com>
Date: Thu, 21 Apr 2022 16:58:53 -0400
Subject: [PATCH 036/854] MiscUtils: teach word_wrap() to optionally preserve
 whitespace

---
 library/MiscUtils.cpp       | 58 +++++++++++++++++++++++++++----------
 library/include/MiscUtils.h |  3 +-
 2 files changed, 44 insertions(+), 17 deletions(-)

diff --git a/library/MiscUtils.cpp b/library/MiscUtils.cpp
index 56af85afe..6ab63d5eb 100644
--- a/library/MiscUtils.cpp
+++ b/library/MiscUtils.cpp
@@ -168,32 +168,58 @@ std::string to_search_normalized(const std::string &str)
     return result;
 }
 
-bool word_wrap(std::vector<std::string> *out, const std::string &str, size_t line_length)
+
+bool word_wrap(std::vector<std::string> *out, const std::string &str,
+               size_t line_length, bool collapse_whitespace)
 {
-    out->clear();
-    std::istringstream input(str);
-    std::string out_line;
-    std::string word;
-    if (input >> word)
+    if (line_length == 0)
+        line_length = SIZE_MAX;
+
+    std::string line;
+    size_t break_pos = 0;
+
+    for (auto &c : str)
     {
-        out_line += word;
-        // size_t remaining = line_length - std::min(line_length, word.length());
-        while (input >> word)
+        if (c == '\n')
+        {
+            out->push_back(line);
+            line.clear();
+            break_pos = 0;
+            continue;
+        }
+
+        if (isspace(c))
         {
-            if (out_line.length() + word.length() + 1 <= line_length)
+            if (break_pos == line.length() && collapse_whitespace)
+                continue;
+
+            line.push_back(collapse_whitespace ? ' ' : c);
+            break_pos = line.length();
+        }
+        else {
+            line.push_back(c);
+        }
+
+        if (line.length() > line_length)
+        {
+            if (break_pos > 0)
             {
-                out_line += ' ';
-                out_line += word;
+                // Break before last space, and skip that space
+                out->push_back(line.substr(0, break_pos - 1));
             }
             else
             {
-                out->push_back(out_line);
-                out_line = word;
+                // Single word is too long, just break it
+                out->push_back(line.substr(0, line_length));
+                break_pos = line_length;
             }
+            line = line.substr(break_pos);
+            break_pos = 0;
         }
-        if (out_line.length())
-            out->push_back(out_line);
     }
+    if (line.length())
+        out->push_back(line);
+
     return true;
 }
 
diff --git a/library/include/MiscUtils.h b/library/include/MiscUtils.h
index 7a5f050a2..764b11413 100644
--- a/library/include/MiscUtils.h
+++ b/library/include/MiscUtils.h
@@ -391,7 +391,8 @@ DFHACK_EXPORT std::string to_search_normalized(const std::string &str);
 
 DFHACK_EXPORT bool word_wrap(std::vector<std::string> *out,
                              const std::string &str,
-                             size_t line_length = 80);
+                             size_t line_length = 80,
+                             bool collapse_whitespace = false);
 
 inline bool bits_match(unsigned required, unsigned ok, unsigned mask)
 {

From c3347d465f2cd8f4f05cc651eb4bbac49c03f5df Mon Sep 17 00:00:00 2001
From: Tim Siegel <siegeltr@gmail.com>
Date: Wed, 20 Apr 2022 11:59:44 -0400
Subject: [PATCH 037/854] [command-prompt] cosmetics: whitespace, sort headers

---
 plugins/command-prompt.cpp | 102 ++++++++++++++++++++-----------------
 1 file changed, 54 insertions(+), 48 deletions(-)

diff --git a/plugins/command-prompt.cpp b/plugins/command-prompt.cpp
index a987ea829..0bfe31dc9 100644
--- a/plugins/command-prompt.cpp
+++ b/plugins/command-prompt.cpp
@@ -1,23 +1,23 @@
-//command-prompt a one line command entry at the top of the screen for quick commands
+// command-prompt: A one-line command entry at the top of the screen for quick commands
 
 #include "Core.h"
+#include <ColorText.h>
 #include <Console.h>
 #include <Export.h>
 #include <PluginManager.h>
-#include <ColorText.h>
 
-#include <modules/Screen.h>
 #include <modules/Gui.h>
+#include <modules/Screen.h>
 
-#include <set>
 #include <list>
+#include <set>
 #include <utility>
 #include <vector>
 
+#include "df/enabler.h"
+#include "df/graphic.h"
 #include "df/interface_key.h"
 #include "df/ui.h"
-#include "df/graphic.h"
-#include "df/enabler.h"
 
 using namespace DFHack;
 using namespace df::enums;
@@ -36,8 +36,10 @@ class prompt_ostream:public buffered_color_ostream
     protected:
         void flush_proxy();
     public:
-        prompt_ostream(viewscreen_commandpromptst* parent):parent_(parent){}
-        bool empty(){return buffer.empty();}
+        prompt_ostream(viewscreen_commandpromptst* parent)
+            : parent_(parent)
+        {}
+        bool empty() { return buffer.empty(); }
 };
 class viewscreen_commandpromptst : public dfhack_viewscreen {
 public:
@@ -48,7 +50,7 @@ public:
     }
 
     void render();
-    void help() { }
+    void help() {}
     int8_t movies_okay() { return 0; }
 
     df::unit* getSelectedUnit() { return Gui::getAnyUnit(parent); }
@@ -57,10 +59,11 @@ public:
     df::plant* getSelectedPlant() { return Gui::getAnyPlant(parent); }
 
     std::string getFocusString() { return "commandprompt"; }
-    viewscreen_commandpromptst(std::string entry):submitted(false), is_response(false)
+    viewscreen_commandpromptst(std::string entry)
+        : submitted(false), is_response(false)
     {
-        show_fps=gps->display_frames;
-        gps->display_frames=0;
+        show_fps = gps->display_frames;
+        gps->display_frames = 0;
         cursor_pos = entry.size();
         frame = 0;
         history_idx = command_history.size();
@@ -76,7 +79,7 @@ public:
     }
     ~viewscreen_commandpromptst()
     {
-        gps->display_frames=show_fps;
+        gps->display_frames = show_fps;
     }
 
     void add_response(color_value v, std::string s)
@@ -125,7 +128,7 @@ public:
     }
 
 protected:
-    std::list<std::pair<color_value,std::string> > responses;
+    std::list<std::pair<color_value, std::string> > responses;
     int cursor_pos;
     int history_idx;
     bool submitted;
@@ -138,8 +141,8 @@ void prompt_ostream::flush_proxy()
 {
     if (buffer.empty())
         return;
-    for(auto it=buffer.begin();it!=buffer.end();it++)
-        parent_->add_response(it->first,it->second);
+    for(auto it = buffer.begin(); it != buffer.end(); it++)
+        parent_->add_response(it->first, it->second);
     buffer.clear();
 }
 void viewscreen_commandpromptst::render()
@@ -154,25 +157,26 @@ void viewscreen_commandpromptst::render()
 
     auto dim = Screen::getWindowSize();
     parent->render();
-    if(is_response)
+    if (is_response)
     {
-        auto it=responses.begin();
-        for(int i=0;i<dim.y && it!=responses.end();i++,it++)
+        auto it = responses.begin();
+        for (int i = 0; i < dim.y && it != responses.end(); i++, it++)
         {
-            Screen::fillRect(Screen::Pen(' ', 7, 0),0,i,dim.x,i);
-            std::string cur_line=it->second;
-            Screen::paintString(Screen::Pen(' ',it->first,0),0,i,cur_line.substr(0,cur_line.size()-1));
+            Screen::fillRect(Screen::Pen(' ', 7, 0), 0, i, dim.x, i);
+            std::string cur_line = it->second;
+            Screen::paintString(Screen::Pen(' ', it->first, 0), 0, i,
+                    cur_line.substr(0, cur_line.size() - 1));
         }
     }
     else
     {
         std::string entry = get_entry();
-        Screen::fillRect(Screen::Pen(' ', 7, 0),0,0,dim.x,0);
-        Screen::paintString(Screen::Pen(' ', 7, 0), 0, 0,"[DFHack]#");
+        Screen::fillRect(Screen::Pen(' ', 7, 0), 0, 0, dim.x, 0);
+        Screen::paintString(Screen::Pen(' ', 7, 0), 0, 0, "[DFHack]#");
         std::string cursor = (frame < enabler->gfps / 2) ? "_" : " ";
-        if(cursor_pos < (dim.x - 10))
+        if (cursor_pos < dim.x - 10)
         {
-            Screen::paintString(Screen::Pen(' ', 7, 0), 10,0 , entry);
+            Screen::paintString(Screen::Pen(' ', 7, 0), 10, 0, entry);
             if (int16_t(entry.size()) > dim.x - 10)
                 Screen::paintTile(Screen::Pen('\032', 7, 0), dim.x - 1, 0);
             if (cursor != " ")
@@ -191,12 +195,12 @@ void viewscreen_commandpromptst::render()
 void viewscreen_commandpromptst::submit()
 {
     CoreSuspendClaimer suspend;
-    if(is_response)
+    if (is_response)
     {
         Screen::dismiss(this);
         return;
     }
-    if(submitted)
+    if (submitted)
         return;
     submitted = true;
     prompt_ostream out(this);
@@ -204,11 +208,11 @@ void viewscreen_commandpromptst::submit()
         Screen::Hide hide_guard(this, Screen::Hide::RESTORE_AT_TOP);
         Core::getInstance().runCommand(out, get_entry());
     }
-    if(out.empty() && responses.empty())
+    if (out.empty() && responses.empty())
         Screen::dismiss(this);
     else
     {
-        is_response=true;
+        is_response = true;
     }
 }
 void viewscreen_commandpromptst::feed(std::set<df::interface_key> *events)
@@ -240,14 +244,14 @@ void viewscreen_commandpromptst::feed(std::set<df::interface_key> *events)
     for (auto it = events->begin(); it != events->end(); ++it)
     {
         auto key = *it;
-        if (key==interface_key::STRING_A000) //delete?
+        if (key == interface_key::STRING_A000) //delete?
         {
-            if(entry.size() && cursor_pos > 0)
+            if (entry.size() && cursor_pos > 0)
             {
                 entry.erase(cursor_pos - 1, 1);
                 cursor_pos--;
             }
-            if(size_t(cursor_pos) > entry.size())
+            if (size_t(cursor_pos) > entry.size())
                 cursor_pos = entry.size();
             continue;
         }
@@ -261,34 +265,34 @@ void viewscreen_commandpromptst::feed(std::set<df::interface_key> *events)
         }
     }
     // Prevent number keys from moving cursor
-    if(events->count(interface_key::CURSOR_RIGHT))
+    if (events->count(interface_key::CURSOR_RIGHT))
     {
         cursor_pos++;
         if (size_t(cursor_pos) > entry.size())
             cursor_pos = entry.size();
     }
-    else if(events->count(interface_key::CURSOR_LEFT))
+    else if (events->count(interface_key::CURSOR_LEFT))
     {
         cursor_pos--;
         if (cursor_pos < 0) cursor_pos = 0;
     }
-    else if(events->count(interface_key::CURSOR_RIGHT_FAST))
+    else if (events->count(interface_key::CURSOR_RIGHT_FAST))
     {
         forward_word();
     }
-    else if(events->count(interface_key::CURSOR_LEFT_FAST))
+    else if (events->count(interface_key::CURSOR_LEFT_FAST))
     {
         back_word();
     }
-    else if(events->count(interface_key::CUSTOM_CTRL_A))
+    else if (events->count(interface_key::CUSTOM_CTRL_A))
     {
         cursor_pos = 0;
     }
-    else if(events->count(interface_key::CUSTOM_CTRL_E))
+    else if (events->count(interface_key::CUSTOM_CTRL_E))
     {
         cursor_pos = entry.size();
     }
-    else if(events->count(interface_key::CURSOR_UP))
+    else if (events->count(interface_key::CURSOR_UP))
     {
         history_idx--;
         if (history_idx < 0)
@@ -296,7 +300,7 @@ void viewscreen_commandpromptst::feed(std::set<df::interface_key> *events)
         entry = get_entry();
         cursor_pos = entry.size();
     }
-    else if(events->count(interface_key::CURSOR_DOWN))
+    else if (events->count(interface_key::CURSOR_DOWN))
     {
         if (size_t(history_idx) < command_history.size() - 1)
         {
@@ -321,8 +325,8 @@ command_result show_prompt(color_ostream &out, std::vector <std::string> & param
         return CR_OK;
     }
     std::string params;
-    for(size_t i=0;i<parameters.size();i++)
-        params+=parameters[i]+" ";
+    for(size_t i = 0; i < parameters.size(); i++)
+        params += parameters[i] + " ";
     Screen::show(dts::make_unique<viewscreen_commandpromptst>(params), plugin_self);
     return CR_OK;
 }
@@ -330,21 +334,23 @@ bool hotkey_allow_all(df::viewscreen *top)
 {
     return true;
 }
-DFhackCExport command_result plugin_init ( color_ostream &out, std::vector <PluginCommand> &commands)
+DFhackCExport command_result plugin_init(color_ostream &out, std::vector <PluginCommand> &commands)
 {
     commands.push_back(PluginCommand(
-        "command-prompt","Shows a command prompt on window.",show_prompt,hotkey_allow_all,
-        "command-prompt [entry] - shows a cmd prompt in df window. Entry is used for default prefix (e.g. ':lua')"
+                "command-prompt", "Shows a command prompt on window.",
+                show_prompt, hotkey_allow_all,
+                "command-prompt [entry] - shows a cmd prompt in df window."
+                " Entry is used for default prefix (e.g. ':lua')"
         ));
     return CR_OK;
 }
 
-DFhackCExport command_result plugin_onstatechange (color_ostream &out, state_change_event e)
+DFhackCExport command_result plugin_onstatechange(color_ostream &out, state_change_event e)
 {
     return CR_OK;
 }
 
-DFhackCExport command_result plugin_shutdown ( color_ostream &out )
+DFhackCExport command_result plugin_shutdown(color_ostream &out)
 {
     return CR_OK;
 }

From 5d2739eee0a770b9da6723325011e5ab7bafcf78 Mon Sep 17 00:00:00 2001
From: Tim Siegel <siegeltr@gmail.com>
Date: Thu, 5 May 2022 14:52:33 -0400
Subject: [PATCH 038/854] [command-prompt] word-wrap response text

Fixes #2079
---
 plugins/command-prompt.cpp | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/plugins/command-prompt.cpp b/plugins/command-prompt.cpp
index 0bfe31dc9..ba2fe0e87 100644
--- a/plugins/command-prompt.cpp
+++ b/plugins/command-prompt.cpp
@@ -4,6 +4,7 @@
 #include <ColorText.h>
 #include <Console.h>
 #include <Export.h>
+#include <MiscUtils.h>
 #include <PluginManager.h>
 
 #include <modules/Gui.h>
@@ -11,6 +12,7 @@
 
 #include <list>
 #include <set>
+#include <string>
 #include <utility>
 #include <vector>
 
@@ -159,13 +161,18 @@ void viewscreen_commandpromptst::render()
     parent->render();
     if (is_response)
     {
-        auto it = responses.begin();
-        for (int i = 0; i < dim.y && it != responses.end(); i++, it++)
+        int y = 0;
+        for (auto &response : responses)
         {
-            Screen::fillRect(Screen::Pen(' ', 7, 0), 0, i, dim.x, i);
-            std::string cur_line = it->second;
-            Screen::paintString(Screen::Pen(' ', it->first, 0), 0, i,
-                    cur_line.substr(0, cur_line.size() - 1));
+            std::vector<std::string> lines;
+            word_wrap(&lines, response.second, dim.x);
+            for (auto &line : lines)
+            {
+                Screen::fillRect(Screen::Pen(' ', 7, 0), 0, y, dim.x, y);
+                Screen::paintString(Screen::Pen(' ', response.first, 0), 0, y, line);
+                if (++y >= dim.y)
+                    return;
+            }
         }
     }
     else

From 1203274e9f8a78f5c9dd59ca616f4afce795da3f Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Mon, 9 May 2022 23:03:07 -0400
Subject: [PATCH 039/854] Update Authors.rst

This time with missing scripts and df-structures authors since 0.47.04-r1

Just one: DFHack/scripts#339
---
 docs/Authors.rst | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/Authors.rst b/docs/Authors.rst
index 38fe19862..afb0a3f14 100644
--- a/docs/Authors.rst
+++ b/docs/Authors.rst
@@ -32,6 +32,7 @@ billw2012               billw2012
 BrickViking             brickviking
 brndd                   brndd                   burneddi
 Caldfir                 caldfir
+Cameron Ewell           Ozzatron
 Carter Bray             Qartar
 Chris Dombroski         cdombroski
 Chris Parsons           chrismdp

From f9cc79fb8de0f491297775981ecf5069214ab014 Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Tue, 10 May 2022 00:57:56 -0400
Subject: [PATCH 040/854] pre-commit: decrease autoupdate interval to monthly

---
 .pre-commit-config.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 26d135ca2..336bda270 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -1,5 +1,6 @@
 ci:
   autofix_prs: false
+  autoupdate_schedule: monthly
 repos:
 # shared across repos:
 - repo: https://github.com/pre-commit/pre-commit-hooks

From 15a11d1a39e9f5b6e9af50ef5e3bb58693fe39dd Mon Sep 17 00:00:00 2001
From: DFHack-Urist via GitHub Actions
 <63161697+DFHack-Urist@users.noreply.github.com>
Date: Tue, 10 May 2022 07:22:46 +0000
Subject: [PATCH 041/854] Auto-update submodules

library/xml: master
scripts: master
---
 library/xml | 2 +-
 scripts     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/library/xml b/library/xml
index 7ec5d8699..8b2d2b737 160000
--- a/library/xml
+++ b/library/xml
@@ -1 +1 @@
-Subproject commit 7ec5d86996269df5e01d64ea5bae67d0c29afd77
+Subproject commit 8b2d2b7379f4d5658573c9c4ff6d383e032f3a5c
diff --git a/scripts b/scripts
index 64626c814..86c24157b 160000
--- a/scripts
+++ b/scripts
@@ -1 +1 @@
-Subproject commit 64626c81481a2f938f071b7347d07c10312b223d
+Subproject commit 86c24157b33de06bea090d35d29adff68cdbd2a6

From 7439678214160390fbddcc318159bd159365fcbd Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Tue, 10 May 2022 11:14:30 -0700
Subject: [PATCH 042/854] tombstone devel/unforbidall script

---
 docs/Removed.rst | 8 ++++++++
 scripts          | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/docs/Removed.rst b/docs/Removed.rst
index 5d68b2133..54e83a6fc 100644
--- a/docs/Removed.rst
+++ b/docs/Removed.rst
@@ -10,6 +10,14 @@ work (e.g. links from the `changelog`).
   :local:
   :depth: 1
 
+.. _devel/unforbidall:
+
+devel/unforbidall
+=================
+
+Replaced by the `unforbid` script. Run ``unforbid all --quiet`` to match the
+behavior of the original ``devel/unforbidall`` script.
+
 .. _digfort:
 
 digfort
diff --git a/scripts b/scripts
index 86c24157b..ec09032b7 160000
--- a/scripts
+++ b/scripts
@@ -1 +1 @@
-Subproject commit 86c24157b33de06bea090d35d29adff68cdbd2a6
+Subproject commit ec09032b7a44d531c8f5b91cff11632238a8c469

From 8696f72f7736d250e1b2985ab5321fe3cf0bd677 Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Wed, 11 May 2022 01:06:47 -0400
Subject: [PATCH 043/854] Fix script-docs.py extension check

The check previously matched any filename ending in `lua`, not `.lua`. This
caused failures in my fork because I had a branch ending in `-lua`, which
created a file of that name in `.git/refs` that was not a valid Lua script.

For extra good measure, anything under `.git` is ignored now as well.
---
 ci/script-docs.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ci/script-docs.py b/ci/script-docs.py
index 71d7f37b2..7ef287f8a 100755
--- a/ci/script-docs.py
+++ b/ci/script-docs.py
@@ -81,11 +81,11 @@ def check_file(fname):
 def main():
     """Check that all DFHack scripts include documentation"""
     err = 0
-    exclude = set(['internal', 'test'])
+    exclude = {'.git', 'internal', 'test'}
     for root, dirs, files in os.walk(SCRIPT_PATH, topdown=True):
         dirs[:] = [d for d in dirs if d not in exclude]
         for f in files:
-            if f[-3:] in {'.rb', 'lua'}:
+            if f.split('.')[-1] in {'rb', 'lua'}:
                 err += check_file(join(root, f))
     return err
 

From baab258774a478c91f157775dc1e739bd7854658 Mon Sep 17 00:00:00 2001
From: DFHack-Urist via GitHub Actions
 <63161697+DFHack-Urist@users.noreply.github.com>
Date: Wed, 11 May 2022 07:23:49 +0000
Subject: [PATCH 044/854] Auto-update submodules

scripts: master
depends/libzip: dfhack
depends/libexpat: dfhack
depends/xlsxio: dfhack
---
 depends/libexpat | 2 +-
 depends/libzip   | 2 +-
 depends/xlsxio   | 2 +-
 scripts          | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/depends/libexpat b/depends/libexpat
index 3c0f2e86c..ca5c29a22 160000
--- a/depends/libexpat
+++ b/depends/libexpat
@@ -1 +1 @@
-Subproject commit 3c0f2e86ce4e7a3a3b30e765087d02a68bba7e6f
+Subproject commit ca5c29a22cba22befd8293b4adf76fa1937e8651
diff --git a/depends/libzip b/depends/libzip
index da0d18ae5..081249cce 160000
--- a/depends/libzip
+++ b/depends/libzip
@@ -1 +1 @@
-Subproject commit da0d18ae59ef2699013316b703cdc93809414c93
+Subproject commit 081249cceb59adc857a72d67e60c32047680f787
diff --git a/depends/xlsxio b/depends/xlsxio
index 4056226fe..ab8fd7f3e 160000
--- a/depends/xlsxio
+++ b/depends/xlsxio
@@ -1 +1 @@
-Subproject commit 4056226fe0df6bff4593ee2353cca07c2b7f327e
+Subproject commit ab8fd7f3e9df457e8bc1b5cb31b78d57df0ac5a4
diff --git a/scripts b/scripts
index ec09032b7..489b8588b 160000
--- a/scripts
+++ b/scripts
@@ -1 +1 @@
-Subproject commit ec09032b7a44d531c8f5b91cff11632238a8c469
+Subproject commit 489b8588b2bec4c2d29fe35c0fc3a15d3a71f7eb

From 2c6e450ac991114de75f143b7e42f7aeee81c789 Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Tue, 10 May 2022 15:08:55 -0700
Subject: [PATCH 045/854] update the list of submodules to autoupdate

---
 ci/update-submodules.manifest | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/ci/update-submodules.manifest b/ci/update-submodules.manifest
index 4bd383018..124f6db7c 100644
--- a/ci/update-submodules.manifest
+++ b/ci/update-submodules.manifest
@@ -1,7 +1,9 @@
 library/xml master
 scripts master
 plugins/stonesense master
+plugins/isoworld master
 depends/libzip dfhack
 depends/libexpat dfhack
 depends/xlsxio dfhack
 depends/luacov dfhack
+depends/jsoncpp dfhack

From a3a0631c41532533ab6cd7e0b74aef1c239ea69b Mon Sep 17 00:00:00 2001
From: Myk <myk002@yahoo.com>
Date: Wed, 11 May 2022 22:18:52 -0700
Subject: [PATCH 046/854] fix typo in ci/update-submodules.manifest

---
 ci/update-submodules.manifest | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ci/update-submodules.manifest b/ci/update-submodules.manifest
index 124f6db7c..fee90617c 100644
--- a/ci/update-submodules.manifest
+++ b/ci/update-submodules.manifest
@@ -6,4 +6,4 @@ depends/libzip dfhack
 depends/libexpat dfhack
 depends/xlsxio dfhack
 depends/luacov dfhack
-depends/jsoncpp dfhack
+depends/jsoncpp-sub dfhack

From bf8eaef6bc65849fc83ed0d215213ad6fca38be9 Mon Sep 17 00:00:00 2001
From: DFHack-Urist via GitHub Actions
 <63161697+DFHack-Urist@users.noreply.github.com>
Date: Thu, 12 May 2022 05:21:01 +0000
Subject: [PATCH 047/854] Auto-update submodules

library/xml: master
plugins/isoworld: master
depends/libexpat: dfhack
depends/jsoncpp-sub: dfhack
---
 depends/jsoncpp-sub | 2 +-
 depends/libexpat    | 2 +-
 library/xml         | 2 +-
 plugins/isoworld    | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/depends/jsoncpp-sub b/depends/jsoncpp-sub
index ddabf50f7..632044ad9 160000
--- a/depends/jsoncpp-sub
+++ b/depends/jsoncpp-sub
@@ -1 +1 @@
-Subproject commit ddabf50f72cf369bf652a95c4d9fe31a1865a781
+Subproject commit 632044ad956b9ca55703d98d852bc815077f6afc
diff --git a/depends/libexpat b/depends/libexpat
index ca5c29a22..3e877cbb3 160000
--- a/depends/libexpat
+++ b/depends/libexpat
@@ -1 +1 @@
-Subproject commit ca5c29a22cba22befd8293b4adf76fa1937e8651
+Subproject commit 3e877cbb3c9bc8f22946053e70490d2e5431f4d5
diff --git a/library/xml b/library/xml
index 8b2d2b737..59075f42b 160000
--- a/library/xml
+++ b/library/xml
@@ -1 +1 @@
-Subproject commit 8b2d2b7379f4d5658573c9c4ff6d383e032f3a5c
+Subproject commit 59075f42bbc77c354b5f815c5c1cce5bf48e76a5
diff --git a/plugins/isoworld b/plugins/isoworld
index e3c49ab01..8f500def2 160000
--- a/plugins/isoworld
+++ b/plugins/isoworld
@@ -1 +1 @@
-Subproject commit e3c49ab017da2dcbeaadccd10e56d07d8f03b4ca
+Subproject commit 8f500def2bf8cd95f7b61ded192e9a26651ede4a

From 08a39400de0b5a09cdfa1519378d59da787e9b14 Mon Sep 17 00:00:00 2001
From: DFHack-Urist via GitHub Actions
 <63161697+DFHack-Urist@users.noreply.github.com>
Date: Thu, 12 May 2022 05:33:14 +0000
Subject: [PATCH 048/854] Auto-update submodules

depends/jsoncpp-sub: dfhack
---
 depends/jsoncpp-sub | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/depends/jsoncpp-sub b/depends/jsoncpp-sub
index 632044ad9..ddabf50f7 160000
--- a/depends/jsoncpp-sub
+++ b/depends/jsoncpp-sub
@@ -1 +1 @@
-Subproject commit 632044ad956b9ca55703d98d852bc815077f6afc
+Subproject commit ddabf50f72cf369bf652a95c4d9fe31a1865a781

From b2aa2a9b31e74eb1038c9db04ae54072b0b77644 Mon Sep 17 00:00:00 2001
From: Myk <myk002@yahoo.com>
Date: Wed, 11 May 2022 22:40:33 -0700
Subject: [PATCH 049/854] move isoworld to pull from the new dfhack branch

---
 ci/update-submodules.manifest | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ci/update-submodules.manifest b/ci/update-submodules.manifest
index fee90617c..e97cae6f3 100644
--- a/ci/update-submodules.manifest
+++ b/ci/update-submodules.manifest
@@ -1,7 +1,7 @@
 library/xml master
 scripts master
 plugins/stonesense master
-plugins/isoworld master
+plugins/isoworld dfhack
 depends/libzip dfhack
 depends/libexpat dfhack
 depends/xlsxio dfhack

From 4d08a49afb0015cdc11ca6417b6cf4006405eefa Mon Sep 17 00:00:00 2001
From: DFHack-Urist via GitHub Actions
 <63161697+DFHack-Urist@users.noreply.github.com>
Date: Thu, 12 May 2022 05:41:20 +0000
Subject: [PATCH 050/854] Auto-update submodules

plugins/isoworld: dfhack
---
 plugins/isoworld | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/isoworld b/plugins/isoworld
index 8f500def2..e3c49ab01 160000
--- a/plugins/isoworld
+++ b/plugins/isoworld
@@ -1 +1 @@
-Subproject commit 8f500def2bf8cd95f7b61ded192e9a26651ede4a
+Subproject commit e3c49ab017da2dcbeaadccd10e56d07d8f03b4ca

From 8f6522899bbdd3f0f2355d29a5dba15de55f89a2 Mon Sep 17 00:00:00 2001
From: Myk <myk002@yahoo.com>
Date: Fri, 13 May 2022 13:52:43 -0700
Subject: [PATCH 051/854] Upgrade jsoncpp to 1.9.5 (#2144)

* test jsoncpp upgrade

* use new json library target name

* don't remap the output dirs

* undo warnings at the source

* set new defaults for jsoncpp

* fix typo in new options

* fix signed comparison mismatch warning

* address random(?) compile failures

saying our std::atomic is not initialized in Debug.cpp
---
 depends/CMakeLists.txt | 7 ++++---
 depends/jsoncpp-sub    | 2 +-
 library/CMakeLists.txt | 4 ++--
 library/Debug.cpp      | 2 +-
 plugins/CMakeLists.txt | 6 +++---
 plugins/autolabor.cpp  | 2 +-
 6 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/depends/CMakeLists.txt b/depends/CMakeLists.txt
index 0fcb4ca3c..fce25a65e 100644
--- a/depends/CMakeLists.txt
+++ b/depends/CMakeLists.txt
@@ -12,10 +12,11 @@ endif()
 add_subdirectory(tthread)
 option(JSONCPP_WITH_TESTS "Compile and (for jsoncpp_check) run JsonCpp test executables" OFF)
 option(JSONCPP_WITH_POST_BUILD_UNITTEST "Automatically run unit-tests as a post build step" OFF)
+option(JSONCPP_BUILD_SHARED_LIBS "Build jsoncpp_lib as a shared library." OFF)
+option(JSONCPP_BUILD_OBJECT_LIBS "Build jsoncpp_lib as a object library." OFF)
+option(JSONCPP_WITH_CMAKE_PACKAGE "Generate and install cmake package files" OFF)
+
 add_subdirectory(jsoncpp-sub EXCLUDE_FROM_ALL)
-if(UNIX)
-    set_target_properties(jsoncpp_lib_static PROPERTIES COMPILE_FLAGS "-Wno-deprecated-declarations")
-endif()
 # build clsocket static and only as a dependency. Setting those options here overrides its own default settings.
 option(CLSOCKET_SHARED "Build clsocket lib as shared." OFF)
 option(CLSOCKET_DEP_ONLY "Build for use inside other CMake projects as dependency." ON)
diff --git a/depends/jsoncpp-sub b/depends/jsoncpp-sub
index ddabf50f7..ba5eac541 160000
--- a/depends/jsoncpp-sub
+++ b/depends/jsoncpp-sub
@@ -1 +1 @@
-Subproject commit ddabf50f72cf369bf652a95c4d9fe31a1865a781
+Subproject commit ba5eac54136064af94ab4a923ac110d7534d4f83
diff --git a/library/CMakeLists.txt b/library/CMakeLists.txt
index 4ec165308..9e7bf8590 100644
--- a/library/CMakeLists.txt
+++ b/library/CMakeLists.txt
@@ -415,10 +415,10 @@ if(APPLE)
     set_target_properties(dfhack PROPERTIES SOVERSION 1.0.0)
 endif()
 
-target_link_libraries(dfhack protobuf-lite clsocket lua jsoncpp_lib_static dfhack-version ${PROJECT_LIBS})
+target_link_libraries(dfhack protobuf-lite clsocket lua jsoncpp_static dfhack-version ${PROJECT_LIBS})
 set_target_properties(dfhack PROPERTIES INTERFACE_LINK_LIBRARIES "")
 
-target_link_libraries(dfhack-client protobuf-lite clsocket jsoncpp_lib_static)
+target_link_libraries(dfhack-client protobuf-lite clsocket jsoncpp_static)
 target_link_libraries(dfhack-run dfhack-client)
 
 if(APPLE)
diff --git a/library/Debug.cpp b/library/Debug.cpp
index 7ac981d30..9b13af168 100644
--- a/library/Debug.cpp
+++ b/library/Debug.cpp
@@ -198,7 +198,7 @@ DebugCategory::cstring_ref DebugCategory::plugin() const noexcept
 //! standards only provide runtime checks if an atomic type is lock free
 struct failIfEnumAtomicIsNotLockFree {
     failIfEnumAtomicIsNotLockFree() {
-        std::atomic<DebugCategory::level> test;
+        std::atomic<DebugCategory::level> test(DebugCategory::LINFO);
         if (test.is_lock_free())
             return;
         std::cerr << __FILE__ << ':' << __LINE__
diff --git a/plugins/CMakeLists.txt b/plugins/CMakeLists.txt
index b8cd25860..ed9404b8e 100644
--- a/plugins/CMakeLists.txt
+++ b/plugins/CMakeLists.txt
@@ -87,7 +87,7 @@ if(BUILD_SUPPORTED)
     dfhack_plugin(autoclothing autoclothing.cpp)
     dfhack_plugin(autodump autodump.cpp)
     dfhack_plugin(autofarm autofarm.cpp)
-    dfhack_plugin(autogems autogems.cpp LINK_LIBRARIES jsoncpp_lib_static)
+    dfhack_plugin(autogems autogems.cpp LINK_LIBRARIES jsoncpp_static)
     dfhack_plugin(autohauler autohauler.cpp)
     dfhack_plugin(autolabor autolabor.cpp)
     dfhack_plugin(automaterial automaterial.cpp LINK_LIBRARIES lua)
@@ -109,7 +109,7 @@ if(BUILD_SUPPORTED)
     dfhack_plugin(cursecheck cursecheck.cpp)
     dfhack_plugin(cxxrandom cxxrandom.cpp LINK_LIBRARIES lua)
     dfhack_plugin(deramp deramp.cpp)
-    dfhack_plugin(debug debug.cpp LINK_LIBRARIES jsoncpp_lib_static)
+    dfhack_plugin(debug debug.cpp LINK_LIBRARIES jsoncpp_static)
     dfhack_plugin(dig dig.cpp)
     dfhack_plugin(dig-now dig-now.cpp LINK_LIBRARIES lua)
     dfhack_plugin(digFlood digFlood.cpp)
@@ -143,7 +143,7 @@ if(BUILD_SUPPORTED)
     dfhack_plugin(mode mode.cpp)
     dfhack_plugin(mousequery mousequery.cpp)
     dfhack_plugin(nestboxes nestboxes.cpp)
-    dfhack_plugin(orders orders.cpp LINK_LIBRARIES jsoncpp_lib_static)
+    dfhack_plugin(orders orders.cpp LINK_LIBRARIES jsoncpp_static)
     dfhack_plugin(pathable pathable.cpp LINK_LIBRARIES lua)
     dfhack_plugin(petcapRemover petcapRemover.cpp)
     dfhack_plugin(plants plants.cpp)
diff --git a/plugins/autolabor.cpp b/plugins/autolabor.cpp
index d6921f1ac..ba116c1c5 100644
--- a/plugins/autolabor.cpp
+++ b/plugins/autolabor.cpp
@@ -873,7 +873,7 @@ static void assign_labor(unit_labor::unit_labor labor,
         }
 
         int pool = labor_infos[labor].talent_pool();
-        if (pool < 200 && candidates.size() > 1 && abs(pool) < candidates.size())
+        if (pool < 200 && candidates.size() > 1 && size_t(abs(pool)) < candidates.size())
         {
             // Sort in descending order
             std::sort(candidates.begin(), candidates.end(), [&](const int lhs, const int rhs) -> bool {

From 1b426efdb93b362aa46fa694fc0936505f9bcc7c Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Fri, 13 May 2022 13:40:17 -0700
Subject: [PATCH 052/854] reduce spurious warnings from libzip

---
 depends/CMakeLists.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/depends/CMakeLists.txt b/depends/CMakeLists.txt
index fce25a65e..405a9555e 100644
--- a/depends/CMakeLists.txt
+++ b/depends/CMakeLists.txt
@@ -38,6 +38,7 @@ if(UNIX)
     set_target_properties(expat PROPERTIES COMPILE_FLAGS "-Wno-maybe-uninitialized")
 endif()
 
+set(CMAKE_REQUIRED_QUIET ON)
 set(LIBZIP_BUILD_DOC OFF CACHE BOOL "")
 set(LIBZIP_BUILD_EXAMPLES OFF CACHE BOOL "")
 set(LIBZIP_BUILD_REGRESS OFF CACHE BOOL "")

From b489a8584f37071cb562d3b9f008a219e48ba318 Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Fri, 29 Apr 2022 10:00:26 -0700
Subject: [PATCH 053/854] add more prepared meals logic

also remove material matchers for jugs and pots. we only care that we
have enough jugs and pots, not that they are rock
---
 data/examples/orders/basic.json | 131 +++++++++++++++++++-------------
 1 file changed, 80 insertions(+), 51 deletions(-)

diff --git a/data/examples/orders/basic.json b/data/examples/orders/basic.json
index fb4668e81..dfb47998e 100644
--- a/data/examples/orders/basic.json
+++ b/data/examples/orders/basic.json
@@ -1,12 +1,34 @@
 [
 	{
-		"amount_left" : 1,
-		"amount_total" : 1,
-		"frequency" : "Daily",
+		"amount_left" : 150,
+		"amount_total" : 150,
+		"frequency" : "Monthly",
 		"id" : 0,
 		"is_active" : false,
 		"is_validated" : false,
 		"item_conditions" : 
+		[
+			{
+				"condition" : "LessThan",
+				"flags" : 
+				[
+					"unrotten"
+				],
+				"item_type" : "FOOD",
+				"value" : 400
+			}
+		],
+		"job" : "PrepareMeal",
+		"meal_ingredients" : 2
+	},
+	{
+		"amount_left" : 10,
+		"amount_total" : 10,
+		"frequency" : "Daily",
+		"id" : 1,
+		"is_active" : false,
+		"is_validated" : false,
+		"item_conditions" : 
 		[
 			{
 				"condition" : "AtLeast",
@@ -25,7 +47,7 @@
 					"unrotten",
 					"cookable"
 				],
-				"value" : 15
+				"value" : 1000
 			},
 			{
 				"condition" : "AtMost",
@@ -35,6 +57,15 @@
 				],
 				"item_type" : "FOOD",
 				"value" : 3500
+			},
+			{
+				"condition" : "AtLeast",
+				"flags" : 
+				[
+					"unrotten"
+				],
+				"item_type" : "FOOD",
+				"value" : 400
 			}
 		],
 		"job" : "PrepareMeal",
@@ -44,7 +75,7 @@
 		"amount_left" : 2,
 		"amount_total" : 2,
 		"frequency" : "Daily",
-		"id" : 1,
+		"id" : 2,
 		"is_active" : false,
 		"is_validated" : false,
 		"item_conditions" : 
@@ -81,7 +112,7 @@
 		"amount_left" : 2,
 		"amount_total" : 2,
 		"frequency" : "Daily",
-		"id" : 2,
+		"id" : 3,
 		"is_active" : false,
 		"is_validated" : false,
 		"item_conditions" : 
@@ -118,7 +149,7 @@
 		"amount_left" : 1,
 		"amount_total" : 1,
 		"frequency" : "Daily",
-		"id" : 3,
+		"id" : 4,
 		"is_active" : false,
 		"is_validated" : false,
 		"item_conditions" : 
@@ -139,7 +170,7 @@
 		"amount_left" : 1,
 		"amount_total" : 1,
 		"frequency" : "Daily",
-		"id" : 4,
+		"id" : 5,
 		"is_active" : false,
 		"is_validated" : false,
 		"item_conditions" : 
@@ -174,7 +205,7 @@
 		"amount_left" : 1,
 		"amount_total" : 1,
 		"frequency" : "Daily",
-		"id" : 5,
+		"id" : 6,
 		"is_active" : false,
 		"is_validated" : false,
 		"item_conditions" : 
@@ -206,7 +237,7 @@
 		"amount_left" : 1,
 		"amount_total" : 1,
 		"frequency" : "Daily",
-		"id" : 6,
+		"id" : 7,
 		"is_active" : false,
 		"is_validated" : false,
 		"item_conditions" : 
@@ -238,7 +269,7 @@
 		"amount_left" : 1,
 		"amount_total" : 1,
 		"frequency" : "Daily",
-		"id" : 7,
+		"id" : 8,
 		"is_active" : false,
 		"is_validated" : false,
 		"item_conditions" : 
@@ -260,7 +291,7 @@
 		"amount_left" : 1,
 		"amount_total" : 1,
 		"frequency" : "Daily",
-		"id" : 8,
+		"id" : 9,
 		"is_active" : false,
 		"is_validated" : false,
 		"item_conditions" : 
@@ -293,7 +324,7 @@
 		"amount_left" : 1,
 		"amount_total" : 1,
 		"frequency" : "Daily",
-		"id" : 9,
+		"id" : 10,
 		"is_active" : false,
 		"is_validated" : false,
 		"item_conditions" : 
@@ -324,7 +355,7 @@
 		"amount_left" : 1,
 		"amount_total" : 1,
 		"frequency" : "Daily",
-		"id" : 10,
+		"id" : 11,
 		"is_active" : false,
 		"is_validated" : false,
 		"item_conditions" : 
@@ -357,7 +388,7 @@
 		"amount_left" : 1,
 		"amount_total" : 1,
 		"frequency" : "Daily",
-		"id" : 11,
+		"id" : 12,
 		"is_active" : false,
 		"is_validated" : false,
 		"item_conditions" : 
@@ -397,7 +428,7 @@
 		"amount_left" : 1,
 		"amount_total" : 1,
 		"frequency" : "Daily",
-		"id" : 12,
+		"id" : 13,
 		"is_active" : false,
 		"is_validated" : false,
 		"item_conditions" : 
@@ -423,7 +454,7 @@
 		"amount_left" : 1,
 		"amount_total" : 1,
 		"frequency" : "Daily",
-		"id" : 13,
+		"id" : 14,
 		"is_active" : false,
 		"is_validated" : false,
 		"item_conditions" : 
@@ -458,7 +489,7 @@
 		"amount_left" : 1,
 		"amount_total" : 1,
 		"frequency" : "Daily",
-		"id" : 14,
+		"id" : 15,
 		"is_active" : false,
 		"is_validated" : false,
 		"item_conditions" : 
@@ -493,7 +524,7 @@
 		"amount_left" : 1,
 		"amount_total" : 1,
 		"frequency" : "Daily",
-		"id" : 15,
+		"id" : 16,
 		"is_active" : false,
 		"is_validated" : false,
 		"item_conditions" : 
@@ -528,7 +559,7 @@
 		"amount_left" : 1,
 		"amount_total" : 1,
 		"frequency" : "Daily",
-		"id" : 16,
+		"id" : 17,
 		"is_active" : false,
 		"is_validated" : false,
 		"item_conditions" : 
@@ -559,7 +590,7 @@
 		"amount_left" : 1,
 		"amount_total" : 1,
 		"frequency" : "Daily",
-		"id" : 17,
+		"id" : 18,
 		"is_active" : false,
 		"is_validated" : false,
 		"item_conditions" : 
@@ -589,7 +620,7 @@
 		"amount_left" : 1,
 		"amount_total" : 1,
 		"frequency" : "Daily",
-		"id" : 18,
+		"id" : 19,
 		"is_active" : false,
 		"is_validated" : false,
 		"item_conditions" : 
@@ -613,7 +644,6 @@
 				],
 				"item_subtype" : "ITEM_TOOL_LARGE_POT",
 				"item_type" : "TOOL",
-				"material" : "INORGANIC",
 				"value" : 25
 			}
 		],
@@ -625,7 +655,7 @@
 		"amount_left" : 1,
 		"amount_total" : 1,
 		"frequency" : "Daily",
-		"id" : 19,
+		"id" : 20,
 		"is_active" : false,
 		"is_validated" : false,
 		"item_conditions" : 
@@ -649,7 +679,6 @@
 				],
 				"item_subtype" : "ITEM_TOOL_JUG",
 				"item_type" : "TOOL",
-				"material" : "INORGANIC",
 				"value" : 10
 			}
 		],
@@ -661,7 +690,7 @@
 		"amount_left" : 1,
 		"amount_total" : 1,
 		"frequency" : "Daily",
-		"id" : 20,
+		"id" : 21,
 		"is_active" : false,
 		"is_validated" : false,
 		"item_conditions" : 
@@ -690,7 +719,7 @@
 		"amount_left" : 1,
 		"amount_total" : 1,
 		"frequency" : "Daily",
-		"id" : 21,
+		"id" : 22,
 		"is_active" : false,
 		"is_validated" : false,
 		"item_conditions" : 
@@ -718,7 +747,7 @@
 		"amount_left" : 1,
 		"amount_total" : 1,
 		"frequency" : "Daily",
-		"id" : 22,
+		"id" : 23,
 		"is_active" : false,
 		"is_validated" : false,
 		"item_conditions" : 
@@ -746,7 +775,7 @@
 		"amount_left" : 1,
 		"amount_total" : 1,
 		"frequency" : "Daily",
-		"id" : 23,
+		"id" : 24,
 		"is_active" : false,
 		"is_validated" : false,
 		"item_conditions" : 
@@ -776,7 +805,7 @@
 		"amount_left" : 1,
 		"amount_total" : 1,
 		"frequency" : "Daily",
-		"id" : 24,
+		"id" : 25,
 		"is_active" : false,
 		"is_validated" : false,
 		"item_conditions" : 
@@ -806,7 +835,7 @@
 		"amount_left" : 1,
 		"amount_total" : 1,
 		"frequency" : "Daily",
-		"id" : 25,
+		"id" : 26,
 		"is_active" : false,
 		"is_validated" : false,
 		"item_conditions" : 
@@ -835,7 +864,7 @@
 		"amount_left" : 1,
 		"amount_total" : 1,
 		"frequency" : "Daily",
-		"id" : 26,
+		"id" : 27,
 		"is_active" : false,
 		"is_validated" : false,
 		"item_conditions" : 
@@ -866,7 +895,7 @@
 		"amount_left" : 1,
 		"amount_total" : 1,
 		"frequency" : "Daily",
-		"id" : 27,
+		"id" : 28,
 		"is_active" : false,
 		"is_validated" : false,
 		"item_conditions" : 
@@ -902,7 +931,7 @@
 		"amount_left" : 1,
 		"amount_total" : 1,
 		"frequency" : "Daily",
-		"id" : 28,
+		"id" : 29,
 		"is_active" : false,
 		"is_validated" : false,
 		"item_conditions" : 
@@ -938,7 +967,7 @@
 		"amount_left" : 1,
 		"amount_total" : 1,
 		"frequency" : "Daily",
-		"id" : 29,
+		"id" : 30,
 		"is_active" : false,
 		"is_validated" : false,
 		"item_conditions" : 
@@ -974,7 +1003,7 @@
 		"amount_left" : 1,
 		"amount_total" : 1,
 		"frequency" : "Daily",
-		"id" : 30,
+		"id" : 31,
 		"is_active" : false,
 		"is_validated" : false,
 		"item_conditions" : 
@@ -993,7 +1022,7 @@
 		"amount_left" : 1,
 		"amount_total" : 1,
 		"frequency" : "Daily",
-		"id" : 31,
+		"id" : 32,
 		"is_active" : false,
 		"is_validated" : true,
 		"item_conditions" : 
@@ -1019,7 +1048,7 @@
 		"amount_left" : 1,
 		"amount_total" : 1,
 		"frequency" : "Daily",
-		"id" : 32,
+		"id" : 33,
 		"is_active" : false,
 		"is_validated" : false,
 		"item_conditions" : 
@@ -1041,7 +1070,7 @@
 		"amount_left" : 1,
 		"amount_total" : 1,
 		"frequency" : "Daily",
-		"id" : 33,
+		"id" : 34,
 		"is_active" : false,
 		"is_validated" : false,
 		"item_conditions" : 
@@ -1067,7 +1096,7 @@
 		"amount_left" : 1,
 		"amount_total" : 1,
 		"frequency" : "Daily",
-		"id" : 34,
+		"id" : 35,
 		"is_active" : false,
 		"is_validated" : false,
 		"item_conditions" : 
@@ -1093,7 +1122,7 @@
 		"amount_left" : 1,
 		"amount_total" : 1,
 		"frequency" : "Daily",
-		"id" : 35,
+		"id" : 36,
 		"is_active" : false,
 		"is_validated" : false,
 		"item_conditions" : 
@@ -1119,7 +1148,7 @@
 		"amount_left" : 1,
 		"amount_total" : 1,
 		"frequency" : "Daily",
-		"id" : 36,
+		"id" : 37,
 		"is_active" : false,
 		"is_validated" : false,
 		"item_conditions" : 
@@ -1152,7 +1181,7 @@
 		"amount_left" : 1,
 		"amount_total" : 1,
 		"frequency" : "Daily",
-		"id" : 37,
+		"id" : 38,
 		"is_active" : false,
 		"is_validated" : false,
 		"item_conditions" : 
@@ -1191,7 +1220,7 @@
 		"amount_left" : 1,
 		"amount_total" : 1,
 		"frequency" : "Daily",
-		"id" : 38,
+		"id" : 39,
 		"is_active" : false,
 		"is_validated" : false,
 		"item_conditions" : 
@@ -1225,7 +1254,7 @@
 		"amount_left" : 4,
 		"amount_total" : 4,
 		"frequency" : "Daily",
-		"id" : 39,
+		"id" : 40,
 		"is_active" : false,
 		"is_validated" : false,
 		"item_conditions" : 
@@ -1248,7 +1277,7 @@
 		"amount_left" : 1,
 		"amount_total" : 1,
 		"frequency" : "Daily",
-		"id" : 40,
+		"id" : 41,
 		"is_active" : false,
 		"is_validated" : false,
 		"item_conditions" : 
@@ -1272,7 +1301,7 @@
 		"amount_left" : 1,
 		"amount_total" : 1,
 		"frequency" : "Daily",
-		"id" : 41,
+		"id" : 42,
 		"is_active" : false,
 		"is_validated" : false,
 		"item_conditions" : 
@@ -1306,7 +1335,7 @@
 		"amount_left" : 1,
 		"amount_total" : 1,
 		"frequency" : "Daily",
-		"id" : 42,
+		"id" : 43,
 		"is_active" : false,
 		"is_validated" : false,
 		"item_conditions" : 
@@ -1335,7 +1364,7 @@
 		"amount_left" : 1,
 		"amount_total" : 1,
 		"frequency" : "Daily",
-		"id" : 43,
+		"id" : 44,
 		"is_active" : false,
 		"is_validated" : false,
 		"item_conditions" : 
@@ -1364,7 +1393,7 @@
 		"amount_left" : 1,
 		"amount_total" : 1,
 		"frequency" : "Daily",
-		"id" : 44,
+		"id" : 45,
 		"is_active" : false,
 		"is_validated" : true,
 		"item_conditions" : 
@@ -1395,7 +1424,7 @@
 		"amount_left" : 1,
 		"amount_total" : 1,
 		"frequency" : "Daily",
-		"id" : 45,
+		"id" : 46,
 		"is_active" : false,
 		"is_validated" : false,
 		"item_conditions" : 

From e4f951b01d7530d93d0af6131c67f3ef42b319e6 Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Sun, 1 May 2022 11:54:05 -0700
Subject: [PATCH 054/854] make both easy and lavish meals

---
 data/examples/orders/basic.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/examples/orders/basic.json b/data/examples/orders/basic.json
index dfb47998e..e8dee1680 100644
--- a/data/examples/orders/basic.json
+++ b/data/examples/orders/basic.json
@@ -47,7 +47,7 @@
 					"unrotten",
 					"cookable"
 				],
-				"value" : 1000
+				"value" : 500
 			},
 			{
 				"condition" : "AtMost",

From d6df928d6970c287e6de6f5fd374a9d160dc5db4 Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Fri, 13 May 2022 13:58:36 -0700
Subject: [PATCH 055/854] update changelog

---
 docs/changelog.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/changelog.txt b/docs/changelog.txt
index 80c52e046..5ceb91dd1 100644
--- a/docs/changelog.txt
+++ b/docs/changelog.txt
@@ -40,6 +40,7 @@ changelog.txt uses a syntax similar to RST, with a few special sequences:
 ## Fixes
 
 ## Misc Improvements
+- `dfhack-examples-guide`: refine food preparation orders and fix conditions for making jugs and pots in the ``basic`` manager orders
 
 ## Documentation
 

From ac8ac9608053b05471998df153be57c29b5aa42f Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Fri, 13 May 2022 14:22:05 -0700
Subject: [PATCH 056/854] fix warning on windows about possible loss of data

---
 depends/lua/src/lapi.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/depends/lua/src/lapi.c b/depends/lua/src/lapi.c
index 711895b39..aa01148ab 100644
--- a/depends/lua/src/lapi.c
+++ b/depends/lua/src/lapi.c
@@ -395,7 +395,7 @@ LUA_API size_t lua_rawlen (lua_State *L, int idx) {
     case LUA_TSHRSTR: return tsvalue(o)->shrlen;
     case LUA_TLNGSTR: return tsvalue(o)->u.lnglen;
     case LUA_TUSERDATA: return uvalue(o)->len;
-    case LUA_TTABLE: return luaH_getn(hvalue(o));
+    case LUA_TTABLE: return size_t(luaH_getn(hvalue(o)));
     default: return 0;
   }
 }

From dfd3a39f0ecd7eaf96b71b362d103c5285264fde Mon Sep 17 00:00:00 2001
From: DFHack-Urist via GitHub Actions
 <63161697+DFHack-Urist@users.noreply.github.com>
Date: Sat, 14 May 2022 07:23:55 +0000
Subject: [PATCH 057/854] Auto-update submodules

scripts: master
---
 scripts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts b/scripts
index 489b8588b..e062237ee 160000
--- a/scripts
+++ b/scripts
@@ -1 +1 @@
-Subproject commit 489b8588b2bec4c2d29fe35c0fc3a15d3a71f7eb
+Subproject commit e062237ee03a22d0d8b88b725ba3712e649f1bf6

From 785fe9aa3a7eda8108639f632e0979c61c15d8f8 Mon Sep 17 00:00:00 2001
From: Ryan Williams <Bumber64@users.noreply.github.com>
Date: Sat, 14 May 2022 00:55:11 -0700
Subject: [PATCH 058/854] fix "info" level described as "error" level

---
 library/include/Debug.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/library/include/Debug.h b/library/include/Debug.h
index 63811a51e..4cad178dc 100644
--- a/library/include/Debug.h
+++ b/library/include/Debug.h
@@ -326,7 +326,7 @@ public:
         DFHack::DebugCategory::LDEBUG, ## __VA_ARGS__)
 
 /*!
- * Open a line for error level debug output if enabled
+ * Open a line for info level debug output if enabled
  *
  * Important debug messages when some rarely changed state changes. Example
  * would be when a debug category filtering level changes.

From 0da881d5eb07a6e96b8109e8ec29a6ae49dd5d8b Mon Sep 17 00:00:00 2001
From: DFHack-Urist via GitHub Actions
 <63161697+DFHack-Urist@users.noreply.github.com>
Date: Sun, 15 May 2022 07:17:46 +0000
Subject: [PATCH 059/854] Auto-update submodules

plugins/isoworld: dfhack
---
 plugins/isoworld | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/isoworld b/plugins/isoworld
index e3c49ab01..3630c816d 160000
--- a/plugins/isoworld
+++ b/plugins/isoworld
@@ -1 +1 @@
-Subproject commit e3c49ab017da2dcbeaadccd10e56d07d8f03b4ca
+Subproject commit 3630c816df6962b4594d46d1ae75974c36c11629

From 47b87a5ac18d3e939a22d39d1339f115c1bf357b Mon Sep 17 00:00:00 2001
From: DFHack-Urist via GitHub Actions
 <63161697+DFHack-Urist@users.noreply.github.com>
Date: Tue, 17 May 2022 07:18:04 +0000
Subject: [PATCH 060/854] Auto-update submodules

library/xml: master
---
 library/xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/library/xml b/library/xml
index 59075f42b..a59495e8f 160000
--- a/library/xml
+++ b/library/xml
@@ -1 +1 @@
-Subproject commit 59075f42bbc77c354b5f815c5c1cce5bf48e76a5
+Subproject commit a59495e8f72115909772e6df20a7b9dec272f14c

From 53609db1f9b59f3d7c3a4eb43b315e4927418e00 Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Wed, 18 May 2022 14:04:56 -0700
Subject: [PATCH 061/854] let CycleHotkeyLabels take numeric initial_options

even if all of the option values are non-numeric
---
 docs/changelog.txt           |  1 +
 library/lua/gui/widgets.lua  |  5 +++++
 test/library/gui/widgets.lua | 18 ++++++++++++++++++
 3 files changed, 24 insertions(+)
 create mode 100644 test/library/gui/widgets.lua

diff --git a/docs/changelog.txt b/docs/changelog.txt
index 5ceb91dd1..14fb4db22 100644
--- a/docs/changelog.txt
+++ b/docs/changelog.txt
@@ -38,6 +38,7 @@ changelog.txt uses a syntax similar to RST, with a few special sequences:
 ## New Tweaks
 
 ## Fixes
+- ``widgets.CycleHotkeyLabel``: allow initial option values to be specified as an index instead of an option value
 
 ## Misc Improvements
 - `dfhack-examples-guide`: refine food preparation orders and fix conditions for making jugs and pots in the ``basic`` manager orders
diff --git a/library/lua/gui/widgets.lua b/library/lua/gui/widgets.lua
index b8782bd04..6a13d2af5 100644
--- a/library/lua/gui/widgets.lua
+++ b/library/lua/gui/widgets.lua
@@ -637,6 +637,11 @@ function CycleHotkeyLabel:init()
             break
         end
     end
+    if not self.option_idx then
+        if self.options[self.initial_option] then
+            self.option_idx = self.initial_option
+        end
+    end
     if not self.option_idx then
         error(('cannot find option with value or index: "%s"')
               :format(self.initial_option))
diff --git a/test/library/gui/widgets.lua b/test/library/gui/widgets.lua
new file mode 100644
index 000000000..1eed30e4f
--- /dev/null
+++ b/test/library/gui/widgets.lua
@@ -0,0 +1,18 @@
+local widgets = require('gui.widgets')
+
+function test.togglehotkeylabel()
+   local toggle = widgets.ToggleHotkeyLabel{}
+   expect.true_(toggle:getOptionValue())
+   toggle:cycle()
+   expect.false_(toggle:getOptionValue())
+   toggle:cycle()
+   expect.true_(toggle:getOptionValue())
+end
+
+function test.togglehotkeylabel_default_value()
+   local toggle = widgets.ToggleHotkeyLabel{initial_option=2}
+   expect.false_(toggle:getOptionValue())
+
+   toggle = widgets.ToggleHotkeyLabel{initial_option=false}
+   expect.false_(toggle:getOptionValue())
+end

From 18628ff5b8351894ac00aa66bfbbe7d744bc1f0b Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Wed, 18 May 2022 16:35:06 -0700
Subject: [PATCH 062/854] make key_sep more configurable

and add more configuration to HotkeyLabel and EditField to take
advantage of it
---
 docs/Lua API.rst            |  9 +++++++--
 docs/changelog.txt          |  3 +++
 library/lua/gui/widgets.lua | 34 ++++++++++++++++++++++------------
 3 files changed, 32 insertions(+), 14 deletions(-)

diff --git a/docs/Lua API.rst b/docs/Lua API.rst
index c0dec4b6e..04257b49d 100644
--- a/docs/Lua API.rst	
+++ b/docs/Lua API.rst	
@@ -3832,6 +3832,7 @@ Subclass of Widget; implements a simple edit field.
 
 Attributes:
 
+:label_text: The optional text label displayed before the editable text.
 :text: The current contents of the field.
 :text_pen: The pen to draw the text with.
 :on_char: Input validation callback; used as ``on_char(new_char,text)``.
@@ -3839,6 +3840,8 @@ Attributes:
 :on_change: Change notification callback; used as ``on_change(new_text,old_text)``.
 :on_submit: Enter key callback; if set the field will handle the key and call ``on_submit(text)``.
 :key: If specified, the field is disabled until this key is pressed. Must be given as a string.
+:key_sep: If specified, will be used to customize how the activation key is
+          displayed. See ``token.key_sep`` in the ``Label`` documentation below.
 
 Label class
 -----------
@@ -3907,8 +3910,8 @@ containing newlines, or a table with the following possible fields:
 * ``token.key_sep = '...'``
 
   Specifies the separator to place between the keybinding label produced
-  by ``token.key``, and the main text of the token. If the separator is
-  '()', the token is formatted as ``text..' ('..binding..')'``. Otherwise
+  by ``token.key``, and the main text of the token. If the separator starts with
+  '()', the token is formatted as ``text..' ('..binding..sep:sub(2)``. Otherwise
   it is simply ``binding..sep..text``.
 
 * ``token.enabled``, ``token.disabled``
@@ -3999,6 +4002,8 @@ a hotkey.
 It has the following attributes:
 
 :key: The hotkey keycode to display, e.g. ``'CUSTOM_A'``.
+:key_sep: If specified, will be used to customize how the activation key is
+          displayed. See ``token.key_sep`` in the ``Label`` documentation.
 :label: The string (or a function that returns a string) to display after the
     hotkey.
 :on_activate: If specified, it is the callback that will be called whenever
diff --git a/docs/changelog.txt b/docs/changelog.txt
index 14fb4db22..325070526 100644
--- a/docs/changelog.txt
+++ b/docs/changelog.txt
@@ -48,6 +48,9 @@ changelog.txt uses a syntax similar to RST, with a few special sequences:
 ## API
 
 ## Lua
+- ``widgets.HotkeyLabel``: the ``key_sep`` string is now configurable
+- ``widgets.EditField``: the ``key_sep`` string is now configurable
+- ``widgets.EditField``: can now display an optional string label in addition to the activation key
 
 # 0.47.05-r5
 
diff --git a/library/lua/gui/widgets.lua b/library/lua/gui/widgets.lua
index 6a13d2af5..21e03370b 100644
--- a/library/lua/gui/widgets.lua
+++ b/library/lua/gui/widgets.lua
@@ -178,14 +178,27 @@ end
 EditField = defclass(EditField, Widget)
 
 EditField.ATTRS{
+    label_text = DEFAULT_NIL,
     text = '',
     text_pen = DEFAULT_NIL,
     on_char = DEFAULT_NIL,
     on_change = DEFAULT_NIL,
     on_submit = DEFAULT_NIL,
     key = DEFAULT_NIL,
+    key_sep = DEFAULT_NIL,
 }
 
+function EditField:init()
+    self:addviews{HotkeyLabel{frame={t=0,l=0},
+                              key=self.key,
+                              key_sep=self.key_sep,
+                              label=self.label_text}}
+end
+
+function EditField:postUpdateLayout()
+    self.text_offset = self.subviews[1]:getTextWidth()
+end
+
 function EditField:onRenderBody(dc)
     dc:pen(self.text_pen or COLOR_LIGHTCYAN):fill(0,0,dc.width-1,0)
 
@@ -194,16 +207,11 @@ function EditField:onRenderBody(dc)
         cursor = ' '
     end
     local txt = self.text .. cursor
-    local dx = dc.x
-    if self.key then
-        dc:key_string(self.key, '')
-    end
-    dx = dc.x - dx
-    local max_width = dc.width - dx
+    local max_width = dc.width - self.text_offset
     if #txt > max_width then
         txt = string.char(27)..string.sub(txt, #txt-max_width+2)
     end
-    dc:string(txt)
+    dc:advance(self.text_offset):string(txt)
 end
 
 function EditField:onInput(keys)
@@ -359,12 +367,13 @@ function render_text(obj,dc,x0,y0,pen,dpen,disabled)
 
                     x = x + #keystr
 
-                    if sep == '()' then
+                    if sep:startswith('()') then
                         if dc then
                             dc:string(text)
-                            dc:string(' ('):string(keystr,keypen):string(')')
+                            dc:string(' ('):string(keystr,keypen)
+                            dc:string(sep:sub(2))
                         end
-                        x = x + 3
+                        x = x + 1 + #sep
                     else
                         if dc then
                             dc:string(keystr,keypen):string(sep):string(text)
@@ -605,13 +614,14 @@ HotkeyLabel = defclass(HotkeyLabel, Label)
 
 HotkeyLabel.ATTRS{
     key=DEFAULT_NIL,
+    key_sep=': ',
     label=DEFAULT_NIL,
     on_activate=DEFAULT_NIL,
 }
 
 function HotkeyLabel:init()
-    self:setText{{key=self.key, key_sep=': ', text=self.label,
-                   on_activate=self.on_activate}}
+    self:setText{{key=self.key, key_sep=self.key_sep, text=self.label,
+                  on_activate=self.on_activate}}
 end
 
 ----------------------

From 8b1070b553428c1b1c2eb1afe493b669f50f6e85 Mon Sep 17 00:00:00 2001
From: Myk <myk002@yahoo.com>
Date: Thu, 19 May 2022 15:27:08 -0700
Subject: [PATCH 063/854] tombstone deteriorate*rb scripts (#2157)

* tombstone deteriorate*rb scripts

* update to scripts head so we can build docs

* fix anchors
---
 docs/Removed.rst | 21 +++++++++++++++++++++
 scripts          |  2 +-
 2 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/docs/Removed.rst b/docs/Removed.rst
index 54e83a6fc..e94b04cf8 100644
--- a/docs/Removed.rst
+++ b/docs/Removed.rst
@@ -18,6 +18,27 @@ devel/unforbidall
 Replaced by the `unforbid` script. Run ``unforbid all --quiet`` to match the
 behavior of the original ``devel/unforbidall`` script.
 
+.. _deteriorateclothes:
+
+deteriorateclothes
+==================
+Replaced by the new combined `deteriorate` script. Run
+``deteriorate --types=clothes``.
+
+.. _deterioratecorpses:
+
+deterioratecorpses
+==================
+Replaced by the new combined `deteriorate` script. Run
+``deteriorate --types=corpses``.
+
+.. _deterioratefood:
+
+deterioratefood
+===============
+Replaced by the new combined `deteriorate` script. Run
+``deteriorate --types=food``.
+
 .. _digfort:
 
 digfort
diff --git a/scripts b/scripts
index e062237ee..99489eea1 160000
--- a/scripts
+++ b/scripts
@@ -1 +1 @@
-Subproject commit e062237ee03a22d0d8b88b725ba3712e649f1bf6
+Subproject commit 99489eea1eadbc175740043f7c0b988a26511d71

From 81edd716d0cb5117d17423ca47a9c63d08fad5d9 Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Thu, 19 May 2022 16:36:22 -0700
Subject: [PATCH 064/854] update scripts HEAD with test fixes

---
 scripts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts b/scripts
index 99489eea1..219dbb190 160000
--- a/scripts
+++ b/scripts
@@ -1 +1 @@
-Subproject commit 99489eea1eadbc175740043f7c0b988a26511d71
+Subproject commit 219dbb190dba4440df5f11d0e6a9b6556f919709

From c4febc789a36e48368fc4ddf3ec7dcdbe87311f7 Mon Sep 17 00:00:00 2001
From: DFHack-Urist via GitHub Actions
 <63161697+DFHack-Urist@users.noreply.github.com>
Date: Sat, 21 May 2022 07:17:35 +0000
Subject: [PATCH 065/854] Auto-update submodules

scripts: master
---
 scripts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts b/scripts
index 219dbb190..05d46b32a 160000
--- a/scripts
+++ b/scripts
@@ -1 +1 @@
-Subproject commit 219dbb190dba4440df5f11d0e6a9b6556f919709
+Subproject commit 05d46b32a3aff4f5f98534fdccfbf9ae88dd31a3

From 77d045488bb72b0767766d094a97e5ccf1b66fa2 Mon Sep 17 00:00:00 2001
From: Myk <myk002@yahoo.com>
Date: Mon, 23 May 2022 21:17:52 -0700
Subject: [PATCH 066/854] Confirmation dialog for removing manager orders
 (#2163)

---
 docs/changelog.txt      | 1 +
 plugins/confirm.cpp     | 2 ++
 plugins/lua/confirm.lua | 8 ++++++++
 3 files changed, 11 insertions(+)

diff --git a/docs/changelog.txt b/docs/changelog.txt
index 325070526..b2ef0e90a 100644
--- a/docs/changelog.txt
+++ b/docs/changelog.txt
@@ -41,6 +41,7 @@ changelog.txt uses a syntax similar to RST, with a few special sequences:
 - ``widgets.CycleHotkeyLabel``: allow initial option values to be specified as an index instead of an option value
 
 ## Misc Improvements
+- `confirm`: added a confirmation dialog for removing manager orders
 - `dfhack-examples-guide`: refine food preparation orders and fix conditions for making jugs and pots in the ``basic`` manager orders
 
 ## Documentation
diff --git a/plugins/confirm.cpp b/plugins/confirm.cpp
index a57ec45dd..6a2798cb4 100644
--- a/plugins/confirm.cpp
+++ b/plugins/confirm.cpp
@@ -18,6 +18,7 @@
 #include "df/general_ref.h"
 #include "df/general_ref_contained_in_itemst.h"
 #include "df/viewscreen_dwarfmodest.h"
+#include "df/viewscreen_jobmanagementst.h"
 #include "df/viewscreen_justicest.h"
 #include "df/viewscreen_layer_militaryst.h"
 #include "df/viewscreen_locationsst.h"
@@ -481,6 +482,7 @@ DEFINE_CONFIRMATION(note_delete,        viewscreen_dwarfmodest);
 DEFINE_CONFIRMATION(route_delete,       viewscreen_dwarfmodest);
 DEFINE_CONFIRMATION(location_retire,    viewscreen_locationsst);
 DEFINE_CONFIRMATION(convict,            viewscreen_justicest);
+DEFINE_CONFIRMATION(order_remove,       viewscreen_jobmanagementst);
 
 DFhackCExport command_result plugin_init (color_ostream &out, vector <PluginCommand> &commands)
 {
diff --git a/plugins/lua/confirm.lua b/plugins/lua/confirm.lua
index 13b28962a..e36a4fb86 100644
--- a/plugins/lua/confirm.lua
+++ b/plugins/lua/confirm.lua
@@ -219,6 +219,14 @@ function convict.get_message()
         "This action is irreversible."
 end
 
+order_remove = defconf('order-remove')
+function order_remove.intercept_key(key)
+    return key == keys.MANAGER_REMOVE and
+        not screen.in_max_workshops
+end
+order_remove.title = "Remove manager order"
+order_remove.message = "Are you sure you want to remove this order?"
+
 -- End of confirmation definitions
 
 function check()

From 56b301164fde481b69ba7909646781e436177286 Mon Sep 17 00:00:00 2001
From: DFHack-Urist via GitHub Actions
 <63161697+DFHack-Urist@users.noreply.github.com>
Date: Wed, 25 May 2022 07:18:15 +0000
Subject: [PATCH 067/854] Auto-update submodules

library/xml: master
scripts: master
---
 library/xml | 2 +-
 scripts     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/library/xml b/library/xml
index a59495e8f..1dfe6c5ab 160000
--- a/library/xml
+++ b/library/xml
@@ -1 +1 @@
-Subproject commit a59495e8f72115909772e6df20a7b9dec272f14c
+Subproject commit 1dfe6c5ab9887507cdcdebdd9390352fe0bba2dd
diff --git a/scripts b/scripts
index 05d46b32a..b1bfe27aa 160000
--- a/scripts
+++ b/scripts
@@ -1 +1 @@
-Subproject commit 05d46b32a3aff4f5f98534fdccfbf9ae88dd31a3
+Subproject commit b1bfe27aa95ceb6c645f40c412c34d92c74b4bb0

From 1f58896054375e39d096c727d779f3365cd63fa5 Mon Sep 17 00:00:00 2001
From: Myk <myk002@yahoo.com>
Date: Wed, 25 May 2022 22:49:09 -0700
Subject: [PATCH 068/854] Clarify text and fix typos in the readme

---
 README.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 15f13dbc9..fa6c343e1 100644
--- a/README.md
+++ b/README.md
@@ -8,9 +8,9 @@
 DFHack is a Dwarf Fortress memory access library, distributed with scripts
 and plugins implementing a wide variety of useful functions and tools.
 
-The full documentation [is available online here](https://dfhack.readthedocs.org),
-from the README.html page in the DFHack distribution, or as raw text in the `./docs` folder.
+The full documentation [is available online here](https://dfhack.readthedocs.org).
+It is also accessible via the README.html page in the DFHack distribution or as raw text in the `./docs` folder.
 If you're an end-user, modder, or interested in contributing to DFHack -
 go read those docs.
 
-If that's unclear, or you need more help checkout our [support page](https://docs.dfhack.org/en/latest/docs/Support.html) for up-to-date options.
+If the docs are unclear or you need more help, please check out our [support page](https://docs.dfhack.org/en/latest/docs/Support.html) for ways to contact the DFHack developers.

From 888c5317744189d18293aab71c93d551f248ef83 Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Fri, 27 May 2022 00:33:44 -0400
Subject: [PATCH 069/854] Add mock.observe_func(), improve mock.lua
 documentation

observe_func() is similar to func() but passes through all calls to a specified
function.
---
 library/lua/test_util/mock.lua  | 52 +++++++++++++++++++++++++++++++--
 test/library/test_util/mock.lua | 37 ++++++++++++++++++++++-
 2 files changed, 85 insertions(+), 4 deletions(-)

diff --git a/library/lua/test_util/mock.lua b/library/lua/test_util/mock.lua
index c60646b77..8d253cc10 100644
--- a/library/lua/test_util/mock.lua
+++ b/library/lua/test_util/mock.lua
@@ -32,12 +32,17 @@ function _patch_impl(patches_raw, callback, restore_only)
 end
 
 --[[
+
+Replaces `table[key]` with `value`, calls `callback()`, then restores the
+original value of `table[key]`.
+
 Usage:
     patch(table, key, value, callback)
     patch({
         {table, key, value},
         {table2, key2, value2},
     }, callback)
+
 ]]
 function mock.patch(...)
     local args = {...}
@@ -57,12 +62,18 @@ function mock.patch(...)
 end
 
 --[[
+
+Restores the original value of `table[key]` after calling `callback()`.
+
+Equivalent to: patch(table, key, table[key], callback)
+
 Usage:
     restore(table, key, callback)
     restore({
         {table, key},
         {table2, key2},
     }, callback)
+
 ]]
 function mock.restore(...)
     local args = {...}
@@ -81,9 +92,19 @@ function mock.restore(...)
     return _patch_impl(patches, callback, true)
 end
 
-function mock.func(...)
+--[[
+
+Returns a callable object that tracks the arguments it is called with, then
+passes those arguments to `callback()`.
+
+The returned object has the following properties:
+- `call_count`: the number of times the object has been called
+- `call_args`: a table of function arguments (shallow-copied) corresponding
+    to each time the object was called
+
+]]
+function mock.observe_func(callback)
     local f = {
-        return_values = {...},
         call_count = 0,
         call_args = {},
     }
@@ -101,11 +122,36 @@ function mock.func(...)
                 end
             end
             table.insert(self.call_args, args)
-            return table.unpack(self.return_values)
+            return callback(...)
         end,
     })
 
     return f
 end
 
+--[[
+
+Returns a callable object similar to `mock.observe_func()`, but which when
+called, only returns the given `return_value`(s) with no additional side effects.
+
+Intended for use by `patch()`.
+
+Usage:
+    func(return_value [, return_value2 ...])
+
+See `observe_func()` for a description of the return value.
+
+The return value also has an additional `return_values` field, which is a table
+of values returned when the object is called. This can be modified.
+
+]]
+function mock.func(...)
+    local f
+    f = mock.observe_func(function()
+        return table.unpack(f.return_values)
+    end)
+    f.return_values = {...}
+    return f
+end
+
 return mock
diff --git a/test/library/test_util/mock.lua b/test/library/test_util/mock.lua
index 32aed28e1..1031a496a 100644
--- a/test/library/test_util/mock.lua
+++ b/test/library/test_util/mock.lua
@@ -208,9 +208,44 @@ function test.func_call_return_value()
 end
 
 function test.func_call_return_multiple_values()
-    local f = mock.func(7,5,{imatable='snarfsnarf'})
+    local f = mock.func(7, 5, {imatable='snarfsnarf'})
     local a, b, c = f()
     expect.eq(7, a)
     expect.eq(5, b)
     expect.table_eq({imatable='snarfsnarf'}, c)
 end
+
+function test.observe_func()
+    -- basic end-to-end test for common cases;
+    -- most edge cases are covered by mock.func() tests
+    local counter = 0
+    local function target()
+        counter = counter + 1
+        return counter
+    end
+    local observer = mock.observe_func(target)
+
+    expect.eq(observer(), 1)
+    expect.eq(counter, 1)
+    expect.eq(observer.call_count, 1)
+    expect.table_eq(observer.call_args, {{}})
+
+    expect.eq(observer('x', 'y'), 2)
+    expect.eq(counter, 2)
+    expect.eq(observer.call_count, 2)
+    expect.table_eq(observer.call_args, {{}, {'x', 'y'}})
+end
+
+function test.observe_func_error()
+    local function target()
+        error('asdf')
+    end
+    local observer = mock.observe_func(target)
+
+    expect.error_match('asdf', function()
+        observer('x')
+    end)
+    -- make sure the call was still tracked
+    expect.eq(observer.call_count, 1)
+    expect.table_eq(observer.call_args, {{'x'}})
+end

From 71d003c77dc735200b436082381d42d643a4f2e9 Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Fri, 27 May 2022 01:03:40 -0400
Subject: [PATCH 070/854] Ensure that test stack frames in the test file are
 printed

Previously, only frames in the file that called `expect.*()` were printed.
This change allows calling `expect.*()` from functions called by the files
under test. See dfhack/scripts#385 for an example with `expect.fail()`.
---
 ci/test.lua | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/ci/test.lua b/ci/test.lua
index 9a4a33ef2..aca78e851 100644
--- a/ci/test.lua
+++ b/ci/test.lua
@@ -240,7 +240,7 @@ end
 -- output doesn't trigger its own dfhack.printerr usage detection (see
 -- detect_printerr below)
 local orig_printerr = dfhack.printerr
-local function wrap_expect(func, private)
+local function wrap_expect(func, private, path)
     return function(...)
         private.checks = private.checks + 1
         local ret = {func(...)}
@@ -269,7 +269,7 @@ local function wrap_expect(func, private)
             end
             -- Skip any frames corresponding to C calls, or Lua functions defined in another file
             -- these could include pcall(), with_finalize(), etc.
-            if info.what == 'Lua' and info.short_src == caller_src then
+            if info.what == 'Lua' and (info.short_src == caller_src or info.short_src == path) then
                 orig_printerr(('  at %s:%d'):format(info.short_src, info.currentline))
             end
             frame = frame + 1
@@ -278,7 +278,7 @@ local function wrap_expect(func, private)
     end
 end
 
-local function build_test_env()
+local function build_test_env(path)
     local env = {
         test = utils.OrderedTable(),
         -- config values can be overridden in the test file to define
@@ -309,7 +309,7 @@ local function build_test_env()
         checks_ok = 0,
     }
     for name, func in pairs(expect) do
-        env.expect[name] = wrap_expect(func, private)
+        env.expect[name] = wrap_expect(func, private, path)
     end
     setmetatable(env, {__index = _G})
     return env, private
@@ -345,9 +345,9 @@ local function finish_tests(done_command)
 end
 
 local function load_tests(file, tests)
-    local short_filename = file:sub((file:find('test') or -4)+5, -1)
+    local short_filename = file:sub((file:find('test') or -4) + 5, -1)
     print('Loading file: ' .. short_filename)
-    local env, env_private = build_test_env()
+    local env, env_private = build_test_env(file)
     local code, err = loadfile(file, 't', env)
     if not code then
         dfhack.printerr('Failed to load file: ' .. tostring(err))

From add8aa238609cddc3a5b7d470e5115a3a191d562 Mon Sep 17 00:00:00 2001
From: DFHack-Urist via GitHub Actions
 <63161697+DFHack-Urist@users.noreply.github.com>
Date: Fri, 27 May 2022 07:18:24 +0000
Subject: [PATCH 071/854] Auto-update submodules

depends/libexpat: dfhack
---
 depends/libexpat | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/depends/libexpat b/depends/libexpat
index 3e877cbb3..d6c6a81e1 160000
--- a/depends/libexpat
+++ b/depends/libexpat
@@ -1 +1 @@
-Subproject commit 3e877cbb3c9bc8f22946053e70490d2e5431f4d5
+Subproject commit d6c6a81e1a34e646705274110d8fe8c7ec91405a

From 07f54deb0bf609eeba54a1ae43856626f4d8bf9d Mon Sep 17 00:00:00 2001
From: Timur Kelman <tymur.gubayev@gmail.com>
Date: Sat, 28 May 2022 00:25:17 +0200
Subject: [PATCH 072/854] fix wrong `Label.frame_body.x2` value (#2134)

* fix wrong `Label.frame_body.x2` value

`update_scroll_inset` might change `frame_inset`, i.e. we need to `computeFrame` with the new values.

* add tests for Label

* add missing `local`, remove code in comments

* move `TestFramedScreen` outside test functions
---
 library/lua/gui/widgets.lua        | 12 +++-
 test/library/gui/widgets.Label.lua | 94 ++++++++++++++++++++++++++++++
 2 files changed, 104 insertions(+), 2 deletions(-)
 create mode 100644 test/library/gui/widgets.Label.lua

diff --git a/library/lua/gui/widgets.lua b/library/lua/gui/widgets.lua
index 21e03370b..c6e84d7a1 100644
--- a/library/lua/gui/widgets.lua
+++ b/library/lua/gui/widgets.lua
@@ -478,8 +478,16 @@ function Label:render_scroll_icons(dc, x, y1, y2)
     end
 end
 
-function Label:postComputeFrame()
-    self:update_scroll_inset()
+function Label:computeFrame(parent_rect)
+    local frame_rect,body_rect = Label.super.computeFrame(self, parent_rect)
+
+    self.frame_rect = frame_rect
+    self.frame_body = parent_rect:viewport(body_rect or frame_rect)
+
+    self:update_scroll_inset() -- frame_body is now set
+
+    -- recalc with updated frame_inset
+    return Label.super.computeFrame(self, parent_rect)
 end
 
 function Label:preUpdateLayout()
diff --git a/test/library/gui/widgets.Label.lua b/test/library/gui/widgets.Label.lua
new file mode 100644
index 000000000..49a75a235
--- /dev/null
+++ b/test/library/gui/widgets.Label.lua
@@ -0,0 +1,94 @@
+-- test -dhack/scripts/devel/tests -twidgets.Label
+
+local gui = require('gui')
+local widgets = require('gui.widgets')
+
+local xtest = {} -- use to temporarily disable tests (change `function xtest.somename` to `function xxtest.somename`)
+local wait = function(n)
+    delay(n or 30) -- enable for debugging the tests
+end
+
+local fs = defclass(fs, gui.FramedScreen)
+fs.ATTRS = {
+    frame_style = gui.GREY_LINE_FRAME,
+    frame_title = 'TestFramedScreen',
+    frame_width = 10,
+    frame_height = 10,
+    frame_inset = 0,
+    focus_path = 'test-framed-screen',
+}
+
+function test.Label_correct_frame_body_with_scroll_icons()
+    local t = {}
+    for i = 1, 12 do
+        t[#t+1] = tostring(i)
+        t[#t+1] = NEWLINE
+    end
+
+    function fs:init(args)
+        self:addviews{
+            widgets.Label{
+                view_id = 'text',
+                frame_inset = 0,
+                text = t,
+                --show_scroll_icons = 'right',
+            },
+        }
+    end
+
+    local o = fs{}
+    --o:show()
+    --wait()
+    expect.eq(o.subviews.text.frame_body.width, 9, "Label's frame_body.x2 and .width should be one smaller because of show_scroll_icons.")
+    --o:dismiss()
+end
+
+function test.Label_correct_frame_body_with_few_text_lines()
+    local t = {}
+    for i = 1, 10 do
+        t[#t+1] = tostring(i)
+        t[#t+1] = NEWLINE
+    end
+
+    function fs:init(args)
+        self:addviews{
+            widgets.Label{
+                view_id = 'text',
+                frame_inset = 0,
+                text = t,
+                --show_scroll_icons = 'right',
+            },
+        }
+    end
+
+    local o = fs{}
+    --o:show()
+    --wait()
+    expect.eq(o.subviews.text.frame_body.width, 10, "Label's frame_body.x2 and .width should not change with show_scroll_icons = false.")
+    --o:dismiss()
+end
+
+function test.Label_correct_frame_body_without_show_scroll_icons()
+    local t = {}
+    for i = 1, 12 do
+        t[#t+1] = tostring(i)
+        t[#t+1] = NEWLINE
+    end
+
+    function fs:init(args)
+        self:addviews{
+            widgets.Label{
+                view_id = 'text',
+                frame_inset = 0,
+                text = t,
+                show_scroll_icons = false,
+            },
+        }
+    end
+
+    local o = fs{}
+    --o:show()
+    --wait()
+    expect.eq(o.subviews.text.frame_body.width, 10, "Label's frame_body.x2 and .width should not change with show_scroll_icons = false.")
+    --o:dismiss()
+end

From ea7fe2b926f7478171290465df8f1eff2c5567c8 Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Fri, 27 May 2022 15:38:13 -0700
Subject: [PATCH 073/854] account for scroll bars when sizing message boxes

---
 library/lua/gui/dialogs.lua | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/library/lua/gui/dialogs.lua b/library/lua/gui/dialogs.lua
index 51f346bbd..952e8f734 100644
--- a/library/lua/gui/dialogs.lua
+++ b/library/lua/gui/dialogs.lua
@@ -36,7 +36,13 @@ end
 function MessageBox:getWantedFrameSize()
     local label = self.subviews.label
     local width = math.max(self.frame_width or 0, 20, #(self.frame_title or '') + 4)
-    return math.max(width, label:getTextWidth()), label:getTextHeight()
+    local text_area_width = label:getTextWidth()
+    if label.frame_inset then
+        -- account for scroll icons
+        text_area_width = text_area_width + (label.frame_inset.l or 0)
+        text_area_width = text_area_width + (label.frame_inset.r or 0)
+    end
+    return math.max(width, text_area_width), label:getTextHeight()
 end
 
 function MessageBox:onRenderFrame(dc,rect)

From 9d2bb01cafd63e8b8ba4d5462814839c06f34231 Mon Sep 17 00:00:00 2001
From: DFHack-Urist via GitHub Actions
 <63161697+DFHack-Urist@users.noreply.github.com>
Date: Sat, 28 May 2022 07:17:45 +0000
Subject: [PATCH 074/854] Auto-update submodules

scripts: master
depends/libexpat: dfhack
---
 depends/libexpat | 2 +-
 scripts          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/depends/libexpat b/depends/libexpat
index d6c6a81e1..6ac8628a3 160000
--- a/depends/libexpat
+++ b/depends/libexpat
@@ -1 +1 @@
-Subproject commit d6c6a81e1a34e646705274110d8fe8c7ec91405a
+Subproject commit 6ac8628a3c7a1677b27fb007db96f665b684a183
diff --git a/scripts b/scripts
index b1bfe27aa..741c84ada 160000
--- a/scripts
+++ b/scripts
@@ -1 +1 @@
-Subproject commit b1bfe27aa95ceb6c645f40c412c34d92c74b4bb0
+Subproject commit 741c84ada2ec7fdd0083744afab294d9a1b6e370

From b1e118384e2c88aed70efd5ec7f0c5e1a1b2d8fc Mon Sep 17 00:00:00 2001
From: Ryan Williams <Bumber64@users.noreply.github.com>
Date: Mon, 30 May 2022 15:23:07 -0700
Subject: [PATCH 075/854] Update Maps.cpp

---
 library/modules/Maps.cpp | 254 +++++++++++++++++++--------------------
 1 file changed, 126 insertions(+), 128 deletions(-)

diff --git a/library/modules/Maps.cpp b/library/modules/Maps.cpp
index 06f8c9673..e046faa0e 100644
--- a/library/modules/Maps.cpp
+++ b/library/modules/Maps.cpp
@@ -824,162 +824,160 @@ misrepresented as being the original software.
 3. This notice may not be removed or altered from any source distribution.
 */
 
-namespace {
-    //----------------------------------------------------------------------------//
-    // Utility function
-    //
-    //----------------------------------------------------------------------------//
-    std::pair<bool, bool> check_tropicality(df::region_map_entry& region,
-        int y_pos
-    )
+//----------------------------------------------------------------------------//
+// Utility function
+//
+//----------------------------------------------------------------------------//
+static std::pair<bool, bool> check_tropicality(df::region_map_entry& region,
+    int y_pos
+)
+{
+    int flip_latitude = df::global::world->world_data->flip_latitude;
+
+    bool is_possible_tropical_area_by_latitude = false;
+    bool is_tropical_area_by_latitude = false;
+
+    if (flip_latitude == -1)  // NO POLES
     {
-        int flip_latitude = df::global::world->world_data->flip_latitude;
+        // If there're no poles, tropical area is determined by temperature
+        is_possible_tropical_area_by_latitude = region.temperature >= 75;
+        is_tropical_area_by_latitude = region.temperature >= 85;
+    }
 
-        bool is_possible_tropical_area_by_latitude = false;
-        bool is_tropical_area_by_latitude = false;
+    else
+    {
+        int v6 = 0;
+
+        df::world_data* wdata = df::global::world->world_data;
 
-        if (flip_latitude == -1)  // NO POLES
+        if (flip_latitude == 0) // NORTH POLE ONLY
         {
-            // If there're no poles, tropical area is determined by temperature
-            is_possible_tropical_area_by_latitude = region.temperature >= 75;
-            is_tropical_area_by_latitude = region.temperature >= 85;
+            v6 = y_pos;
         }
 
-        else
+        else if (flip_latitude == 1) // SOUTH_POLE ONLY
         {
-            int v6 = 0;
-
-            df::world_data* wdata = df::global::world->world_data;
-
-            if (flip_latitude == 0) // NORTH POLE ONLY
-            {
-                v6 = y_pos;
-            }
-
-            else if (flip_latitude == 1) // SOUTH_POLE ONLY
-            {
-                v6 = df::global::world->world_data->world_height - y_pos - 1;
-            }
+            v6 = df::global::world->world_data->world_height - y_pos - 1;
+        }
 
-            else if (flip_latitude == 2) // BOTH POLES
+        else if (flip_latitude == 2) // BOTH POLES
+        {
+            if (y_pos < wdata->world_height / 2)
+                v6 = 2 * y_pos;
+            else
             {
-                if (y_pos < wdata->world_height / 2)
-                    v6 = 2 * y_pos;
-                else
-                {
-                    v6 = wdata->world_height + 2 * (wdata->world_height / 2 - y_pos) - 1;
-                    if (v6 < 0)
-                        v6 = 0;
-                    if (v6 >= wdata->world_height)
-                        v6 = wdata->world_height - 1;
-                }
+                v6 = wdata->world_height + 2 * (wdata->world_height / 2 - y_pos) - 1;
+                if (v6 < 0)
+                    v6 = 0;
+                if (v6 >= wdata->world_height)
+                    v6 = wdata->world_height - 1;
             }
-
-            if (wdata->world_height == 17)
-                v6 *= 16;
-            else if (wdata->world_height == 33)
-                v6 *= 8;
-            else if (wdata->world_height == 65)
-                v6 *= 4;
-            else if (wdata->world_height == 129)
-                v6 *= 2;
-
-            is_possible_tropical_area_by_latitude = v6 > 170;
-            is_tropical_area_by_latitude = v6 >= 200;
         }
 
-        return std::pair<bool, bool>(is_possible_tropical_area_by_latitude,
-            is_tropical_area_by_latitude
-            );
+        if (wdata->world_height == 17)
+            v6 *= 16;
+        else if (wdata->world_height == 33)
+            v6 *= 8;
+        else if (wdata->world_height == 65)
+            v6 *= 4;
+        else if (wdata->world_height == 129)
+            v6 *= 2;
+
+        is_possible_tropical_area_by_latitude = v6 > 170;
+        is_tropical_area_by_latitude = v6 >= 200;
     }
 
+    return std::pair<bool, bool>(is_possible_tropical_area_by_latitude,
+        is_tropical_area_by_latitude
+        );
+}
+
 
-    //----------------------------------------------------------------------------//
-    // Utility function
-    //
-    // return some unknow parameter as a percentage
-    //----------------------------------------------------------------------------//
-    int get_region_parameter(int y,
-        int x
-    )
+//----------------------------------------------------------------------------//
+// Utility function
+//
+// return some unknow parameter as a percentage
+//----------------------------------------------------------------------------//
+static int get_region_parameter(int y,
+    int x
+)
+{
+    int world_height = df::global::world->world_data->world_height;
+    if (world_height > 65) // Medium and large worlds
     {
-        int world_height = df::global::world->world_data->world_height;
-        if (world_height > 65) // Medium and large worlds
-        {
-            // access to region 2D array
-            df::region_map_entry& region = df::global::world->world_data->region_map[x][y];
-            int flip_latitude = df::global::world->world_data->flip_latitude;
-            int rainfall = region.rainfall;
-            int result;
-            int y_pos = y;
-            int ypos = y_pos;
-
-            if (flip_latitude == -1) // NO POLES
-                return 100;
-
-            else if (flip_latitude == 1) // SOUTH POLE
-                ypos = world_height - y_pos - 1;
-            else if (flip_latitude == 2) // NORTH & SOUTH POLE
-            {
-                if (ypos < world_height / 2)
-                    ypos *= 2;
-                else
-                {
-                    ypos = world_height + 2 * (world_height / 2 - ypos) - 1;
-                    if (ypos < 0)
-                        ypos = 0;
-                    if (ypos >= world_height)
-                        ypos = world_height - 1;
-                }
-            }
+        // access to region 2D array
+        df::region_map_entry& region = df::global::world->world_data->region_map[x][y];
+        int flip_latitude = df::global::world->world_data->flip_latitude;
+        int rainfall = region.rainfall;
+        int result;
+        int y_pos = y;
+        int ypos = y_pos;
 
-            int latitude; // 0 - 256 (size of a large world)
-            switch (world_height)
+        if (flip_latitude == -1) // NO POLES
+            return 100;
+
+        else if (flip_latitude == 1) // SOUTH POLE
+            ypos = world_height - y_pos - 1;
+        else if (flip_latitude == 2) // NORTH & SOUTH POLE
+        {
+            if (ypos < world_height / 2)
+                ypos *= 2;
+            else
             {
-            case 17:                                    // Pocket world
-                latitude = 16 * ypos;
-                break;
-            case 33:                                    // Smaller world
-                latitude = 8 * ypos;
-                break;
-            case 65:                                    // Small world
-                latitude = 4 * ypos;
-                break;
-            case 129:                                  // Medium world
-                latitude = 2 * ypos;
-                break;
-            default:                                  // Large world
-                latitude = ypos;
-                break;
+                ypos = world_height + 2 * (world_height / 2 - ypos) - 1;
+                if (ypos < 0)
+                    ypos = 0;
+                if (ypos >= world_height)
+                    ypos = world_height - 1;
             }
+        }
 
-            // latitude > 220
-            if ((latitude - 171) > 49)
-                return 100;
+        int latitude; // 0 - 256 (size of a large world)
+        switch (world_height)
+        {
+        case 17:                                    // Pocket world
+            latitude = 16 * ypos;
+            break;
+        case 33:                                    // Smaller world
+            latitude = 8 * ypos;
+            break;
+        case 65:                                    // Small world
+            latitude = 4 * ypos;
+            break;
+        case 129:                                  // Medium world
+            latitude = 2 * ypos;
+            break;
+        default:                                  // Large world
+            latitude = ypos;
+            break;
+        }
 
+        // latitude > 220
+        if ((latitude - 171) > 49)
+            return 100;
 
-            // Latitude between 191 and 200
-            if ((latitude > 190) && (latitude < 201))
-                return 0;
 
-            // Latitude between 201 and 220
-            if ((latitude > 190) && (latitude >= 201))
-                result = rainfall + 16 * (latitude - 207);
-            else
-                // Latitude between 0 and 190
-                result = (16 * (184 - latitude) - rainfall);
+        // Latitude between 191 and 200
+        if ((latitude > 190) && (latitude < 201))
+            return 0;
 
-            if (result < 0)
-                return 0;
+        // Latitude between 201 and 220
+        if ((latitude > 190) && (latitude >= 201))
+            result = rainfall + 16 * (latitude - 207);
+        else
+            // Latitude between 0 and 190
+            result = (16 * (184 - latitude) - rainfall);
 
-            if (result > 100)
-                return 100;
+        if (result < 0)
+            return 0;
 
-            return result;
-        }
+        if (result > 100)
+            return 100;
 
-        return 100;
+        return result;
     }
+
+    return 100;
 }
 
 

From bc0def4342e3a097cf5f8e6e4a362f91dd4dba3a Mon Sep 17 00:00:00 2001
From: Ryan Williams <Bumber64@users.noreply.github.com>
Date: Mon, 30 May 2022 19:58:46 -0700
Subject: [PATCH 076/854] MiscUtils word_wrap: Add option to trim only leading
 whitespace after wrapping (#2169)

* Update changelog.txt
---
 docs/changelog.txt          |  1 +
 library/MiscUtils.cpp       | 16 ++++++++++------
 library/include/MiscUtils.h |  8 +++++++-
 3 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/docs/changelog.txt b/docs/changelog.txt
index b2ef0e90a..3b75390dd 100644
--- a/docs/changelog.txt
+++ b/docs/changelog.txt
@@ -47,6 +47,7 @@ changelog.txt uses a syntax similar to RST, with a few special sequences:
 ## Documentation
 
 ## API
+- ``word_wrap``: argument ``bool collapse_whitespace`` converted to enum ``word_wrap_whitespace_mode mode``, with valid modes ``WSMODE_KEEP_ALL``, ``WSMODE_COLLAPSE_ALL``, and ``WSMODE_TRIM_LEADING``.
 
 ## Lua
 - ``widgets.HotkeyLabel``: the ``key_sep`` string is now configurable
diff --git a/library/MiscUtils.cpp b/library/MiscUtils.cpp
index 6ab63d5eb..b959e756e 100644
--- a/library/MiscUtils.cpp
+++ b/library/MiscUtils.cpp
@@ -168,15 +168,15 @@ std::string to_search_normalized(const std::string &str)
     return result;
 }
 
-
-bool word_wrap(std::vector<std::string> *out, const std::string &str,
-               size_t line_length, bool collapse_whitespace)
+bool word_wrap(std::vector<std::string> *out, const std::string &str, size_t line_length,
+               word_wrap_whitespace_mode mode)
 {
     if (line_length == 0)
         line_length = SIZE_MAX;
 
     std::string line;
     size_t break_pos = 0;
+    bool ignore_whitespace = false;
 
     for (auto &c : str)
     {
@@ -185,19 +185,22 @@ bool word_wrap(std::vector<std::string> *out, const std::string &str,
             out->push_back(line);
             line.clear();
             break_pos = 0;
+            ignore_whitespace = (mode == WSMODE_TRIM_LEADING);
             continue;
         }
 
         if (isspace(c))
         {
-            if (break_pos == line.length() && collapse_whitespace)
+            if (ignore_whitespace || (mode == WSMODE_COLLAPSE_ALL && break_pos == line.length()))
                 continue;
 
-            line.push_back(collapse_whitespace ? ' ' : c);
+            line.push_back((mode == WSMODE_COLLAPSE_ALL) ? ' ' : c);
             break_pos = line.length();
         }
-        else {
+        else
+        {
             line.push_back(c);
+            ignore_whitespace = false;
         }
 
         if (line.length() > line_length)
@@ -215,6 +218,7 @@ bool word_wrap(std::vector<std::string> *out, const std::string &str,
             }
             line = line.substr(break_pos);
             break_pos = 0;
+            ignore_whitespace = (mode == WSMODE_TRIM_LEADING);
         }
     }
     if (line.length())
diff --git a/library/include/MiscUtils.h b/library/include/MiscUtils.h
index 764b11413..56506f7bd 100644
--- a/library/include/MiscUtils.h
+++ b/library/include/MiscUtils.h
@@ -389,10 +389,16 @@ DFHACK_EXPORT std::string toUpper(const std::string &str);
 DFHACK_EXPORT std::string toLower(const std::string &str);
 DFHACK_EXPORT std::string to_search_normalized(const std::string &str);
 
+enum word_wrap_whitespace_mode {
+    WSMODE_KEEP_ALL,
+    WSMODE_COLLAPSE_ALL,
+    WSMODE_TRIM_LEADING
+};
+
 DFHACK_EXPORT bool word_wrap(std::vector<std::string> *out,
                              const std::string &str,
                              size_t line_length = 80,
-                             bool collapse_whitespace = false);
+                             word_wrap_whitespace_mode mode = WSMODE_KEEP_ALL);
 
 inline bool bits_match(unsigned required, unsigned ok, unsigned mask)
 {

From ad2d9cad037a94c677e94df6fff9d303677d4f86 Mon Sep 17 00:00:00 2001
From: Myk <myk002@yahoo.com>
Date: Wed, 1 Jun 2022 17:42:13 -0700
Subject: [PATCH 077/854] [lua] implement keyboard focus subsystem (#2160)

* implement keyboard focus subsystem

* Fix error in focus group combining

* documentation for the inputToSubviews decision

* modify unit tests to catch that last bug
---
 docs/Lua API.rst     |  39 ++++++++--
 docs/changelog.txt   |   1 +
 library/lua/gui.lua  |  98 +++++++++++++++++++++++-
 test/library/gui.lua | 176 +++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 308 insertions(+), 6 deletions(-)

diff --git a/docs/Lua API.rst b/docs/Lua API.rst
index 04257b49d..2edb1b015 100644
--- a/docs/Lua API.rst	
+++ b/docs/Lua API.rst	
@@ -3516,14 +3516,24 @@ The class defines the following attributes:
 :visible: Specifies that the view should be painted.
 :active: Specifies that the view should receive events, if also visible.
 :view_id: Specifies an identifier to easily identify the view among subviews.
-          This is reserved for implementation of top-level views, and should
-          not be used by widgets for their internal subviews.
+          This is reserved for use by script writers and should not be set by
+          library widgets for their internal subviews.
+:on_focus: Called when the view gains keyboard focus; see ``setFocus()`` below.
+:on_unfocus: Called when the view loses keyboard focus.
 
 It also always has the following fields:
 
 :subviews: Contains a table of all subviews. The sequence part of the
            table is used for iteration. In addition, subviews are also
-           indexed under their *view_id*, if any; see ``addviews()`` below.
+           indexed under their ``view_id``, if any; see ``addviews()`` below.
+:parent_view: A reference to the parent view. This field is ``nil`` until the
+              view is added as a subview to another view with ``addviews()``.
+:focus_group: The list of widgets in a hierarchy. This table is unique and empty
+              when a view is initialized, but is replaced by a shared table when
+              the view is added to a parent via ``addviews()``. If a view in the
+              focus group has keyboard focus, that widget can be accessed via
+              ``focus_group.cur``.
+:focus: A boolean indicating whether the view currently has keyboard focus.
 
 These fields are computed by the layout process:
 
@@ -3617,8 +3627,27 @@ The class has the following methods:
 
   Calls ``onInput`` on all visible active subviews, iterating the ``subviews``
   sequence in *reverse order*, so that topmost subviews get events first.
-  Returns *true* if any of the subviews handled the event.
-
+  Returns ``true`` if any of the subviews handled the event. If a subview within
+  the view's ``focus_group`` has focus and it and all of its ancestors are
+  active and visible, that subview is offered the chance to handle the input
+  before any other subviews.
+
+* ``view:getPreferredFocusState()``
+
+  Returns ``false`` by default, but should be overridden by subclasses that may
+  want to take keyboard focus (if it is unclaimed) when they are added to a
+  parent view with ``addviews()``.
+
+* ``view:setFocus(focus)``
+
+  Sets the keyboard focus to the view if ``focus`` is ``true``, or relinquishes
+  keyboard focus if ``focus`` is ``false``. Views that newly acquire keyboard
+  focus will trigger the ``on_focus`` callback, and views that lose keyboard
+  focus will trigger the ``on_unfocus`` callback. While a view has focus, all
+  keyboard input is sent to that view before any of its siblings or parents.
+  Keyboard input is propagated as normal (see ``inputToSubviews()`` above) if
+  there is no view with focus or if the view with focus returns ``false`` from
+  its ``onInput()`` function.
 
 .. _lua-gui-screen:
 
diff --git a/docs/changelog.txt b/docs/changelog.txt
index 3b75390dd..0a4bcd68a 100644
--- a/docs/changelog.txt
+++ b/docs/changelog.txt
@@ -50,6 +50,7 @@ changelog.txt uses a syntax similar to RST, with a few special sequences:
 - ``word_wrap``: argument ``bool collapse_whitespace`` converted to enum ``word_wrap_whitespace_mode mode``, with valid modes ``WSMODE_KEEP_ALL``, ``WSMODE_COLLAPSE_ALL``, and ``WSMODE_TRIM_LEADING``.
 
 ## Lua
+- ``gui.View``: all ``View`` subclasses (including all ``Widgets``) can now acquire keyboard focus with the new ``View:setFocus()`` function. See docs for details.
 - ``widgets.HotkeyLabel``: the ``key_sep`` string is now configurable
 - ``widgets.EditField``: the ``key_sep`` string is now configurable
 - ``widgets.EditField``: can now display an optional string label in addition to the activation key
diff --git a/library/lua/gui.lua b/library/lua/gui.lua
index 8521e1dfe..8d546b21a 100644
--- a/library/lua/gui.lua
+++ b/library/lua/gui.lua
@@ -376,10 +376,21 @@ View.ATTRS {
     active = true,
     visible = true,
     view_id = DEFAULT_NIL,
+    on_focus = DEFAULT_NIL,
+    on_unfocus = DEFAULT_NIL,
 }
 
 function View:init(args)
     self.subviews = {}
+    self.focus_group = {self}
+    self.focus = false
+end
+
+local function inherit_focus_group(view, focus_group)
+    for _,child in ipairs(view.subviews) do
+        inherit_focus_group(child, focus_group)
+    end
+    view.focus_group = focus_group
 end
 
 function View:addviews(list)
@@ -388,6 +399,31 @@ function View:addviews(list)
     local sv = self.subviews
 
     for _,obj in ipairs(list) do
+        -- absorb the focus groups of new children
+        for _,focus_obj in ipairs(obj.focus_group) do
+            table.insert(self.focus_group, focus_obj)
+        end
+        -- if the child's focus group has a focus owner, absorb it if we don't
+        -- already have one. otherwise keep the focus owner we have and clear
+        -- the focus of the child.
+        if obj.focus_group.cur then
+            if not self.focus_group.cur then
+                self.focus_group.cur = obj.focus_group.cur
+            else
+                obj.focus_group.cur:setFocus(false)
+            end
+        end
+        -- overwrite the child's focus_group hierarchy with ours
+        inherit_focus_group(obj, self.focus_group)
+        -- if we don't have a focus owner, give it to the new child if they want
+        if not self.focus_group.cur and obj:getPreferredFocusState() then
+            obj:setFocus(true)
+        end
+
+        -- set ourselves as the parent view of the new child
+        obj.parent_view = self
+
+        -- add the subview to our child list
         table.insert(sv, obj)
 
         local id = obj.view_id
@@ -405,6 +441,33 @@ function View:addviews(list)
     end
 end
 
+-- should be overridden by widgets that care about capturing keyboard focus
+-- (e.g. widgets.EditField)
+function View:getPreferredFocusState()
+    return false
+end
+
+function View:setFocus(focus)
+    if focus then
+        if self.focus then return end -- nothing to do if we already have focus
+        if self.focus_group.cur then
+            -- steal focus from current owner
+            self.focus_group.cur:setFocus(false)
+        end
+        self.focus_group.cur = self
+        self.focus = true
+        if self.on_focus then
+            self.on_focus()
+        end
+    elseif self.focus then
+        self.focus = false
+        self.focus_group.cur = nil
+        if self.on_unfocus then
+            self.on_unfocus()
+        end
+    end
+end
+
 function View:getWindowSize()
     local rect = self.frame_body
     return rect.width, rect.height
@@ -476,12 +539,45 @@ end
 function View:onRenderBody(dc)
 end
 
+-- Returns whether we should invoke the focus owner's onInput() function from
+-- the given view's inputToSubviews() function. That is, returns true if:
+-- - the view is not itself the focus owner since that would be an infinite loop
+-- - the view is not a descendent of the focus owner (same as above)
+-- - the focus owner and all of its ancestors are visible and active, since if
+--   the focus owner is not (directly or transitively) visible or active, then
+--   it shouldn't be getting input.
+local function should_send_input_to_focus_owner(view, focus_owner)
+    local iter = view
+    while iter do
+        if iter == focus_owner then
+            return false
+        end
+        iter = iter.parent_view
+    end
+    iter = focus_owner
+    while iter do
+        if not iter.visible or not iter.active then
+            return false
+        end
+        iter = iter.parent_view
+    end
+    return true
+end
+
 function View:inputToSubviews(keys)
     local children = self.subviews
 
+    -- give focus owner first dibs on the input
+    local focus_owner = self.focus_group.cur
+    if focus_owner and should_send_input_to_focus_owner(self, focus_owner) and
+            focus_owner:onInput(keys) then
+        return true
+    end
+
     for i=#children,1,-1 do
         local child = children[i]
-        if child.visible and child.active and child:onInput(keys) then
+        if child.visible and child.active and child ~= focus_owner and
+                child:onInput(keys) then
             return true
         end
     end
diff --git a/test/library/gui.lua b/test/library/gui.lua
index 4cfad07b1..fe04614d6 100644
--- a/test/library/gui.lua
+++ b/test/library/gui.lua
@@ -17,3 +17,179 @@ function test.clear_pen()
         tile_color = false,
     })
 end
+
+WantsFocusView = defclass(WantsFocusView, gui.View)
+function WantsFocusView:getPreferredFocusState()
+    return true
+end
+
+function test.view_wants_focus()
+    local parent = gui.View()
+    expect.false_(parent.focus)
+
+    -- expect first (regular) child to not get focus
+    local regular_child = gui.View()
+    expect.false_(regular_child.focus)
+    expect.ne(parent.focus_group, regular_child.focus_group)
+    parent:addviews{regular_child}
+    expect.false_(regular_child.focus)
+    expect.eq(parent.focus_group, regular_child.focus_group)
+
+    -- the first child who wants focus gets it
+    local focus_child = WantsFocusView()
+    expect.false_(focus_child.focus)
+    parent:addviews{focus_child}
+    expect.true_(focus_child.focus)
+    expect.eq(parent.focus_group.cur, focus_child)
+
+    -- the second child who wants focus doesn't
+    local focus_child2 = WantsFocusView()
+    parent:addviews{focus_child2}
+    expect.false_(focus_child2.focus)
+    expect.eq(parent.focus_group.cur, focus_child)
+end
+
+function test.inherit_focus_from_subview()
+    local parent = gui.View()
+    local regular_child = gui.View()
+    local focus_child = WantsFocusView()
+    regular_child:addviews{focus_child}
+    expect.true_(focus_child.focus)
+    parent:addviews{regular_child}
+    expect.eq(parent.focus_group.cur, focus_child)
+end
+
+function test.subviews_negotiate_focus()
+    local parent = gui.View()
+    local regular_child = gui.View()
+    local regular_child2 = gui.View()
+    local focus_child = WantsFocusView()
+    local focus_child2 = WantsFocusView()
+    regular_child:addviews{focus_child}
+    regular_child2:addviews{focus_child2}
+    expect.true_(focus_child.focus)
+    expect.true_(focus_child2.focus)
+    expect.ne(regular_child.focus_group, regular_child2.focus_group)
+    parent:addviews{regular_child}
+    expect.eq(parent.focus_group.cur, focus_child)
+    expect.true_(focus_child.focus)
+    expect.true_(focus_child2.focus)
+    parent:addviews{regular_child2}
+    expect.eq(parent.focus_group.cur, focus_child)
+    expect.eq(regular_child.focus_group, regular_child2.focus_group)
+    expect.true_(focus_child.focus)
+    expect.false_(focus_child2.focus)
+end
+
+MockInputView = defclass(MockInputView, gui.View)
+function MockInputView:onInput(keys)
+    self.mock(keys)
+    MockInputView.super.onInput(self, keys)
+    return true
+end
+
+local function reset_child_mocks(parent)
+    for _,child in ipairs(parent.subviews) do
+        child.mock = mock.func()
+        reset_child_mocks(child)
+    end
+end
+
+-- verify that input got routed as expected
+local function test_children(expected, parent)
+    local children = parent.subviews
+    for i,val in ipairs(expected) do
+        expect.eq(val, children[i].mock.call_count, 'child '..i)
+    end
+end
+
+function test.keyboard_follows_focus()
+    local parent = gui.View()
+    local regular_child = MockInputView{}
+    local regular_child2 = MockInputView{}
+    local last_child = MockInputView{}
+    parent:addviews{regular_child, regular_child2, last_child}
+
+    reset_child_mocks(parent)
+    parent:onInput({'a'})
+    test_children({0,0,1}, parent)
+
+    regular_child:setFocus(true)
+    reset_child_mocks(parent)
+    parent:onInput({'a'})
+    test_children({1,0,0}, parent)
+
+    regular_child2:setFocus(true)
+    reset_child_mocks(parent)
+    parent:onInput({'a'})
+    test_children({0,1,0}, parent)
+
+    regular_child2:setFocus(false)
+    reset_child_mocks(parent)
+    parent:onInput({'a'})
+    test_children({0,0,1}, parent)
+end
+
+function test.one_callback_on_double_focus()
+    local on_focus = mock.func()
+    local view = gui.View{on_focus=on_focus}
+    expect.eq(0, on_focus.call_count)
+    view:setFocus(true)
+    expect.eq(1, on_focus.call_count)
+    view:setFocus(true)
+    expect.eq(1, on_focus.call_count)
+end
+
+function test.one_callback_on_double_unfocus()
+    local on_unfocus = mock.func()
+    local view = gui.View{on_unfocus=on_unfocus}
+    expect.eq(0, on_unfocus.call_count)
+    view:setFocus(false)
+    expect.eq(0, on_unfocus.call_count)
+    view:setFocus(true)
+    expect.eq(0, on_unfocus.call_count)
+    view:setFocus(false)
+    expect.eq(1, on_unfocus.call_count)
+    view:setFocus(false)
+    expect.eq(1, on_unfocus.call_count)
+end
+
+function test.no_input_when_focus_owner_is_hidden()
+    local parent = gui.View()
+    local child1 = MockInputView()
+    local child2 = MockInputView()
+    parent:addviews{child1, child2}
+    child1:setFocus(true)
+    child1.visible = false
+    reset_child_mocks(parent)
+    parent:onInput({'a'})
+    test_children({0,1}, parent)
+end
+
+function test.no_input_when_ancestor_is_hidden()
+    local grandparent = gui.View()
+    local parent = MockInputView()
+    local child1 = MockInputView()
+    local child2 = MockInputView()
+    grandparent:addviews{parent}
+    parent:addviews{child1, child2}
+    child1:setFocus(true)
+    parent.visible = false
+    reset_child_mocks(grandparent)
+    grandparent:onInput({'a'})
+    test_children({0}, grandparent)
+    test_children({0,0}, parent)
+end
+
+function test.no_input_loop_in_children_of_focus_owner()
+    local grandparent = gui.View()
+    local parent = MockInputView()
+    local child = MockInputView()
+    grandparent:addviews{parent}
+    parent:addviews{child}
+    parent:setFocus(true)
+    reset_child_mocks(grandparent)
+    child:onInput({'a'})
+    test_children({0}, grandparent)
+    test_children({1}, parent)
+end

From 89d3d45e875d173a588e1ce2795a48af087bd3e0 Mon Sep 17 00:00:00 2001
From: Myk <myk002@yahoo.com>
Date: Wed, 1 Jun 2022 21:48:21 -0700
Subject: [PATCH 078/854] Allow EditField widgets to manage their own
 activation and keyboard focus (#2147)

* use new focus subsystem in widgets.EditField

* always eat the enter key if we have an on_submit

* add modal attribute

* give EditFields a default height of 1

so they can be autoarranged
---
 docs/Lua API.rst            | 17 ++++++++++
 docs/changelog.txt          |  1 +
 library/lua/gui/widgets.lua | 63 ++++++++++++++++++++++++++-----------
 3 files changed, 62 insertions(+), 19 deletions(-)

diff --git a/docs/Lua API.rst b/docs/Lua API.rst
index 2edb1b015..bbcf0b145 100644
--- a/docs/Lua API.rst	
+++ b/docs/Lua API.rst	
@@ -3871,6 +3871,23 @@ Attributes:
 :key: If specified, the field is disabled until this key is pressed. Must be given as a string.
 :key_sep: If specified, will be used to customize how the activation key is
           displayed. See ``token.key_sep`` in the ``Label`` documentation below.
+:modal: Whether the ``EditField`` should prevent input from propagating to other
+        widgets while it has focus. You can set this to ``true``, for example,
+        if you don't want a ``List`` widget to react to arrow keys while the
+        user is editing.
+
+An ``EditField`` will only read and process text input if it has keyboard focus.
+It will automatically acquire keyboard focus when it is added as a subview to
+a parent that has not already granted keyboard focus to another widget. If you
+have more than one ``EditField`` on a screen, you can select which has focus by
+calling ``setFocus(true)`` on the field object.
+
+If an activation ``key`` is specified, the ``EditField`` will manage its own
+focus. It will start in the unfocused state, and pressing the activation key
+will acquire keyboard focus. Pressing the Enter key will release keyboard focus
+and then call the ``on_submit`` callback. Pressing the Escape key will also
+release keyboard focus, but first it will restore the text that was displayed
+before the ``EditField`` gained focus and then call the ``on_change`` callback.
 
 Label class
 -----------
diff --git a/docs/changelog.txt b/docs/changelog.txt
index 0a4bcd68a..a777b60c4 100644
--- a/docs/changelog.txt
+++ b/docs/changelog.txt
@@ -54,6 +54,7 @@ changelog.txt uses a syntax similar to RST, with a few special sequences:
 - ``widgets.HotkeyLabel``: the ``key_sep`` string is now configurable
 - ``widgets.EditField``: the ``key_sep`` string is now configurable
 - ``widgets.EditField``: can now display an optional string label in addition to the activation key
+- ``widgets.EditField``: views that have an ``EditField`` subview no longer need to manually manage the ``EditField`` activation state and input routing.  This is now handled automatically by the new ``gui.View`` keyboard focus subsystem.
 
 # 0.47.05-r5
 
diff --git a/library/lua/gui/widgets.lua b/library/lua/gui/widgets.lua
index c6e84d7a1..1a1b4c6fb 100644
--- a/library/lua/gui/widgets.lua
+++ b/library/lua/gui/widgets.lua
@@ -186,13 +186,25 @@ EditField.ATTRS{
     on_submit = DEFAULT_NIL,
     key = DEFAULT_NIL,
     key_sep = DEFAULT_NIL,
+    frame = {h=1},
+    modal = false,
 }
 
 function EditField:init()
+    local function on_activate()
+        self.saved_text = self.text
+        self:setFocus(true)
+    end
+
     self:addviews{HotkeyLabel{frame={t=0,l=0},
                               key=self.key,
                               key_sep=self.key_sep,
-                              label=self.label_text}}
+                              label=self.label_text,
+                              on_activate=self.key and on_activate or nil}}
+end
+
+function EditField:getPreferredFocusState()
+    return not self.key
 end
 
 function EditField:postUpdateLayout()
@@ -203,7 +215,7 @@ function EditField:onRenderBody(dc)
     dc:pen(self.text_pen or COLOR_LIGHTCYAN):fill(0,0,dc.width-1,0)
 
     local cursor = '_'
-    if not self.active or gui.blink_visible(300) then
+    if not self.active or not self.focus or gui.blink_visible(300) then
         cursor = ' '
     end
     local txt = self.text .. cursor
@@ -215,12 +227,36 @@ function EditField:onRenderBody(dc)
 end
 
 function EditField:onInput(keys)
-    if self.on_submit and keys.SELECT then
-        self.on_submit(self.text)
+    if not self.focus then
+        -- only react to our hotkey
+        return self:inputToSubviews(keys)
+    end
+
+    if self.key and keys.LEAVESCREEN then
+        local old = self.text
+        self.text = self.saved_text
+        if self.on_change and old ~= self.saved_text then
+            self.on_change(self.text, old)
+        end
+        self:setFocus(false)
         return true
-    elseif keys._STRING then
+    end
+
+    if keys.SELECT then
+        if self.key then
+            self:setFocus(false)
+        end
+        if self.on_submit then
+            self.on_submit(self.text)
+            return true
+        end
+        return not not self.key
+    end
+
+    if keys._STRING then
         local old = self.text
         if keys._STRING == 0 then
+            -- handle backspace
             self.text = string.sub(old, 1, #old-1)
         else
             local cv = string.char(keys._STRING)
@@ -233,6 +269,9 @@ function EditField:onInput(keys)
         end
         return true
     end
+
+    -- if we're modal, then unconditionally eat all the input
+    return self.modal
 end
 
 -----------
@@ -957,7 +996,6 @@ function FilteredList:init(info)
         on_change = self:callback('onFilterChange'),
         on_char = self:callback('onFilterChar'),
         key = self.edit_key,
-        active = (self.edit_key == nil),
     }
     self.list = List{
         frame = { t = 2 },
@@ -1002,19 +1040,6 @@ function FilteredList:init(info)
     end
 end
 
-function FilteredList:onInput(keys)
-    if self.edit_key and keys[self.edit_key] and not self.edit.active then
-        self.edit.active = true
-        return true
-    elseif keys.LEAVESCREEN and self.edit.active then
-        self.edit.active = false
-        return true
-    else
-        return self:inputToSubviews(keys)
-    end
-end
-
-
 function FilteredList:getChoices()
     return self.choices
 end

From f5d3b9f6995f46d11668a9098fb722d3352ba081 Mon Sep 17 00:00:00 2001
From: DFHack-Urist via GitHub Actions
 <63161697+DFHack-Urist@users.noreply.github.com>
Date: Thu, 2 Jun 2022 04:51:00 +0000
Subject: [PATCH 079/854] Auto-update submodules

library/xml: master
scripts: master
---
 library/xml | 2 +-
 scripts     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/library/xml b/library/xml
index 1dfe6c5ab..f503096c1 160000
--- a/library/xml
+++ b/library/xml
@@ -1 +1 @@
-Subproject commit 1dfe6c5ab9887507cdcdebdd9390352fe0bba2dd
+Subproject commit f503096c130661dda7a9b7e4b471b0854981f0f5
diff --git a/scripts b/scripts
index 741c84ada..1b1a28fa6 160000
--- a/scripts
+++ b/scripts
@@ -1 +1 @@
-Subproject commit 741c84ada2ec7fdd0083744afab294d9a1b6e370
+Subproject commit 1b1a28fa64bdaf17da8e6257f48deafd74dfd149

From 27bf4c758beaa1d4b47832a2e090fdf3db5393ac Mon Sep 17 00:00:00 2001
From: Myk <myk002@yahoo.com>
Date: Thu, 2 Jun 2022 06:24:13 -0700
Subject: [PATCH 080/854] Allow player to pause the confirmation dialog without
 disabling (#2164)

* basic pause functionality for confirm

* update changelog

* wrap the pause message and output in white

* unpause on viewscreen transition when we can

but still use esc detection when we won't get a viewscreen transition
(like when we're intercepting input on viewscreen_dwarfmodest

* add more code docs about unpause detection
---
 docs/changelog.txt  |  1 +
 plugins/confirm.cpp | 78 +++++++++++++++++++++++++++++++++++++++++++--
 2 files changed, 77 insertions(+), 2 deletions(-)

diff --git a/docs/changelog.txt b/docs/changelog.txt
index a777b60c4..4dd8404ac 100644
--- a/docs/changelog.txt
+++ b/docs/changelog.txt
@@ -42,6 +42,7 @@ changelog.txt uses a syntax similar to RST, with a few special sequences:
 
 ## Misc Improvements
 - `confirm`: added a confirmation dialog for removing manager orders
+- `confirm`: allow players to pause the confirmation dialog until they exit the current screen
 - `dfhack-examples-guide`: refine food preparation orders and fix conditions for making jugs and pots in the ``basic`` manager orders
 
 ## Documentation
diff --git a/plugins/confirm.cpp b/plugins/confirm.cpp
index 6a2798cb4..60735ef94 100644
--- a/plugins/confirm.cpp
+++ b/plugins/confirm.cpp
@@ -17,6 +17,7 @@
 #include "df/building_tradedepotst.h"
 #include "df/general_ref.h"
 #include "df/general_ref_contained_in_itemst.h"
+#include "df/interfacest.h"
 #include "df/viewscreen_dwarfmodest.h"
 #include "df/viewscreen_jobmanagementst.h"
 #include "df/viewscreen_justicest.h"
@@ -44,6 +45,12 @@ static map<string, conf_wrapper*> confirmations;
 string active_id;
 queue<string> cmds;
 
+// true when confirm is paused
+bool paused = false;
+// if set, confirm will unpause when this screen is no longer on the stack
+df::viewscreen *paused_screen = NULL;
+
+
 template <typename VT, typename FT>
 inline bool in_vector (std::vector<VT> &vec, FT item)
 {
@@ -229,6 +236,18 @@ namespace conf_lua {
                 lua_pushnil(L);
             return 1;
         }
+        int unpause(lua_State *)
+        {
+            Core::getInstance().print("unpausing\n");
+            paused = false;
+            paused_screen = NULL;
+            return 0;
+        }
+        int get_paused (lua_State *L)
+        {
+            Lua::Push(L, paused);
+            return 1;
+        }
     }
 }
 
@@ -247,6 +266,8 @@ DFHACK_PLUGIN_LUA_COMMANDS {
     CONF_LUA_CMD(get_ids),
     CONF_LUA_CMD(get_conf_data),
     CONF_LUA_CMD(get_active_id),
+    CONF_LUA_CMD(unpause),
+    CONF_LUA_CMD(get_paused),
     DFHACK_LUA_END
 };
 
@@ -281,7 +302,15 @@ public:
         return true;
     }
     bool feed (ikey_set *input) {
-        if (state == INACTIVE)
+        if (paused)
+        {
+            // we can only detect that we've left the screen by intercepting the
+            // ESC key
+            if (!paused_screen && input->count(df::interface_key::LEAVESCREEN))
+                conf_lua::api::unpause(NULL);
+            return false;
+        }
+        else if (state == INACTIVE)
         {
             for (df::interface_key key : *input)
             {
@@ -302,6 +331,18 @@ public:
                 set_state(INACTIVE);
             else if (input->count(df::interface_key::SELECT))
                 set_state(SELECTED);
+            else if (input->count(df::interface_key::CUSTOM_P))
+            {
+                Core::getInstance().print("pausing\n");
+                paused = true;
+                // only record the screen when we're not at the top viewscreen
+                // since this screen will *always* be on the stack. for
+                // dwarfmode screens, use ESC detection to discover when to
+                // unpause
+                if (!df::viewscreen_dwarfmodest::_identity.is_instance(screen))
+                    paused_screen = screen;
+                set_state(INACTIVE);
+            }
             else if (input->count(df::interface_key::CUSTOM_S))
                 show_options();
             return true;
@@ -316,6 +357,8 @@ public:
     }
     void render() {
         static vector<string> lines;
+        static const std::string pause_message =
+               "Pause confirmations until you exit this screen";
         Screen::Pen corner_ul = Screen::Pen((char)201, COLOR_GREY, COLOR_BLACK);
         Screen::Pen corner_ur = Screen::Pen((char)187, COLOR_GREY, COLOR_BLACK);
         Screen::Pen corner_dl = Screen::Pen((char)200, COLOR_GREY, COLOR_BLACK);
@@ -329,7 +372,9 @@ public:
             for (string line : lines)
                 max_length = std::max(max_length, line.size());
             int width = max_length + 4;
-            int height = lines.size() + 4;
+            vector<string> pause_message_lines;
+            word_wrap(&pause_message_lines, pause_message, max_length - 3);
+            int height = lines.size() + pause_message_lines.size() + 5;
             int x1 = (gps->dimx / 2) - (width / 2);
             int x2 = x1 + width - 1;
             int y1 = (gps->dimy / 2) - (height / 2);
@@ -368,6 +413,14 @@ public:
             {
                 Screen::paintString(Screen::Pen(' ', get_color(), COLOR_BLACK), x1 + 2, y1 + 2 + i, lines[i]);
             }
+            y = y1 + 3 + lines.size();
+            for (size_t i = 0; i < pause_message_lines.size(); i++)
+            {
+                Screen::paintString(Screen::Pen(' ', COLOR_WHITE, COLOR_BLACK), x1 + 5, y + i, pause_message_lines[i]);
+            }
+            x = x1 + 2;
+            OutputString(COLOR_LIGHTRED, x, y, Screen::getKeyDisplay(df::interface_key::CUSTOM_P));
+            OutputString(COLOR_WHITE, x, y, ":");
         }
         else if (state == SELECTED)
         {
@@ -533,6 +586,22 @@ DFhackCExport command_result plugin_shutdown (color_ostream &out)
     return CR_OK;
 }
 
+static bool screen_found(df::viewscreen *target_screen)
+{
+    if (!df::global::gview)
+        return false;
+
+    df::viewscreen *screen = &df::global::gview->view;
+    while (screen)
+    {
+        if (screen == target_screen)
+            return true;
+        screen = screen->child;
+    }
+
+    return false;
+}
+
 DFhackCExport command_result plugin_onupdate (color_ostream &out)
 {
     while (!cmds.empty())
@@ -540,6 +609,11 @@ DFhackCExport command_result plugin_onupdate (color_ostream &out)
         Core::getInstance().runCommand(out, cmds.front());
         cmds.pop();
     }
+
+    // if the screen that we paused on is no longer on the stack, unpause
+    if (paused_screen && !screen_found(paused_screen))
+        conf_lua::api::unpause(NULL);
+
     return CR_OK;
 }
 

From 44d3a41f7978768d80eff5823a7a7005dc19ebdc Mon Sep 17 00:00:00 2001
From: DFHack-Urist via GitHub Actions
 <63161697+DFHack-Urist@users.noreply.github.com>
Date: Thu, 2 Jun 2022 20:19:21 +0000
Subject: [PATCH 081/854] Auto-update submodules

scripts: master
---
 scripts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts b/scripts
index 1b1a28fa6..749208409 160000
--- a/scripts
+++ b/scripts
@@ -1 +1 @@
-Subproject commit 1b1a28fa64bdaf17da8e6257f48deafd74dfd149
+Subproject commit 749208409d909973de87e7f3edd7eccc824e52ed

From 206944a00dc6378abbd1fc37bacb9c649e65d66e Mon Sep 17 00:00:00 2001
From: DFHack-Urist via GitHub Actions
 <63161697+DFHack-Urist@users.noreply.github.com>
Date: Thu, 2 Jun 2022 22:41:46 +0000
Subject: [PATCH 082/854] Auto-update submodules

scripts: master
---
 scripts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts b/scripts
index 749208409..b70dec06c 160000
--- a/scripts
+++ b/scripts
@@ -1 +1 @@
-Subproject commit 749208409d909973de87e7f3edd7eccc824e52ed
+Subproject commit b70dec06ca2a8622bce6cdece7153852356591f2

From ea44be9b9470e36f8e637c19b026e1c431637edc Mon Sep 17 00:00:00 2001
From: Myk <myk002@yahoo.com>
Date: Thu, 2 Jun 2022 15:50:17 -0700
Subject: [PATCH 083/854] Enable fortress tests in CI (#2153)

* download and cache the test save along with df

Depends on us actually putting the test save on files.dfhack.org

* run fortress tests in run-tests.py

* use google drive link for now

* make the save directory before extracting to it
---
 ci/download-df.sh | 33 +++++++++++++++++++++------------
 ci/run-tests.py   |  2 +-
 2 files changed, 22 insertions(+), 13 deletions(-)

diff --git a/ci/download-df.sh b/ci/download-df.sh
index 49dcedea7..2fd095c1d 100755
--- a/ci/download-df.sh
+++ b/ci/download-df.sh
@@ -2,7 +2,8 @@
 
 set -e
 
-tardest="df.tar.bz2"
+df_tardest="df.tar.bz2"
+save_tardest="test_save.tgz"
 
 selfmd5=$(openssl md5 < "$0")
 echo $selfmd5
@@ -16,40 +17,48 @@ cd "$DF_FOLDER/.."
 
 if [ -f receipt ]; then
     if [ "$selfmd5" != "$(cat receipt)" ]; then
-        echo "download-df.sh changed; removing DF"
+        echo "download-df.sh changed; re-downloading tarballs"
         rm receipt
     else
-        echo "Already downloaded $DF_VERSION"
+        echo "Already downloaded $DF_VERSION tarballs"
     fi
 fi
 
 if [ ! -f receipt ]; then
-    rm -f "$tardest"
+    rm -f "$df_tardest" "$save_tardest"
     minor=$(echo "$DF_VERSION" | cut -d. -f2)
     patch=$(echo "$DF_VERSION" | cut -d. -f3)
-    url="http://www.bay12games.com/dwarves/df_${minor}_${patch}_linux.tar.bz2"
-    echo Downloading
+    echo "Downloading DF $DF_VERSION"
     while read url; do
         echo "Attempting download: ${url}"
-        if wget -v "$url" -O "$tardest"; then
+        if wget -v "$url" -O "$df_tardest"; then
             break
         fi
     done <<URLS
     https://www.bay12games.com/dwarves/df_${minor}_${patch}_linux.tar.bz2
     https://files.dfhack.org/DF/0.${minor}.${patch}/df_${minor}_${patch}_linux.tar.bz2
 URLS
-    echo $tardest
-    if ! test -f "$tardest"; then
-        echo "DF failed to download: $tardest not found"
+    echo $df_tardest
+    if ! test -f "$df_tardest"; then
+        echo "DF failed to download: $df_tardest not found"
         exit 1
     fi
+    echo "Downloading test save"
+    #test_save_url="https://files.dfhack.org/DF/0.${minor}.${patch}/test_save.tgz"
+    test_save_url="https://drive.google.com/uc?export=download&id=1XvYngl-DFONiZ9SD9OC4B2Ooecu8rPFz"
+    if ! wget -v "$test_save_url" -O "$save_tardest"; then
+        echo "failed to download test save"
+        exit 1
+    fi
+    echo $save_tardest
 fi
 
 rm -rf df_linux
-mkdir df_linux
+mkdir -p df_linux/data/save
 
 echo Extracting
-tar xf "$tardest" --strip-components=1 -C df_linux
+tar xf "$df_tardest" --strip-components=1 -C df_linux
+tar xf "$save_tardest" -C df_linux/data/save
 echo Done
 
 echo "$selfmd5" > receipt
diff --git a/ci/run-tests.py b/ci/run-tests.py
index 11534b3f9..be2a02b3f 100755
--- a/ci/run-tests.py
+++ b/ci/run-tests.py
@@ -73,7 +73,7 @@ with open(test_init_file, 'w') as f:
     f.write('''
     devel/dump-rpc dfhack-rpc.txt
     :lua dfhack.internal.addScriptPath(dfhack.getHackPath())
-    test --resume --modes=none,title "lua scr.breakdown_level=df.interface_breakdown_types.%s"
+    test --resume -- lua scr.breakdown_level=df.interface_breakdown_types.%s
     ''' % ('NONE' if args.no_quit else 'QUIT'))
 
 test_config_file = 'test_config.json'

From ed2ba697138d5807d370b6a94a45a4834cf4602f Mon Sep 17 00:00:00 2001
From: Myk <myk002@yahoo.com>
Date: Thu, 2 Jun 2022 15:51:45 -0700
Subject: [PATCH 084/854] Improvements to dreamfort, quickfort keystroke
 aliases, and example orders (#2162)

* add alt-f as a hotkey for quickfort

to mimic the existing windows hotkey for the old quickfort
hopefully this will ease the transition from the old quickfort to the
new

* add and document new quickfort aliases

* reduce quantity requirement for dyeing

15 is just too high. the counter counts bags, not units

* dreamfort blueprint improvements

most of these suggested by ldog on the forums. Thanks!
- significantly extend the list of hostile creatures that get stashed in the prisoner quantum stockpile
- send adamantine thread to the metalworker stockpiles
- give from thread/cloth stockpiles to clothier, loom, and dyer to protect the adamantine thread
- automatically create tavern, library, and temple locations (restricted to residents only by default)
- automatically associate the rented rooms with the tavern
- place a stockpile under the dump zone so you can set up stockpile links for dumped items
- doc improvements. in particular, point people to the new assign-minecarts tool for assigning minecarts to quantum stockpile dumps

* update changelog

* fix typo in cloth stockpile settings

* fix typo in guildhall location setup

* don't restrict stockpiles for clothiers and dyers

* deprecate jugs alias and add stone|woodentools

* remove dye thread, make jugs wooden

remove dye thread to protect adamantine
make jugs wooden to differentiate them from scroll rollers. that gives
us a chance to actually have a usable jugs-only stockpile

* dreamfort improvements

- move trap corridor gates and levers before the walls and traps so they get
  constructed first
- give useful names to the craftsdwarf's workshops
- redesign the services level to:
  - fit better in a 1x1 embark
  - add doors to the hospital recovery rooms to protect from
    werebeasts-to-be
  - add an interrogation room (sheriff's office) next to the jail

* shape hospital zone to exactly the hospital area

* don't clutter the hospital with statues

* update changelog
---
 data/blueprints/library/dreamfort.csv | 1157 ++++++++++++++-----------
 data/examples/orders/basic.json       |  106 +--
 data/quickfort/aliases-common.txt     |   37 +-
 dfhack.init-example                   |    1 +
 docs/changelog.txt                    |   11 +-
 docs/guides/quickfort-alias-guide.rst |   42 +-
 docs/guides/quickfort-user-guide.rst  |   13 +-
 7 files changed, 735 insertions(+), 632 deletions(-)

diff --git a/data/blueprints/library/dreamfort.csv b/data/blueprints/library/dreamfort.csv
index 07aeb09a0..9ac0f58d2 100644
--- a/data/blueprints/library/dreamfort.csv
+++ b/data/blueprints/library/dreamfort.csv
@@ -59,8 +59,7 @@ quickfort run library/dreamfort.csv -n /setup,# Run before making any manual adj
 "quickfort orders library/dreamfort.csv -n ""/surface2, /farming2, /surface3, /farming3, /industry2, /surface4""","# Queue up orders required to get the fort minimally functional and secure. You can remove the order for the anvil (you brought one with you, right?)."
 ""
 -- Find a good starting spot on the surface --
-quickfort run library/dreamfort.csv -n /perimeter,# Run at embark.
-quickfort undo library/dreamfort.csv -n /perimeter,# Clean up after you find your center tile.
+gui/quickfort library/dreamfort.csv -n /perimeter,# Run at embark. Don't actually apply the blueprint. Just use the preview shadow to find a good spot on the surface.
 ""
 -- Dig  --
 quickfort run library/dreamfort.csv -n /surface1,# Run when you find your center tile.
@@ -91,14 +90,14 @@ orders import furnace,# Automated production of basic furnace-related items. Don
 "quickfort run,orders library/dreamfort.csv -n /suites2",# Run when the suites level has been dug out.
 "quickfort run,orders library/dreamfort.csv -n /surface8","# Run if/when you need longer trap corridors on the surface for larger sieges, anytime after you run /surface7."
 "quickfort run,orders library/dreamfort.csv -n /apartments2",# Run when the first apartment level has been dug out.
-"quickfort run,orders library/dreamfort.csv -n /apartments3",# Run when all beds have been constructed on the first apartments level.
 "quickfort run,orders library/dreamfort.csv -n /services3","# Run after the dining table and chair, weapon rack, and archery targets have been constructed. Also wait until after you complete /surface7, though, because surface defenses are more important than a grand dining hall."
 "quickfort run,orders library/dreamfort.csv -n /guildhall2",# Run when the guildhall level has been dug out.
-"quickfort run,orders library/dreamfort.csv -n /guildhall3",# Optionally run after /guildhall2 to build default furnishings.
+"quickfort run,orders library/dreamfort.csv -n ""/guildhall3, /guildhall4""",# Optionally run after /guildhall2 to build default furnishings and declare a library and temple.
+"quickfort run,orders library/dreamfort.csv -n /apartments3",# Run when all beds have been constructed on the first apartments level.
 "quickfort run,orders library/dreamfort.csv -n /farming4",# Run once you have a cache of potash.
 orders import military,# Automated production of military equipment. Turn on automelt in the meltables piles on the industry level to automatically upgrade all metal military equipment to masterwork quality. These orders are optional if you are not using a military.
 orders import smelting,# Automated production of all types of metal bars.
-"quickfort run,orders library/dreamfort.csv -n /services4","# Run when you need a jail and/or fancy statues in the dining room, anytime after the restraints are placed from /services3."
+"quickfort run,orders library/dreamfort.csv -n /services4","# Run when you need a jail, anytime after the restraints are placed from /services3."
 orders import rockstock,# Maintains a small stock of all types of rock furniture.
 orders import glassstock,# Maintains a small stock of all types of glass furniture and parts (only import if you have sand).
 ""
@@ -326,7 +325,7 @@ Here are some tips and procedures for handling seiges -- including how to clean
 ""
 "- Hauler dwarves will come and release prisoners one by one. Your military dwarves will immediately pounce on the released prisoner and chop them to bits, saving the hauler dwarves from being attacked. Repeat until all prisoners have been ""processed""."
 ""
-"Only types of creatures that you commonly see in sieges are accepted by the prisoner hauling route by default. You can add additional creature types by configuring the hauling route stop in the 'h' menu. Note that generated creature types, like necromancer experiments, can't be explicitly added. You have to (at least temporarily) accept all animals to include them."
+"Only common hostile creatures are accepted by the prisoner hauling route by default. You can add additional creature types by configuring the hauling route stop in the 'h' menu. Note that generated creature types, like necromancer experiments, can't be explicitly added. You have to (at least temporarily) accept all animals to include them."
 #meta label(perimeter) start(central stairs) message(Run quickfort undo on this blueprint to clean up.) show the eventual perimeter of the surface fort; useful for location scouting
 walls/surface_walls
 corridor/surface_corridor
@@ -383,6 +382,7 @@ roof3/surface_roof3
 roof4/surface_roof4
 ""
 #meta label(surface8) start(central stairs) message(Remember to enqueue manager orders for this blueprint.) build extended trap corridors
+corridor_gates/surface_corridor_gates
 corridor/surface_corridor
 corridor_traps/surface_corridor_traps
 query_corridor/surface_query_corridor
@@ -944,10 +944,9 @@ Remember to connect the levers to the gates once they are built.) gates, barrack
 ,,,,,,,,,,,,,,,gw,gw,gw,gw,gw,gw,gw
 
 #aliases
-permit_prisoner: {animalsprefix}{Right}s{search}&&^
-prisoner_route_enable: {enableanimals}{cages}{permittraps}{permit_prisoner search=dwarves}{permit_prisoner search=elves}{permit_prisoner search=humans}{permit_prisoner search=giants}{permit_prisoner search=goblins}{permit_prisoner search=ettins}{permit_prisoner search=cyclopes}
+"prisoner_route_enable: {enableanimals}{cages}{permittraps}{animalsprefix}{Right}{permitsearch search="" men""}{permitsearch search=dwarves}{permitsearch search=elves}{permitsearch search=humans}{permitsearch search=kobolds}{permitsearch search=gremlins}{permitsearch search=giants}{permitsearch search=goblins}{permitsearch search=ettins}{permitsearch search=cyclopes}{permitsearch search=ogres}{permitsearch search=eyes}{permitsearch search=reachers}{permitsearch search=gorlaks}{permitsearch search=trolls}{permitsearch search=minotaurs}^"
 
-"#query label(surface_query) start(19; 19) hidden() message(Remember to assign minecarts to the trade goods and prisoner processing quantum stockpiles.
+"#query label(surface_query) start(19; 19) hidden() message(Remember to assign minecarts to the trade goods and prisoner processing quantum stockpiles (run ""assign-minecarts all"").
 Feel free to adjust the configuration of the ""trade goods"" feeder stockpile so it accepts the item types you want to trade away. If those items types are also accepted by other stockpiles, configure those stockpiles to give to the ""trade goods"" stockpile.
 You might also want to set the ""trade goods quantum"" stockpile to Auto Trade if you have the autotrade DFHack plugin enabled.)"
 
@@ -975,8 +974,8 @@ You might also want to set the ""trade goods quantum"" stockpile to Auto Trade i
 ,,,`,,`,nocontainers,crafts,,,,,,,`,,,,"{givename name=""inner main gate""}",,,,`,,,,,,,,,`,,`
 ,,,`,,`,"{givename name=""trade goods""}",,,,,,,,,,,,,,,,,,,,,,,,,`,,`
 ,,,`,,`,{forbidmasterworkfinishedgoods}{forbidartifactfinishedgoods},,,,,,,,"{givename name=""trade depo gate""}",,,,,,,,"{givename name=""barracks gate""}",,,,,,,,,`,,`
-,,,`,,`,,"{quantumstopfromnorth name=""Trade Goods quantum""}",,,,,,,,,,,,,,,,,"{quantumstop name=""Prisoner quantum"" move={Up 5} move_back={Down 5} route_enable={prisoner_route_enable}}{givename name=""prisoner dumper""}",,,,,,,`,,`
-,,,`,,`,,"{quantum name=""trade goods quantum""}",,,,,,,`,,,,,,,,`,,"{quantum name=""prisoner quantum"" quantum_enable={enableanimals}}",,,,,,,`,,`
+,,,`,,`,,"{quantumstopfromnorth name=""Trade Goods quantum""}",,,,,,,,,,,,,,,,,"{quantumstop name=""Prisoner/Cage quantum"" move={Up 5} move_back={Down 5} route_enable={prisoner_route_enable}}{givename name=""prisoner/cage dumper""}",,,,,,,`,,`
+,,,`,,`,,"{quantum name=""trade goods quantum""}",,,,,,,`,,,,,,,,`,,"{quantum name=""prisoner/cage quantum"" quantum_enable={enableanimals}}",,,,,,,`,,`
 ,,,`,,`,`,`,`,`,`,`,`,`,`,,,,,,,,`,`,`,`,`,`,`,`,`,`,,`
 ,,,`,,"{givename name=""left outer gate""}",,,,,,,,,"{givename name=""left inner gate""}",,,,,,,,"{givename name=""right inner gate""}",,,,,,,,,"{givename name=""right outer gate""}",,`
 ,,,`,`,`,`,`,`,`,`,`,`,`,`,,,,"{givename name=""outer main gate""}",,,,`,`,`,`,`,`,`,`,`,`,`,`
@@ -1289,11 +1288,45 @@ t1(37x33)
 
 
 
-#build label(surface_corridor) start(19; 19) hidden() trap hallway walls
+#build label(surface_corridor_gates) start(19; 19) hidden() gates for the longer trap hallways
+
+
+,,,,gx,,,,,,,,,,,,,,,,,,,,,,,,,,,,gx
+,,,`,gx,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,gx,`
+,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
+,,,`,,`,`,`,`,`,`,`,`,`,`,`,`,,`,,`,`,`,`,`,`,`,`,`,`,`,`,,`
+,,,`,,`,,`,,,,,,,,`,,,,,,`,,,,,,,,,,`,,`
+,,,`,,`,,`,,,,,,,,,,`,`,`,,,,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,,`,Tl,`,`,`,Tl,`,,,,,,,,,,`,,`
+,,,`,,`,,`,,,,,,,,,,`,`,`,,,,,,,,,,,,`,,`
+,,,`,,`,,`,,,,,,,,`,,,,,,`,,,,,,,,,,`,,`
+,,,`,,`,`,`,`,`,`,`,,`,`,`,`,,`,,`,`,`,`,,`,`,`,`,`,`,`,,`
+,,,`,,`,,,,,,,,,`,,,,,,,,`,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,`,,,,,,,,`,,,,,,,,,`,,`
+,,,`,,`,`,`,`,`,`,`,`,`,`,,,,,,,,`,`,`,`,`,`,`,`,`,`,,`
+,,,`,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,`
+,,,`,`,`,`,`,`,`,`,`,`,`,`,,,,,,,,`,`,`,`,`,`,`,`,`,`,`,`
+
+
 
+#build label(surface_corridor) start(19; 19) hidden() longer trap hallway walls
 
 
-,,,Cw,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,,Cw
+,,,,~,,,,,,,,,,,,,,,,,,,,,,,,,,,,~
+,,,Cw,~,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,~,Cw
 ,,,Cw,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,Cw
 ,,,Cw,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,Cw
 ,,,Cw,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,Cw
@@ -1308,7 +1341,7 @@ t1(37x33)
 ,,,Cw,,`,`,`,`,`,`,`,`,`,`,`,`,,`,,`,`,`,`,`,`,`,`,`,`,`,`,,Cw
 ,,,Cw,,`,,`,,,,,,,,`,,,,,,`,,,,,,,,,,`,,Cw
 ,,,Cw,,`,,`,,,,,,,,,,`,`,`,,,,,,,,,,,,`,,Cw
-,,,Cw,,`,,,,,,,,,,`,,`,`,`,,`,,,,,,,,,,`,,Cw
+,,,Cw,,`,,,,,,,,,,`,~,`,`,`,~,`,,,,,,,,,,`,,Cw
 ,,,Cw,,`,,`,,,,,,,,,,`,`,`,,,,,,,,,,,,`,,Cw
 ,,,Cw,,`,,`,,,,,,,,`,,,,,,`,,,,,,,,,,`,,Cw
 ,,,Cw,,`,`,`,`,`,`,`,,`,`,`,`,,`,,`,`,`,`,,`,`,`,`,`,`,`,,Cw
@@ -1357,11 +1390,11 @@ t1(37x33)
 
 
 
-"#build label(surface_corridor_traps) start(19; 19) hidden() barracks, longer trap hallways, and outer levers/gates"
+#build label(surface_corridor_traps) start(19; 19) hidden() traps for the longer trap hallways
 
 
-,,,,gx,,,,,,,,,,,,,,,,,,,,,,,,,,,,gx
-,,,`,gx,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,gx,`
+,,,,~,,,,,,,,,,,,,,,,,,,,,,,,,,,,~
+,,,`,~,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,~,`
 ,,,`,Tc,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,Tc,`
 ,,,`,Tc,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,Tc,`
 ,,,`,Tc,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,Tc,`
@@ -1376,7 +1409,7 @@ t1(37x33)
 ,,,`,Tc,`,`,`,`,`,`,`,`,`,`,`,`,,`,,`,`,`,`,`,`,`,`,`,`,`,`,Tc,`
 ,,,`,Tc,`,,`,,,,,,,,`,,,,,,`,,,,,,,,,,`,Tc,`
 ,,,`,Tc,`,,`,,,,,,,,,,`,`,`,,,,,,,,,,,,`,Tc,`
-,,,`,Tc,`,,,,,,,,,,`,Tl,`,`,`,Tl,`,,,,,,,,,,`,Tc,`
+,,,`,Tc,`,,,,,,,,,,`,~,`,`,`,~,`,,,,,,,,,,`,Tc,`
 ,,,`,Tc,`,,`,,,,,,,,,,`,`,`,,,,,,,,,,,,`,Tc,`
 ,,,`,Tc,`,,`,,,,,,,,`,,,,,,`,,,,,,,,,,`,Tc,`
 ,,,`,Tc,`,`,`,`,`,`,`,,`,`,`,`,,`,,`,`,`,`,,`,`,`,`,`,`,`,Tc,`
@@ -1449,7 +1482,7 @@ Workshops:
 ""
 Manual steps you have to take:
 - Check to make sure the lower office is assigned to your manager and assign the upper office to your bookkeeper (if different from your manager)
-- Assign a minecart to your refuse quantum stockpile hauling route
+"- Assign a minecart to your refuse quantum stockpile hauling route (you can run ""assign-minecarts all"" at the DFHack prompt to do this)"
 "- If the industry level is already built, configure the jugs, pots, and bags stockpiles to take from the ""Goods"" quantum stockpile (the one on the left) on the industry level"
 ""
 Farming Walkthrough:
@@ -1572,7 +1605,7 @@ build3/farming_build3
 
 
 "#query label(farming_query_stockpiles) start(16; 18) hidden() message(remember to:
-- assign a minecart to the refuse quantum stockpile
+- assign a minecart to the refuse quantum stockpile (run ""assign-minecarts all"")
 - if the industry level is already built, configure the jugs, pots, and bags stockpiles to take from the ""Goods"" quantum stockpile on the industry level) config stockpiles"
 
 
@@ -1588,7 +1621,7 @@ build3/farming_build3
 ,,,,,,`,`,`,"{givename name=""pots""}",,`,,seeds,nocontainers,"{givename name=""seeds feeder""}",give2up,`,,`,,`,`,`
 ,,,bags,,,`,`,`,`,,`,,`,`,`,`,`,,`
 ,,`,nocontainers,"{givename name=""bags""}",,`,`,`,`,,`,,`,`,`,`,`,,`,,`,`,`,,`,`,`
-,,`,jugs,,`,`,`,`,`,`,`,,,`,,`,,,`,`,`,`,`,`,`,`,`
+,,`,woodentools,,`,`,`,`,`,`,`,,,`,,`,,,`,`,`,`,`,`,`,`,`
 ,,,nocontainers,"{givename name=""jugs""}",,`,`,`,`,,`,`,`,`,`,`,`,`,`,,`,`,`,,`,`,`
 ,,,,`,,,`,,,,,,`,`,`,`,`,,,,,`,,,,`
 ,,plants,,,`,`,`,`,`,`,`,,`,`,~,`,`,,`,`,`,,,,,,,"{givename name=""cookable food""}"
@@ -1801,7 +1834,7 @@ Manual steps you have to take:
 ""
 Optional manual steps you can take:
 - Restrict the Mechanic's workshop to only allow skilled workers so unskilled trap-resetters won't be tasked to build mechanisms.
-"- Restrict the Craftsdwarf's workshops to only allow labors that take from the adjacent stockpiles. That is, only allow Woodcrafting for the Craftsdwarf's workshop on the left near the wood stockpile, Stonecrafting for the Craftsdwarf's workshop near the Mason's workshops, and Bonecrafting for one of the Craftsdwarf's workshop near the Clothier's workshop. The last Craftdwarf's workshop can hold all the remaining labors, or it can be a secondary workshop for a labor that you want more dwarves working on."
+"- Restrict the Craftsdwarf's workshops to only allow labors that take from the adjacent stockpiles. That is, only allow Woodcrafting for the Craftsdwarf's workshop on the left near the wood stockpile, Stonecrafting and Strand Extraction for the Craftsdwarf's workshop near the Mason's workshops, and Bonecrafting for one of the Craftsdwarf's workshop near the Clothier's workshop. The last Craftdwarf's workshop can hold all the remaining labors, or it can be a secondary workshop for a labor that you want more dwarves working on."
 "- To encourage your masons to concentrate on building blocks and other high-volume orders, it helps to set one of your Mason's workshops to service a maximum of 2 manager orders at a time."
 "- Once you have enough haulers, you can increase the rate of stone and ore hauling jobs by building more wheelbarrows and adding them to the stone and ore feeder stockpiles."
 "- If desired, set one or both stockpiles in the bottom left to auto-melt. This results in melting all weapons and armor that are inferior to masterwork. This is great for upgrading your military, but it takes a *lot* of fuel unless you have first replaced the forge and smelters with magma versions. If you enable automelt and you don't have magma forges and magma smelters, be sure to be in a heavily forested area, enable auto-chop, and keep your coal stocks high."
@@ -1912,13 +1945,13 @@ query/industry_query
 ,,w,`,`,`,`,`,`,`,`,`,`,`,`,~,~,~,~,~,`,`,`,`,`,`,`,`,`,`,`,`,`
 ,,w,`,`,`,`,`,`,`,`,`,`,`,`,e(5x1),,,~,~,`,`,`,`,`,`,`,`,`,`,`,`,`
 ,,w,`,`,`,`,`,`,`,`,`,`,`,,,`,,`,,,`,`,`,`,`,`,`,`,`,`,`,`
-,,w,`,`,`,`,`,`,w(2x5),,fg(3x3),,`,,`,`,`,`,`,,rhlS(5x5),,,~,~,`,`,`,`,`,`,`
+,,w,`,`,`,`,`,`,w(2x5),,fg(3x3),,`,,`,`,`,`,`,,frhlS(5x5),,,~,~,`,`,`,`,`,`,`
 ,,w,`,`,`,`,`,`,~,~,~,~,~,`,`,,,,`,`,~,~,~,~,~,`,`,`,`,`,`,`
 ,,`,`,`,`,`,c,`,~,~,~,~,~,,`,,`,,`,,~,~,~,~,~,`,r,`,`,`,`,`
 ,,f3,`,`,`,`,`,`,~,~,u2(3x2),~,~,`,`,,,,`,`,~,~,~,~,~,`,`,`,`,`,`,`
 ,,f3,`,`,`,`,`,`,~,~,~,~,~,,`,`,`,`,`,,~,~,~,~,~,`,`,`,`,`,`,`
 ,,f3,`,`,`,`,`,`,`,`,`,`,`,,,`,,`,,,`,`,`,`,`,`,`,`,`,`,`,`
-,,f3,`,`,`,`,`,`,`,`,`,`,`,`,bnpdz(5x3),,,,~,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,f3,`,`,`,`,`,`,`,`,`,`,`,`,bnpdhz(5x3),,,,~,`,`,`,`,`,`,`,`,`,`,`,`,`
 ,,f3,`,`,`,`,`,`,`,`,`,`,`,`,~,~,~,~,~,`,`,`,`,`,`,`,`,`,`,`,`,`
 ,,f3,`,`,`,`,`,`,`,`,`,`,`,`,~,~,~,~,~,`,`,`,`,`,`,`,`,`,`,`,`,`
 ,,,,pd(7x3),,,~,~,~,~,`,`,`,`,s2(5x2),,,~,~,`,`,`,`,`,`,`,`,`,`,`
@@ -1933,7 +1966,7 @@ query/industry_query
 
 
 "#query label(industry_query) start(18; 18) hidden() message(remember to:
-- assign minecarts to to your quantum stockpile hauling routes
+- assign minecarts to to your quantum stockpile hauling routes (use ""assign-minecarts all"")
 - if the farming level is already built, give from the ""Goods"" quantum stockpile to the jugs, pots, and bags stockpiles on the farming level
 - if you want to automatically melt goblinite and other low-quality weapons and armor, mark the south-east stockpiles for auto-melt
 - once you have enough dwarves, run ""orders import basic"" to automate your fort's basic needs (see /industry_help for more info on this file)
@@ -1945,7 +1978,7 @@ query/industry_query
 ,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,~,`,`,`,`,`,`,`,`,`,`,`,`,`
 ,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`
 ,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`
-,,,,`,`,`,`,`,`,`,`,`,~,`,`,`,"{quantum name=""stoneworker quantum""}g{Up 3}&",`,`,`,~,`,`,`,`,`,`,`,`,`
+,,,,`,`,`,`,`,`,`,`,`,"{givename name=""stone craftsdwarf""}",`,`,`,"{quantum name=""stoneworker quantum""}g{Up 3}&",`,`,`,~,`,`,`,`,`,`,`,`,`
 ,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,"{quantumstop name=""Stoneworker quantum"" sp_links=""{sp_link move={Down} move_back={Up}}{sp_link move=""""{Down 5}"""" move_back=""""{Up 5}""""}""}{givename name=""stoneworker dumper""}",`,`,`,`,`,`,`,`,~,`,`,`,`
 ,,,,`,`,~,`,`,~,`,`,`,`,`,otherstone,,,,~,`,`,`,`,`,`,`,`,`,`,`
 ,,,,`,`,`,`,`,`,`,`,`,~,`,"{givename name=""stone feeder""}",~,~,~,~,`,~,`,`,`,`,`,`,`,`,`
@@ -1954,13 +1987,13 @@ query/industry_query
 ,,~,`,~,`,`,~,`,`,~,`,`,`,`,nocontainers,"{givename name=""gem feeder""}",~,~,~,`,`,`,`,~,`,`,~,`,`,~,`,`
 ,,~,`,`,`,`,`,`,`,`,`,`,`,,,`,,`,,,`,`,`,`,`,`,`,`,`,`,`,`
 ,,~,`,`,`,`,`,`,"{givename name=""wood feeder""}",~,"{givename name=""goods feeder""}",nocontainers,~,,`,`,`,`,`,,craftrefuse,,,,~,`,`,`,`,`,`,`
-,,t{Right 5}{Down}&,`,`,`,`,`,`,~,~,{tallow}{permitdye}{permitwax},~,~,`,`,,,,`,`,"{givename name=""cloth/bones feeder""}",~,~,~,~,`,`,`,`,`,`,`
-,,`,`,~,`,`,"{quantum name=""goods/wood quantum""}g{Up 13}{Right 10}&","{quantumstop name=""Goods/Wood quantum"" sp_links=""{sp_link move={Right} move_back={Left}}{sp_link move=""""{Right 5}"""" move_back=""""{Left 5}""""}{sp_link move=""""{Down}{Right 5}"""" move_back=""""{Left 5}{Up}""""}""}{givename name=""goods/wood dumper""}",~,~,{forbidcrafts}{forbidgoblets},~,~,,`,,`,,`,,nocontainers,~,~,~,~,"{quantumstopfromwest name=""Clothier/Bones quantum""}{givename name=""cloth/bones dumper""}","{quantum name=""cloth/bones quantum""}",`,`,~,`,`
-,,miscliquid,`,`,`,`,`,`,~,~,"{givename name=""furniture feeder""}",~,~,`,`,,,,`,`,~,~,~,~,~,`,`,`,`,`,`,`
-,,"{givename name=""miscliquid""}",`,`,`,`,`,`,~,~,forbidsand,~,~,,`,`,`,`,`,,~,~,~,~,~,`,`,`,`,`,`,`
+,,t{Right 5}{Down}&,`,`,`,`,`,`,~,~,{tallow}{permitwax},~,~,`,`,,,,`,`,"{givename name=""cloth/bones feeder""}",g{Up 3}{Right 5}&,~,~,~,`,`,`,`,`,`,`
+,,`,`,~,`,`,"{quantum name=""goods/wood quantum""}g{Up 13}{Right 10}&","{quantumstop name=""Goods/Wood quantum"" sp_links=""{sp_link move={Right} move_back={Left}}{sp_link move=""""{Right 5}"""" move_back=""""{Left 5}""""}{sp_link move=""""{Down}{Right 5}"""" move_back=""""{Left 5}{Up}""""}""}{givename name=""goods/wood dumper""}",~,~,{forbidcrafts}{forbidgoblets},~,~,,`,,`,,`,,nocontainers,~,~,~,~,"{quantumstopfromwest name=""Clothier/Bones quantum""}{givename name=""cloth/bones dumper""}","{quantum name=""cloth/bones quantum""}g{Up 4}&",`,`,~,`,`
+,,miscliquid,`,`,`,`,`,`,~,~,"{givename name=""furniture feeder""}",~,~,`,`,,,,`,`,forbidadamantinethread,~,~,~,~,`,`,`,`,`,`,`
+,,"{givename name=""miscliquid""}",`,`,`,`,`,`,~,~,forbidsand,~,~,,`,`,`,`,`,,dye,~,~,~,~,`,`,`,`,`,`,`
 ,,~,`,`,`,`,`,`,`,`,`,`,`,,,`,,`,,,`,`,`,`,`,`,`,`,`,`,`,`
-,,~,`,~,`,`,~,`,`,~,`,`,`,`,forbidpotash,nocontainers,"{givename name=""bar/military feeder""}",~,~,`,`,`,`,~,`,`,~,`,`,`,`,`
-,,~,`,`,`,`,`,`,`,`,`,`,`,`,~,~,~,~,~,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,~,`,"{givename name=""wood craftsdwarf""}",`,`,~,`,`,~,`,`,`,`,forbidpotash,nocontainers,"{givename name=""bar/military feeder""}",~,~,`,`,`,`,"{givename name=""misc craftsdwarf""}",`,`,"{givename name=""bone craftsdwarf""}",`,`,`,`,`
+,,~,`,`,`,`,`,`,`,`,`,`,`,`,adamantinethread,~,~,~,~,`,`,`,`,`,`,`,`,`,`,`,`,`
 ,,~,`,`,`,`,`,`,`,`,`,`,`,`,~,~,~,~,~,`,`,`,`,`,`,`,`,`,`,`,`,`
 ,,,,nocontainers,t{Right 12}{Up 3}&,t{Right 11}{Down 3}&,"{givename name=""meltable steel/brnze""}",,,,`,`,~,`,forbidotherstone,,,,,`,~,`,`,`,`,`,`,`,`,`
 ,,,,{bronzeweapons}{permitsteelweapons}{forbidmasterworkweapons}{forbidartifactweapons},,,,,,,`,`,`,`,"{givename name=""ore/clay feeder""}",~,~,~,~,`,`,`,`,`,`,`,`,`,`,`
@@ -1978,7 +2011,7 @@ query/industry_query
 Screenshot: https://drive.google.com/file/d/13vDIkTVOZGkM84tYf4O5nmRs4VZdE1gh
 ""
 Features:
-- Spacious dining room (also usable as a tavern)
+- Spacious dining room/tavern (tavern is restricted to residents-only by default)
 - Prepared food and drink stockpiles
 - Well cistern system (bring your own water)
 - Hospital with a well for washing
@@ -1988,9 +2021,10 @@ Features:
 Note the hospital also has animal training enabled so it can be used with the dwarfvet plugin if it's enabled.
 ""
 Manual steps you have to take:
-"- If you want to declare the dining room as a tavern, the bedrooms at the top can be assigned to the tavern as rented rooms."
+"- If you want to tavern to attract visitors, change the restriction in the (l)ocation menu."
 "- Fill the cisterns with water, either with a bucket brigade or by plumbing flowing water. Fill so that there are two z-levels of 7-depth water to prevent muddiness. If you want to fill with buckets, designate a pond zone on the level below the main floor. If you feel adventurous and are experienced with water pressure, you can instead route (depressurized!) water to the second-to-bottom level (the one above the up staircases)."
-"- If you are filling the wells with a bucket brigade and at least one well is already constructed, you'll run into issues with the dwarves stealing water from the wells to fill the wells. Temporarily deconstruct the wells or temporarily build grates beneath the wells to block the buckets to avoid this issue. Remember to rebuild the wells or remove the grates afterwards, though!"
+"- If you are filling the wells with a bucket brigade and at least one well is already constructed, you'll run into issues with the dwarves stealing water from one well to fill another. Temporarily deconstruct the wells or temporarily build grates beneath the wells to block the buckets to avoid this issue. Remember to rebuild the wells or remove the grates afterwards, though!"
+- Assign the office to the right of the barracks to your Sheriff/Captain of the Guard to use it as an interrogation room.
 ""
 Services Walkthrough:
 1) Start this level when your fort grows to about 50 dwarves so everyone has a place to eat.
@@ -1999,82 +2033,78 @@ Services Walkthrough:
 ""
 "3) Once the area is dug out, set up important furniture, stockpiles, hospital zone and garbage dump zone with /services2. Run ""quickfort orders"" for /services2."
 ""
-"4) When the table and chair have been placed in the dining room and the weapon rack and archery targets have been constructed in the barracks, run /services3 to build the rest of the furniture and configure your dining room and barracks. Run ""quickfort orders"" for /services3."
+"4) When the table and chair have been placed in the dining room, the beds are placed in the rented rooms, and the weapon rack and archery targets are constructed in the barracks, run /services3 to build the rest of the furniture and configure your dining room/tavern and barracks. Run ""quickfort orders"" for /services3."
 ""
 5) Fill the wells with either bucket brigades or by carefully routing flowing water.
 ""
-"6) When your fort is mature enough to need jail cells, run /services4 to set those up -- anytime after the restraints are built in the jail cell block. You also get some decorative statues to increase the value of your dining hall. Run ""quickfort orders"" for /services4."
-"#dig label(services1) start(23; 22; central stairs) message(Once the area is dug out, continue with /services2.)"
-
-
-,,,,d,d,d,,,d,d,d,,,d,d,d
-,,,,d,d,d,,,d,d,d,,,d,d,d
-,,,,d,d,d,,,d,d,d,,,d,d,d
-,,,,,d,,,,,d,,,,,d
-,,,,d,d,d,d,d,d,d,d,d,d,d,d,d,,d,h,d,,j,,d,h,d
-,,,,d,d,d,d,d,d,d,d,d,d,d,d,d,,d,d,d,d,d,d,d,d,d
-,,,,d,d,d,d,d,d,d,d,d,d,d,d,d,,d,d,d,,d,,d,d,d
-,,,,d,d,d,d,d,d,d,d,d,d,d,d,d,,,,,,d
-,,,,d,d,d,d,d,d,d,d,d,d,d,d,d,,d,h,d,,d,,d,h,d
-,,,,d,d,d,d,d,d,d,d,d,d,d,d,d,,d,d,d,d,d,d,d,d,d
-,,,,d,d,d,d,d,d,d,d,d,d,d,d,d,,d,d,d,,d,,d,d,d
-,,,,d,d,d,d,d,d,d,d,d,d,d,d,d,,,,,,d
-,,,,d,d,d,d,d,d,d,d,d,d,d,d,d,,d,d,d,d,d,d,d,d,d
-,,,,d,d,d,d,d,d,d,d,d,d,d,d,d,,d,d,d,d,d,d,d,d,d
-,,,,d,d,d,d,d,d,d,d,d,d,d,d,d,,d,d,d,d,d,d,d,d,d,,d,d,d,d,d,d,d,d,d
-,,,,d,d,d,d,d,d,d,d,d,d,d,d,d,,d,d,d,d,d,d,d,d,d,,d,d,d,d,d,d,d,d,d
-,,,,d,d,d,d,d,d,d,d,d,d,d,d,d,,,,,d,,d,,,,,d,d,d,d,d,d,d,d,d
-,,,,d,d,d,d,d,d,d,d,d,d,d,d,d,,,,d,d,d,d,d,,,,d,d,d,d,d,d,d,d,d
-,,,,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,`,`,`,d,d,d,d,d,d,d,d,d,d,d,d,d
-,,,,d,d,d,d,d,d,d,d,d,d,d,d,d,,d,,d,`,`,`,d,,d,,d,d,d,d,h,d,d,d,d
-,,,,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,`,`,`,d,d,d,d,d,d,d,d,d,d,d,d,d
-,,,,d,d,d,d,d,d,d,d,d,d,d,d,d,,,,d,d,d,d,d,,,,d,d,d,d,d,d,d,d,d
-,,,,d,d,d,d,d,d,d,d,d,d,d,d,d,,,,,,d,,,,,,d,d,d,d,d,d,d,d,d
-,,,,,,,,d,d,,d,d,,,,,,,,,,,,,,,,d,d,d,d,d,d,d,d,d
-,,,,d,d,d,d,d,d,,d,d,d,d,d,d,,,,,,,,,,,,d,d,d,d,d,d,d,d,d
-,,,,d,d,d,d,d,d,,d,d,d,d,d,d
-,,,,d,d,d,d,d,d,,d,d,d,d,d,d
-,,,,d,d,d,d,d,d,,d,d,d,d,d,d
-,,,,d,d,d,d,d,d,,d,d,d,d,d,d
-#>
-
-
-
-
-
-
-,,,,,,,,,,,,,,,,,,j5,h5,j,,u,,j,h5,j5
-,,,,,,,,,,,,,,,,,,5,5,5,5,d,5,5,5,5
-,,,,,,,,,,,,,,,,,,,,,,d
-,,,,,,,,,,,,,,,,,,,,,,d
-,,,,,,,,,,,,,,,,,,j5,h5,j,,d,,j,h5,j5
-,,,,,,,,,,,,,,,,,,5,5,5,5,d,5,5,5,5
-,,,,,,,,,,,,,,,,,,,,,,d
-,,,,,,,,,,,,,,,,,,,,,,d
-,,,,,,,,,,,,,,,,,,,,,,d
-,,,,,,,,,,,,,,,,,,,,,,d
-,,,,,,,,,,,,,,,,,,,,,,d,d,d,d,d,d,d,d,d,d,d
-,,,,,,,,,,,,,,,,,,,,,,6,,,,,,,,,,d
-,,,,,,,,,,,,,,,,,,,,,,d,,,,,,,,,,d
-,,,,,,,,,,,,,,,,,,,,d,d,d,d,d,,,,,,,,d
-,,,,,,,,,,,,,,,,,,,,d,`,`,`,d,,,,,,,5,5,5
-,,,,,,,,,,,,,,,,,,,,d,`,`,`,d,,,,,,,j,h5,j5
-,,,,,,,,,,,,,,,,,,,,d,`,`,`,d
-,,,,,,,,,,,,,,,,,,,,d,d,d,d,d
-
+"6) When your fort is mature enough to need jail cells, run /services4 to set those up, anytime after the restraints are built in the jail cell block. You also get some decorative statues to increase the value of your dining hall. Assign the office to the right of the barracks to your Sheriff/Captain of the Guard to use it as an interrogation room. Run ""quickfort orders"" for /services4."
+"#dig label(services1) start(18; 18; central stairs) message(Once the area is dug out, continue with /services2.)"
+
+,d,d,d,,d,d,d,,d,d,d,,d,h,d,,j,,d,h,d
+,d,d,d,,d,d,d,,d,d,d,,d,d,d,d,d,d,d,d,d
+,d,d,d,,d,d,d,,d,d,d,,d,d,d,,d,,d,d,d
+,,d,,,,d,,,,d,,,,,,,d
+,d,d,d,d,d,d,d,d,d,d,d,,d,h,d,,d,,d,h,d,,d,d,d,d,d
+,d,d,d,d,d,d,d,d,d,d,d,,d,d,d,d,d,d,d,d,d,,d,d,d,d,d
+,d,d,d,d,d,d,d,d,d,d,d,,d,d,d,,d,,d,d,d,,d,d,d,d,d
+,d,d,d,d,d,d,d,d,d,d,d,,,,,,d,,,,,,d,d,d,d,d
+,d,d,d,d,d,d,d,d,d,d,d,,d,d,d,d,d,d,d,d,d,,d,d,d,d,d
+,d,d,d,d,d,d,d,d,d,d,d,,d,d,d,d,d,d,d,d,d,,,,d
+,d,d,d,d,d,d,d,d,d,d,d,,d,d,d,d,d,d,d,d,d,d,d,d,d
+,d,d,d,d,d,d,d,d,d,d,d,,d,d,d,d,d,d,d,d,d
+,d,d,d,d,d,d,d,d,d,d,d,,d,d,d,d,d,d,d,d,d,,d,,d,,d,,d
+,d,d,d,d,d,d,d,d,d,d,d,,,,,d,,d,,,,,d,,d,,d,,d
+,d,d,d,d,d,d,d,d,d,d,d,,,,d,d,d,d,d,,,,d,d,d,d,d,d,d,d,d
+,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,`,`,`,d,d,d,d,d,d,d,d,d,d,d
+,d,d,d,d,d,d,d,d,d,d,d,,d,,d,`,`,`,d,,d,,d,d,d,h,d,d,d,d,d
+,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,`,`,`,d,d,d,d,d,d,d,d,d,d,d
+,d,d,d,d,d,d,d,d,d,d,d,,,,d,d,d,d,d,,,,d,d,d,d,d,d,d,d,d
+,d,d,d,d,d,d,d,d,d,d,d,,,,,,d,,,,,,d,,d,,d,,d
+,d,d,d,d,d,d,d,d,d,d,d,,,,,,,,,,,,d,,d,,d,,d
+,d,d,d,d,d,d,d,d,d,d,d
+,d,d,d,d,d,d,d,d,d,d,d
+,d,d,d,d,d,d,d,d,d,d,d
+,d,d,d,d,d,d,d,d,d,d,d
+,d,d,d,d,d,d,d,d,d,d,d
+,d,d,d,d,d,d,d,d,d,d,d
+,,,,d,d,,d,d
+,d,d,d,d,d,,d,d,d,d,d
+,d,d,d,d,d,,d,d,d,d,d
+,d,d,d,d,d,,d,d,d,d,d
+,d,d,d,d,d,,d,d,d,d,d
+,d,d,d,d,d,,d,d,d,d,d
 
 #>
 
+,,,,,,,,,,,,,j5,h5,j,,u,,j,h5,j5
+,,,,,,,,,,,,,5,5,5,5,d,5,5,5,5
+,,,,,,,,,,,,,,,,,d
+,,,,,,,,,,,,,,,,,d
+,,,,,,,,,,,,,j5,h5,j,,d,,j,h5,j5
+,,,,,,,,,,,,,5,5,5,5,d,5,5,5,5
+,,,,,,,,,,,,,,,,,d
+,,,,,,,,,,,,,,,,,d
+,,,,,,,,,,,,,,,,,d
+,,,,,,,,,,,,,,,,,d
+,,,,,,,,,,,,,,,,,d
+,,,,,,,,,,,,,,,,,d,d,d,d,d,d,d,d,d,d
+,,,,,,,,,,,,,,,,,6,,,,,,,,,d
+,,,,,,,,,,,,,,,,,d,,,,,,,,,d
+,,,,,,,,,,,,,,,d,d,d,d,d,,,,,,,d
+,,,,,,,,,,,,,,,d,`,`,`,d,,,,,,5,5,5
+,,,,,,,,,,,,,,,d,`,`,`,d,,,,,,j,h5,j5
+,,,,,,,,,,,,,,,d,`,`,`,d
+,,,,,,,,,,,,,,,d,d,d,d,d
 
+#>
 
+,,,,,,,,,,,,,u5,h5,i,,,,i,h5,u5
 
 
 
-,,,,,,,,,,,,,,,,,,u5,h5,i,,,,i,h5,u5
-
+,,,,,,,,,,,,,u5,h5,i,,,,i,h5,u5
 
 
-,,,,,,,,,,,,,,,,,,u5,h5,i,,,,i,h5,u5
 
 
 
@@ -2082,38 +2112,33 @@ Services Walkthrough:
 
 
 
+,,,,,,,,,,,,,,,d,d,d,d,d
+,,,,,,,,,,,,,,,d,`,`,`,d
+,,,,,,,,,,,,,,,d,`,`,`,d,,,,,,i,h5,u5
+,,,,,,,,,,,,,,,d,`,`,`,d
+,,,,,,,,,,,,,,,d,d,d,d,d
 
-,,,,,,,,,,,,,,,,,,,,d,d,d,d,d
-,,,,,,,,,,,,,,,,,,,,d,`,`,`,d
-,,,,,,,,,,,,,,,,,,,,d,`,`,`,d,,,,,,,i,h5,u5
-,,,,,,,,,,,,,,,,,,,,d,`,`,`,d
-,,,,,,,,,,,,,,,,,,,,d,d,d,d,d
 #>
 
+,,,,,,,,,,,,,,d,u,,,,u,d
 
 
 
-
-
-,,,,,,,,,,,,,,,,,,,d,u,,,,u,d
+,,,,,,,,,,,,,,d,u,,,,u,d
 
 
 
-,,,,,,,,,,,,,,,,,,,d,u,,,,u,d
 
 
 
 
 
 
-
-
-,,,,,,,,,,,,,,,,,,,,d,d,d,d,d
-,,,,,,,,,,,,,,,,,,,,d,`,`,`,d
-,,,,,,,,,,,,,,,,,,,,d,`,`,`,d,,,,,,,u,d
-,,,,,,,,,,,,,,,,,,,,d,`,`,`,d
-,,,,,,,,,,,,,,,,,,,,d,d,d,d,d
-
+,,,,,,,,,,,,,,,d,d,d,d,d
+,,,,,,,,,,,,,,,d,`,`,`,d
+,,,,,,,,,,,,,,,d,`,`,`,d,,,,,,u,d
+,,,,,,,,,,,,,,,d,`,`,`,d
+,,,,,,,,,,,,,,,d,d,d,d,d
 
 "#meta label(services2) start(central stairs) message(Remember to enqueue manager orders for this blueprint.
 Once furniture has been placed, continue with /services3.) dining hall anchors, stockpiles, hospital, garbage dump"
@@ -2123,446 +2148,490 @@ zones/services_zones
 name_zones/services_name_zones
 query_stockpiles/services_query_stockpiles
 ""
-"#meta label(services3) start(central stairs) message(Remember to enqueue manager orders for this blueprint.) configure dining room, build dining hall and hospital furniture"
+"#meta label(services3) start(central stairs) message(Remember to enqueue manager orders for this blueprint.) configure dining room/tavern, build dining hall and hospital furniture"
 query_dining/services_query_dining
+query_rented_rooms/services_query_rented_rooms
 build2/services_build2
 ""
-#meta label(services4) start(central stairs) message(Remember to enqueue manager orders for this blueprint.) complete jail and build decorative furniture
+#meta label(services4) start(central stairs) message(Remember to enqueue manager orders for this blueprint.) declare and furnish jail and build decorative furniture
 build3/services_build3
 place_jail/services_place_jail
 query_jail/services_query_jail
-#build label(services_build) start(23; 22) hidden() build basic hospital and dining room anchor
-
-
-,,,,`,`,`,,,`,`,`,,,`,`,`
-,,,,`,`,`,,,`,`,`,,,`,`,`
-,,,,`,`,`,,,`,`,`,,,`,`,`
-,,,,,`,,,,,`,,,,,`
-,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,,`,,`,`,`
-,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,`,`,`,`,`,`
-,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,,`,,`,`,`
-,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,,,,,,`
-,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,,`,,`,`,`
-,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,`,`,`,`,`,`
-,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,,`,,`,`,`
-,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,,,,,,d
-,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,,`,A,A,A,`,A,A,A,`
-,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,`,r,`,`,`,`
-,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,`,`,`,`,`,`,,`,`,`,`,`,`,b,`,`
-,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,`,`,`,`,`,`,,h,`,`,`,`,`,`,`,`
-,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,,,,,d,,d,,,,,`,`,`,`,`,`,t,`,`
-,,,,`,`,`,`,t,c,`,`,`,`,`,`,`,,,,`,`,`,`,`,,,,`,`,`,`,`,`,`,`,`
-,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,d,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,R
-,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,,`,,`,`,`,`,`,,`,,`,`,`,`,l,`,`,`,R
-,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,d,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,R
-,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,,,,`,`,`,`,`,,,,`,`,`,`,`,`,`,`,`
-,,,,`,`,`,h,`,`,`,`,`,`,`,`,`,,,,,,`,,,,,,`,`,`,`,`,`,`,`,`
-,,,,,,,,`,`,,`,`,,,,,,,,,,,,,,,,`,`,`,`,`,`,`,`,`
-,,,,`,`,`,`,`,`,,`,`,`,`,`,`,,,,,,,,,,,,`,`,`,`,`,`,`,`,`
-,,,,`,`,`,`,`,`,,`,`,`,`,`,`
-,,,,`,`,`,`,`,`,,`,`,`,`,`,`
-,,,,`,`,`,`,`,`,,`,`,`,`,`,`
-,,,,`,`,`,`,`,`,,`,`,`,`,`,`
-
-
-#place label(services_place) start(23; 22) hidden()
-
-
-,,,,`,`,`,,,`,`,`,,,`,`,`
-,,,,`,`,`,,,`,`,`,,,`,`,`
-,,,,`,`,`,,,`,`,`,,,`,`,`
-,,,,,`,,,,,`,,,,,`
-,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,,`,,`,`,`
-,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,`,`,`,`,`,`
-,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,,`,,`,`,`
-,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,,,,,,`
-,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,,`,,`,`,`
-,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,`,`,`,`,`,`
-,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,,`,,`,`,`
-,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,,,,,,`
-,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,`,`,`,`,`,`
-,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,`,`,`,`,`,`
-,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,,`,z(7x2),`,`,`,`,`,`,`,,`,`,`,`,`,`,`,`,`
-,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,`,`,`,`,`,`,,`,`,`,`,`,`,`,`,`
-,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,,,,,`,,`,,,,,`,`,`,`,`,`,`,`,`
-,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,,,,`,`,`,`,`,,,,`,`,`,`,`,`,`,`,`
-,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`
-,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,,`,,`,`,`,`,`,,`,,`,`,`,`,`,`,`,`,`
-,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`
-,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,,,,`,`,`,`,`,,,,`,`,`,`,`,`,`,`,`
-,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,,,,,,`,,,,,,`,`,`,`,`,`,`,`,`
-,,,,,,,,`,`,,`,`,,,,,,,,,,,,,,,,`,`,`,`,`,`,`,`,`
-,,,,f(6x5),`,`,`,`,`,,f(6x5),`,`,`,`,`,,,,,,,,,,,,`,`,`,`,`,`,`,`,`
-,,,,`,`,`,`,`,`,,`,`,`,`,`,`
-,,,,`,`,`,`,`,`,,`,`,`,`,`,`
-,,,,`,`,`,`,`,`,,`,`,`,`,`,`
-,,,,`,`,`,`,`,`,,`,`,`,`,`,`
-
-
-"#zone label(services_zones) start(23; 22) hidden() message(If you'd like to fill your wells via bucket brigade, activate the inactive pond zones one level down from where the wells will be built.) hospital, garbage dump, and pond zones"
-
-
-,,,,`,`,`,,,`,`,`,,,`,`,`
-,,,,`,`,`,,,`,`,`,,,`,`,`
-,,,,`,`,`,,,`,`,`,,,`,`,`
-,,,,,`,,,,,`,,,,,`
-,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,,`,,`,`,`
-,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,`,`,`,`,`,`
-,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,,`,,`,`,`
-,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,,,,,,`
-,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,,`,,`,`,`
-,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,`,`,`,`,`,`
-,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,,`,,`,`,`
-,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,,,,,,`
-,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,`,`,`,`,`,`
-,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,`,`,`,`,`,`
-,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,`,`,`,`,`,`,,ht(9x11),`,`,`,`,`,`,`,`
-,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,`,`,`,`,`,`,,`,`,`,`,`,`,`,`,`
-,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,,,,,`,,`,,,,,`,`,`,`,`,`,`,`,`
-,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,,,,`,`,`,`,`,,,,`,`,`,`,`,`,`,`,`
-,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`
-,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,,`,,`,`,`,`,`,,`,,`,`,`,`,`,`,`,`,`
-,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`
-,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,,,,`,`,`,`,`,,,,`,`,`,`,`,`,`,`,`
-,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,,,,,,d,,,,,,`,`,`,`,`,`,`,`,`
-,,,,,,,,`,`,,`,`,,,,,,,,,,,,,,,,`,`,`,`,`,`,`,`,`
-,,,,`,`,`,`,`,`,,`,`,`,`,`,`,,,,,,,,,,,,`,`,`,`,`,`,`,`,`
-,,,,`,`,`,`,`,`,,`,`,`,`,`,`
-,,,,`,`,`,`,`,`,,`,`,`,`,`,`
-,,,,`,`,`,`,`,`,,`,`,`,`,`,`
-,,,,`,`,`,`,`,`,,`,`,`,`,`,`
-#>
-
+#build label(services_build) start(18; 18) hidden() build basic hospital and dining room anchor
+
+,b,b,b,,b,b,b,,b,b,b,,`,`,`,,`,,`,`,`
+,`,`,`,,`,`,`,,`,`,`,,`,`,`,`,`,`,`,`,`
+,`,`,`,,`,`,`,,`,`,`,,`,`,`,,`,,`,`,`
+,,`,,,,`,,,,`,,,,,,,`
+,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,,`,,`,`,`,,`,`,`,`,`
+,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,`,`,`,`,`,`,,`,`,`,`,`
+,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,,`,,`,`,`,,`,`,`,`,`
+,`,`,`,`,`,`,`,`,`,`,`,,,,,,d,,,,,,`,`,`,`,`
+,`,`,`,`,`,`,`,`,`,`,`,,`,A,A,A,`,A,A,A,`,,`,`,`,`,`
+,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,`,r,`,`,`,`,,,,`
+,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,`,`,`,`,`,`,d,`,`,`
+,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,`,`,`,`,`,`
+,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,`,`,`,`,`,`,,`,,`,,`,,b
+,`,`,`,`,`,`,`,`,`,`,`,,,,,d,,d,,,,,`,,`,,`,,`
+,`,`,`,`,`,`,`,`,`,`,`,,,,`,`,`,`,`,,,,`,`,`,t,`,`,`,`,R
+,`,`,`,`,`,`,`,`,`,`,`,d,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,h
+,`,`,`,`,`,`,`,`,`,`,`,,`,,`,`,`,`,`,,`,,`,`,`,l,`,`,`,`,R
+,`,`,`,`,`,`,`,`,`,`,`,d,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`
+,`,`,`,t,c,`,`,`,`,`,`,,,,`,`,`,`,`,,,,`,`,`,`,`,`,`,`,R
+,`,`,`,`,`,`,`,`,`,`,`,,,,,,`,,,,,,`,,`,,`,,`
+,`,`,`,`,`,`,`,`,`,`,`,,,,,,,,,,,,`,,`,,`,,`
+,`,`,`,`,`,`,`,`,`,`,`
+,`,`,`,`,`,`,`,`,`,`,`
+,`,`,`,`,`,`,`,`,`,`,`
+,`,`,`,`,`,`,`,`,`,`,`
+,`,`,`,`,`,`,`,`,`,`,`
+,`,`,`,`,`,h,`,`,`,`,`
+,,,,`,`,,`,`
+,`,`,`,`,`,,`,`,`,`,`
+,`,`,`,`,`,,`,`,`,`,`
+,`,`,`,`,`,,`,`,`,`,`
+,`,`,`,`,`,,`,`,`,`,`
+,`,`,`,`,`,,`,`,`,`,`
+
+#place label(services_place) start(18; 18) hidden()
+
+,`,`,`,,`,`,`,,`,`,`,,`,`,`,,`,,`,`,`
+,`,`,`,,`,`,`,,`,`,`,,`,`,`,`,`,`,`,`,`
+,`,`,`,,`,`,`,,`,`,`,,`,`,`,,`,,`,`,`
+,,`,,,,`,,,,`,,,,,,,`
+,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,,`,,`,`,`,,`,`,`,`,`
+,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,`,`,`,`,`,`,,`,`,`,`,`
+,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,,`,,`,`,`,,`,`,`,`,`
+,`,`,`,`,`,`,`,`,`,`,`,,,,,,`,,,,,,`,`,`,`,`
+,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,`,`,`,`,`,`,,`,`,`,`,`
+,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,`,`,`,`,`,`,,,,`
+,`,`,`,`,`,`,`,`,`,`,`,,`,z(7x3),,,`,`,`,`,`,`,`,`,`
+,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,`,`,`,`,`,`
+,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,`,`,`,`,`,`,,`,,`,,`,,`
+,`,`,`,`,`,`,`,`,`,`,`,,,,,`,,`,,,,,`,,`,,`,,`
+,`,`,`,`,`,`,`,`,`,`,`,,,,`,`,`,`,`,,,,`,`,`,`,`,`,`,`,`
+,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`
+,`,`,`,`,`,`,`,`,`,`,`,,`,,`,`,`,`,`,,`,,`,`,`,`,`,`,`,`,`
+,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`
+,`,`,`,`,`,`,`,`,`,`,`,,,,`,`,`,`,`,,,,`,`,`,`,`,`,`,`,`
+,`,`,`,`,`,`,`,`,`,`,`,,,,,,c,,,,,,`,,`,,`,,`
+,`,`,`,`,`,`,`,`,`,`,`,,,,,,,,,,,,`,,`,,`,,`
+,`,`,`,`,`,`,`,`,`,`,`
+,`,`,`,`,`,`,`,`,`,`,`
+,`,`,`,`,`,`,`,`,`,`,`
+,`,`,`,`,`,`,`,`,`,`,`
+,`,`,`,`,`,`,`,`,`,`,`
+,`,`,`,`,`,`,`,`,`,`,`
+,,,,`,`,,`,`
+,f(5x5),,,`,`,,f(5x5),,,`,`
+,`,`,`,`,`,,`,`,`,`,`
+,`,`,`,`,`,,`,`,`,`,`
+,`,`,`,`,`,,`,`,`,`,`
+,`,`,`,`,`,,`,`,`,`,`
+
+"#zone label(services_zones) start(18; 18) hidden() message(If you'd like to fill your wells via bucket brigade, activate the inactive pond zones one level down from where the wells will be built.) hospital, garbage dump, and pond zones"
+
+,`,`,`,,`,`,`,,`,`,`,,`,`,`,,`,,`,`,`
+,`,`,`,,`,`,`,,`,`,`,,`,`,`,`,`,`,`,`,`
+,`,`,`,,`,`,`,,`,`,`,,`,`,`,,`,,`,`,`
+,,`,,,,`,,,,`,,,,,,,`
+,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,,`,,`,`,`,,`,`,`,`,`
+,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,`,`,`,`,`,`,,`,`,`,`,`
+,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,,`,,`,`,`,,`,`,`,`,`
+,`,`,`,`,`,`,`,`,`,`,`,,,,,,`,,,,,,`,`,`,`,`
+,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,`,`,`,`,`,`,,`,`,`,`,`
+,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,`,`,`,`,`,`,,,,`
+,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,`,`,`,`,`,`,`,`,`,`
+,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,`,`,`,`,`,`
+,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,`,`,`,`,`,`,,ht,,ht,,ht,,ht
+,`,`,`,`,`,`,`,`,`,`,`,,,,,`,,`,,,,,ht,,ht,,ht,,ht
+,`,`,`,`,`,`,`,`,`,`,`,,,,`,`,`,`,`,,,,ht,ht,ht,ht,ht,ht,ht,ht,ht
+,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,ht,ht,ht,ht,ht,ht,ht
+,`,`,`,`,`,`,`,`,`,`,`,,`,,`,`,`,`,`,,`,,ht,ht,ht,ht,ht,ht,ht,ht,ht
+,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,ht,ht,ht,ht,ht,ht,ht
+,`,`,`,`,`,`,`,`,`,`,`,,,,`,`,`,`,`,,,,ht,ht,ht,ht,ht,ht,ht,ht,ht
+,`,`,`,`,`,`,`,`,`,`,`,,,,,,d,,,,,,ht,,ht,,ht,,ht
+,`,`,`,`,`,`,`,`,`,`,`,,,,,,,,,,,,ht,,ht,,ht,,ht
+,`,`,`,`,`,`,`,`,`,`,`
+,`,`,`,`,`,`,`,`,`,`,`
+,`,`,`,`,`,`,`,`,`,`,`
+,`,`,`,`,`,`,`,`,`,`,`
+,`,`,`,`,`,`,`,`,`,`,`
+,`,`,`,`,`,`,`,`,`,`,`
+,,,,`,`,,`,`
+,`,`,`,`,`,,`,`,`,`,`
+,`,`,`,`,`,,`,`,`,`,`
+,`,`,`,`,`,,`,`,`,`,`
+,`,`,`,`,`,,`,`,`,`,`
+,`,`,`,`,`,,`,`,`,`,`
 
-
-
-
-
-,,,,,,,,,,,,,,,,,,`,apPf,`,,`,,`,apPf,`
-,,,,,,,,,,,,,,,,,,`,`,`,`,`,`,`,`,`
-,,,,,,,,,,,,,,,,,,,,,,`
-,,,,,,,,,,,,,,,,,,,,,,`
-,,,,,,,,,,,,,,,,,,`,apPf,`,,`,,`,apPf,`
-,,,,,,,,,,,,,,,,,,`,`,`,`,`,`,`,`,`
-,,,,,,,,,,,,,,,,,,,,,,`
-,,,,,,,,,,,,,,,,,,,,,,`
-,,,,,,,,,,,,,,,,,,,,,,`
-,,,,,,,,,,,,,,,,,,,,,,`
-,,,,,,,,,,,,,,,,,,,,,,`,`,`,`,`,`,`,`,`,`,`
-,,,,,,,,,,,,,,,,,,,,,,`,,,,,,,,,,`
-,,,,,,,,,,,,,,,,,,,,,,`,,,,,,,,,,`
-,,,,,,,,,,,,,,,,,,,,`,`,`,`,`,,,,,,,,`
-,,,,,,,,,,,,,,,,,,,,`,`,`,`,`,,,,,,,`,`,`
-,,,,,,,,,,,,,,,,,,,,`,`,`,`,`,,,,,,,`,apPf,`
-,,,,,,,,,,,,,,,,,,,,`,`,`,`,`
-,,,,,,,,,,,,,,,,,,,,`,`,`,`,`
-
-
-#query label(services_name_zones) start(23; 22) hidden()
-
-
-,,,,`,`,`,,,`,`,`,,,`,`,`
-,,,,`,`,`,,,`,`,`,,,`,`,`
-,,,,`,`,`,,,`,`,`,,,`,`,`
-,,,,,`,,,,,`,,,,,`
-,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,,`,,`,`,`
-,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,`,`,`,`,`,`
-,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,,`,,`,`,`
-,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,,,,,,`
-,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,,`,,`,`,`
-,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,`,`,`,`,`,`
-,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,,`,,`,`,`
-,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,,,,,,`
-,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,`,`,`,`,`,`
-,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,`,`,`,`,`,`
-,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,`,`,`,`,`,`,,"{namezone name=""hospital""}"
-,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,`,`,`,`,`,`,,`,`,`,`,`,`,`,`,`
-,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,,,,,`,,`,,,,,`,`,`,`,`,`,`,`,`
-,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,,,,`,`,`,`,`,,,,`,`,`,`,`,`,`,`,`
-,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`
-,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,,`,,`,`,`,`,`,,`,,`,`,`,`,`,`,`,`,`
-,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`
-,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,,,,`,`,`,`,`,,,,`,`,`,`,`,`,`,`,`
-,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,,,,,,"{namezone name=""garbage dump""}",,,,,,,,,,,,,,`
-,,,,,,,,`,`,,`,`,,,,,,,,,,,,,,,,`,`,`,`,`,`,`,`,`
-,,,,`,`,`,`,`,`,,`,`,`,`,`,`,,,,,,,,,,,,`,`,`,`,`,`,`,`,`
-,,,,`,`,`,`,`,`,,`,`,`,`,`,`
-,,,,`,`,`,`,`,`,,`,`,`,`,`,`
-,,,,`,`,`,`,`,`,,`,`,`,`,`,`
-,,,,`,`,`,`,`,`,,`,`,`,`,`,`
 #>
 
-
-
-
-
-
-,,,,,,,,,,,,,,,,,,`,"{namezone name=""jail3 well""}",`,,`,,`,"{namezone name=""jail4 well""}",`
-,,,,,,,,,,,,,,,,,,`,`,`,`,`,`,`,`,`
-,,,,,,,,,,,,,,,,,,,,,,`
-,,,,,,,,,,,,,,,,,,,,,,`
-,,,,,,,,,,,,,,,,,,`,"{namezone name=""jail1 well""}",`,,`,,`,"{namezone name=""jail2 well""}",`
-,,,,,,,,,,,,,,,,,,`,`,`,`,`,`,`,`,`
-,,,,,,,,,,,,,,,,,,,,,,`
-,,,,,,,,,,,,,,,,,,,,,,`
-,,,,,,,,,,,,,,,,,,,,,,`
-,,,,,,,,,,,,,,,,,,,,,,`
-,,,,,,,,,,,,,,,,,,,,,,`,`,`,`,`,`,`,`,`,`,`
-,,,,,,,,,,,,,,,,,,,,,,`,,,,,,,,,,`
-,,,,,,,,,,,,,,,,,,,,,,`,,,,,,,,,,`
-,,,,,,,,,,,,,,,,,,,,`,`,`,`,`,,,,,,,,`
-,,,,,,,,,,,,,,,,,,,,`,`,`,`,`,,,,,,,`,`,`
-,,,,,,,,,,,,,,,,,,,,`,`,`,`,`,,,,,,,`,"{namezone name=""hospital well""}",`
-,,,,,,,,,,,,,,,,,,,,`,`,`,`,`
-,,,,,,,,,,,,,,,,,,,,`,`,`,`,`
-
-
-#query label(services_query_stockpiles) start(23; 22) hidden() message(Configure the training ammo stockpile to take from the metalworker quantum on the industry level.) configure stockpiles
-
-
-,,,,`,`,`,,,`,`,`,,,`,`,`
-,,,,`,`,`,,,`,`,`,,,`,`,`
-,,,,`,`,`,,,`,`,`,,,`,`,`
-,,,,,`,,,,,`,,,,,`
-,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,,`,,`,`,`
-,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,`,`,`,`,`,`
-,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,,`,,`,`,`
-,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,,,,,,`
-,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,,`,,`,`,`
-,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,`,`,`,`,`,`
-,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,,`,,`,`,`
-,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,,,,,,`
-,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,`,`,`,`,`,`
-,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,`,`,`,`,`,`
-,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,,`,nocontainers,{bolts}{forbidmetalbolts}{forbidartifactammo},"{givename name=""training bolts""}",`,`,`,`,`,,`,`,`,`,`,`,`,`,`
-,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,`,`,`,`,`,`,,`,`,`,`,`,`,`,`,`
-,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,,,,,`,,`,,,,,`,`,`,`,`,`,`,`,`
-,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,,,,`,`,`,`,`,,,,`,`,`,`,`,`,`,`,`
-,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`
-,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,,`,,`,`,`,`,`,,`,,`,`,`,`,`,`,`,`,`
-,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`
-,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,,,,`,`,`,`,`,,,,`,`,`,`,`,`,`,`,`
-,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,,,,,,`,,,,,,`,`,`,`,`,`,`,`,`
-,,,,,,,,`,`,,`,`,,,,,,,,,,,,,,,,`,`,`,`,`,`,`,`,`
-,,,,preparedfood,"{givename name=""prepared food""}",`,`,`,`,,booze,"{givename name=""booze""}",`,`,`,`,,,,,,,,,,,,`,`,`,`,`,`,`,`,`
-,,,,`,`,`,`,`,`,,`,`,`,`,`,`
-,,,,`,`,`,`,`,`,,`,`,`,`,`,`
-,,,,`,`,`,`,`,`,,`,`,`,`,`,`
-,,,,`,`,`,`,`,`,,`,`,`,`,`,`
-
-
-#query label(services_query_dining) start(23; 22) message(the bedrooms above the tavern are left unconfigured so you can add them as rented rooms) set up dining room and barracks
-
-
-,,,,`,`,`,,,`,`,`,,,`,`,`
-,,,,`,`,`,,,`,`,`,,,`,`,`
-,,,,`,`,`,,,`,`,`,,,`,`,`
-,,,,,`,,,,,`,,,,,`
-,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,,`,,`,`,`
-,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,`,`,`,`,`,`
-,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,,`,,`,`,`
-,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,,,,,,`
-,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,,`,,`,`,`
-,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,`,`,`,`,`,`
-,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,,`,,`,`,`
-,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,,,,,,`
-,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,,`,r&w,r&w,r&w,`,r&w,r&w,r&w,`
-,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,`,r+++&,`,`,`,`
-,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,`,`,`,`,`,`,,`,`,`,`,`,`,`,`,`
-,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,`,`,`,`,`,`,,`,`,`,`,`,`,`,`,`
-,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,,,,,`,,`,,,,,`,`,`,`,`,`,`,`,`
-,,,,`,`,`,`,"r{+ 11}&h{givename name=""grand hall""}",,,,`,`,`,`,`,,,,`,`,`,`,`,,,,`,`,`,`,`,`,`,`,`
-,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`
-,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,,`,,`,`,`,`,`,,`,,`,`,`,`,`,`,`,`,`
-,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`
-,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,,,,`,`,`,`,`,,,,`,`,`,`,`,`,`,`,`
-,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,,,,,,`,,,,,,`,`,`,`,`,`,`,`,`
-,,,,,,,,`,`,,`,`,,,,,,,,,,,,,,,,`,`,`,`,`,`,`,`,`
-,,,,`,`,`,`,`,`,,`,`,`,`,`,`,,,,,,,,,,,,`,`,`,`,`,`,`,`,`
-,,,,`,`,`,`,`,`,,`,`,`,`,`,`
-,,,,`,`,`,`,`,`,,`,`,`,`,`,`
-,,,,`,`,`,`,`,`,,`,`,`,`,`,`
-,,,,`,`,`,`,`,`,,`,`,`,`,`,`
-
-
-"#build label(services_build2) start(23; 22) hidden() build rest of hospital and dining room, doors, prep for jail"
-
-
-,,,,b,b,b,,,b,b,b,,,b,b,b
-,,,,`,`,`,,,`,`,`,,,`,`,`
-,,,,f,`,h,,,f,`,h,,,f,`,h
-,,,,,d,,,,,d,,,,,d
-,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,,`,,`,`,`
-,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,,`,v,`,d,`,d,`,v,`
-,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,,`,,`,`,`
-,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,,,,,,`
-,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,,`,,`,`,`
-,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,,`,v,`,d,`,d,`,v,`
-,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,,`,,`,`,`
-,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,,,,,,~
-,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,,b,~,~,~,`,~,~,~,b
-,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,,b,`,`,`,~,`,`,`,b
-,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,,b,`,`,`,a,`,`,`,b,,f,`,`,`,`,b,~,b,b
-,,,,`,`,c,t,t,c,`,c,t,t,c,`,`,,h,`,`,`,`,`,`,`,h,,~,`,`,`,`,`,`,`,b
-,,,,`,`,c,t,t,c,`,c,t,t,c,`,`,,,,,~,,~,,,,,f,`,`,`,`,`,~,`,b
-,,,,`,`,c,t,~,~,`,c,t,t,c,`,`,,,,`,`,`,`,`,,,,`,`,`,`,`,`,`,`,`
-,,,,`,`,c,t,t,c,`,c,t,t,c,`,`,~,`,d,`,`,`,`,`,d,`,d,`,`,`,`,`,`,`,`,~
-,,,,`,`,c,t,t,c,`,c,t,t,c,`,`,,`,,`,`,`,`,`,,`,,`,`,`,`,`,`,`,`,~
-,,,,`,`,c,t,t,c,`,c,t,t,c,`,`,~,`,d,`,`,`,`,`,d,`,d,`,`,`,`,`,`,`,`,~
-,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,,,,`,`,`,`,`,,,,`,`,`,`,`,`,`,`,`
-,,,,h,`,`,~,`,`,`,`,`,h,`,`,h,,,,,,`,,,,,,f,`,`,`,`,`,t,`,b
-,,,,,,,,`,`,,`,`,,,,,,,,,,,,,,,,h,`,`,`,`,`,`,`,b
-,,,,`,`,`,`,`,`,,`,`,`,`,`,`,,,,,,,,,,,,f,`,`,`,`,b,b,b,b
-,,,,`,`,`,`,`,`,,`,`,`,`,`,`
-,,,,`,`,`,`,`,`,,`,`,`,`,`,`
-,,,,`,`,`,`,`,`,,`,`,`,`,`,`
-,,,,`,`,`,`,`,`,,`,`,`,`,`,`
-
+,,,,,,,,,,,,,`,apPf,`,,`,,`,apPf,`
+,,,,,,,,,,,,,`,`,`,`,`,`,`,`,`
+,,,,,,,,,,,,,,,,,`
+,,,,,,,,,,,,,,,,,`
+,,,,,,,,,,,,,`,apPf,`,,`,,`,apPf,`
+,,,,,,,,,,,,,`,`,`,`,`,`,`,`,`
+,,,,,,,,,,,,,,,,,`
+,,,,,,,,,,,,,,,,,`
+,,,,,,,,,,,,,,,,,`
+,,,,,,,,,,,,,,,,,`
+,,,,,,,,,,,,,,,,,`
+,,,,,,,,,,,,,,,,,`,`,`,`,`,`,`,`,`,`
+,,,,,,,,,,,,,,,,,`,,,,,,,,,`
+,,,,,,,,,,,,,,,,,`,,,,,,,,,`
+,,,,,,,,,,,,,,,`,`,`,`,`,,,,,,,`
+,,,,,,,,,,,,,,,`,`,`,`,`,,,,,,`,`,`
+,,,,,,,,,,,,,,,`,`,`,`,`,,,,,,`,apPf,`
+,,,,,,,,,,,,,,,`,`,`,`,`
+,,,,,,,,,,,,,,,`,`,`,`,`
+
+#query label(services_name_zones) start(18; 18) hidden()
+
+,`,`,`,,`,`,`,,`,`,`,,`,`,`,,`,,`,`,`
+,`,`,`,,`,`,`,,`,`,`,,`,`,`,`,`,`,`,`,`
+,`,`,`,,`,`,`,,`,`,`,,`,`,`,,`,,`,`,`
+,,`,,,,`,,,,`,,,,,,,`
+,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,,`,,`,`,`,,`,`,`,`,`
+,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,`,`,`,`,`,`,,`,`,`,`,`
+,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,,`,,`,`,`,,`,`,`,`,`
+,`,`,`,`,`,`,`,`,`,`,`,,,,,,`,,,,,,`,`,`,`,`
+,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,`,`,`,`,`,`,,`,`,`,`,`
+,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,`,`,`,`,`,`,,,,`
+,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,`,`,`,`,`,`,`,`,`,`
+,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,`,`,`,`,`,`
+,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,`,`,`,`,`,`,,"{namezone name=""hospital""}"
+,`,`,`,`,`,`,`,`,`,`,`,,,,,`,,`,,,,,`,,`,,`,,`
+,`,`,`,`,`,`,`,`,`,`,`,,,,`,`,`,`,`,,,,`,`,`,`,`,`,`,`,`
+,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`
+,`,`,`,`,`,`,`,`,`,`,`,,`,,`,`,`,`,`,,`,,`,`,`,`,`,`,`,`,`
+,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`
+,`,`,`,`,`,`,`,`,`,`,`,,,,`,`,`,`,`,,,,`,`,`,`,`,`,`,`,`
+,`,`,`,`,`,`,`,`,`,`,`,,,,,,"{namezone name=""garbage dump""}"
+,`,`,`,`,`,`,`,`,`,`,`,,,,,,,,,,,,`,,`,,`,,`
+,`,`,`,`,`,`,`,`,`,`,`
+,`,`,`,`,`,`,`,`,`,`,`
+,`,`,`,`,`,`,`,`,`,`,`
+,`,`,`,`,`,`,`,`,`,`,`
+,`,`,`,`,`,`,`,`,`,`,`
+,`,`,`,`,`,`,`,`,`,`,`
+,,,,`,`,,`,`
+,`,`,`,`,`,,`,`,`,`,`
+,`,`,`,`,`,,`,`,`,`,`
+,`,`,`,`,`,,`,`,`,`,`
+,`,`,`,`,`,,`,`,`,`,`
+,`,`,`,`,`,,`,`,`,`,`
 
 #>
 
+,,,,,,,,,,,,,`,"{namezone name=""jail3 well""}",`,,`,,`,"{namezone name=""jail4 well""}",`
+,,,,,,,,,,,,,`,`,`,`,`,`,`,`,`
+,,,,,,,,,,,,,,,,,`
+,,,,,,,,,,,,,,,,,`
+,,,,,,,,,,,,,`,"{namezone name=""jail1 well""}",`,,`,,`,"{namezone name=""jail2 well""}",`
+,,,,,,,,,,,,,`,`,`,`,`,`,`,`,`
+,,,,,,,,,,,,,,,,,`
+,,,,,,,,,,,,,,,,,`
+,,,,,,,,,,,,,,,,,`
+,,,,,,,,,,,,,,,,,`
+,,,,,,,,,,,,,,,,,`
+,,,,,,,,,,,,,,,,,`,`,`,`,`,`,`,`,`,`
+,,,,,,,,,,,,,,,,,`,,,,,,,,,`
+,,,,,,,,,,,,,,,,,`,,,,,,,,,`
+,,,,,,,,,,,,,,,`,`,`,`,`,,,,,,,`
+,,,,,,,,,,,,,,,`,`,`,`,`,,,,,,`,`,`
+,,,,,,,,,,,,,,,`,`,`,`,`,,,,,,`,"{namezone name=""hospital well""}",`
+,,,,,,,,,,,,,,,`,`,`,`,`
+,,,,,,,,,,,,,,,`,`,`,`,`
+
+#query label(services_query_stockpiles) start(18; 18) hidden() message(Configure the training ammo stockpile to take from the metalworker quantum on the industry level.) configure stockpiles
+
+,`,`,`,,`,`,`,,`,`,`,,`,`,`,,`,,`,`,`
+,`,`,`,,`,`,`,,`,`,`,,`,`,`,`,`,`,`,`,`
+,`,`,`,,`,`,`,,`,`,`,,`,`,`,,`,,`,`,`
+,,`,,,,`,,,,`,,,,,,,`
+,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,,`,,`,`,`,,`,`,`,`,`
+,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,`,`,`,`,`,`,,`,`,`,`,`
+,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,,`,,`,`,`,,`,`,`,`,`
+,`,`,`,`,`,`,`,`,`,`,`,,,,,,`,,,,,,`,`,`,`,`
+,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,`,`,`,`,`,`,,`,`,`,`,`
+,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,`,`,`,`,`,`,,,,`
+,`,`,`,`,`,`,`,`,`,`,`,,`,nocontainers,{bolts}{forbidmetalbolts}{forbidartifactammo},"{givename name=""training bolts""}",`,`,`,`,`,`,`,`,`
+,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,`,`,`,`,`,`
+,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,`,`,`,`,`,`,,`,,`,,`,,`
+,`,`,`,`,`,`,`,`,`,`,`,,,,,`,,`,,,,,`,,`,,`,,`
+,`,`,`,`,`,`,`,`,`,`,`,,,,`,`,`,`,`,,,,`,`,`,`,`,`,`,`,`
+,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`
+,`,`,`,`,`,`,`,`,`,`,`,,`,,`,`,`,`,`,,`,,`,`,`,`,`,`,`,`,`
+,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`
+,`,`,`,`,`,`,`,`,`,`,`,,,,`,`,`,`,`,,,,`,`,`,`,`,`,`,`,`
+,`,`,`,`,`,`,`,`,`,`,`,,,,,,"{givename name=""garbage dump""}"
+,`,`,`,`,`,`,`,`,`,`,`,,,,,,,,,,,,`,,`,,`,,`
+,`,`,`,`,`,`,`,`,`,`,`
+,`,`,`,`,`,`,`,`,`,`,`
+,`,`,`,`,`,`,`,`,`,`,`
+,`,`,`,`,`,`,`,`,`,`,`
+,`,`,`,`,`,`,`,`,`,`,`
+,`,`,`,`,`,`,`,`,`,`,`
+,,,,`,`,,`,`
+,preparedfood,"{givename name=""prepared food""}",`,`,`,,booze,"{givename name=""booze""}",`,`,`
+,`,`,`,`,`,,`,`,`,`,`
+,`,`,`,`,`,,`,`,`,`,`
+,`,`,`,`,`,,`,`,`,`,`
+,`,`,`,`,`,,`,`,`,`,`
+
+"#query label(services_query_dining) start(18; 18) message(The tavern is restricted to residents only by default. If you'd like your tavern to attract vistors, please go to the (l)ocation menu and change the restriction.) set up dining room/tavern and barracks"
+
+,`,`,`,,`,`,`,,`,`,`,,`,`,`,,`,,`,`,`
+,`,`,`,,`,`,`,,`,`,`,,`,`,`,`,`,`,`,`,`
+,`,`,`,,`,`,`,,`,`,`,,`,`,`,,`,,`,`,`
+,,`,,,,`,,,,`,,,,,,,`
+,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,,`,,`,`,`,,`,`,`,`,`
+,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,`,`,`,`,`,`,,`,`,`,`,`
+,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,,`,,`,`,`,,`,`,`,`,`
+,`,`,`,`,`,`,`,`,`,`,`,,,,,,`,,,,,,`,`,`,`,`
+,`,`,`,`,`,`,`,`,`,`,`,,`,r+&w,r+&w,r+&w,`,r+&w,r+&w,r+&w,`,,`,`,`,`,`
+,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,`,r{+ 2}&,,,`,`,,,,`
+,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,`,`,`,`,`,`,`,`,`,`
+,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,`,`,`,`,`,`
+,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,`,`,`,`,`,`,,`,,`,,`,,`
+,`,`,`,`,`,`,`,`,`,`,`,,,,,`,,`,,,,,`,,`,,`,,`
+,`,`,`,`,`,`,`,`,`,`,`,,,,`,`,`,`,`,,,,`,`,`,`,`,`,`,`,`
+,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`
+,`,`,`,`,`,`,`,`,`,`,`,,`,,`,`,`,`,`,,`,,`,`,`,`,`,`,`,`,`
+,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`
+,`,`,`,"r{+ 12}&h{givename name=""grand hall""}lai^l{Up}r^q",,,,,,,,,,,,,,,,,,,,`,`,`,`,`,`,`,`
+,`,`,`,`,`,`,`,`,`,`,`,,,,,,`,,,,,,`,,`,,`,,`
+,`,`,`,`,`,`,`,`,`,`,`,,,,,,,,,,,,`,,`,,`,,`
+,`,`,`,`,`,`,`,`,`,`,`
+,`,`,`,`,`,`,`,`,`,`,`
+,`,`,`,`,`,`,`,`,`,`,`
+,`,`,`,`,`,`,`,`,`,`,`
+,`,`,`,`,`,`,`,`,`,`,`
+,`,`,`,`,`,`,`,`,`,`,`
+,,,,`,`,,`,`
+,`,`,`,`,`,,`,`,`,`,`
+,`,`,`,`,`,,`,`,`,`,`
+,`,`,`,`,`,,`,`,`,`,`
+,`,`,`,`,`,,`,`,`,`,`
+,`,`,`,`,`,,`,`,`,`,`
+
+#query label(services_query_rented_rooms) start(18; 18) attach rented rooms to tavern
+
+,r&l-&,r&l-&,r&l-&,,r&l-&,r&l-&,r&l-&,,r&l-&,r&l-&,r&l-&,,`,`,`,,`,,`,`,`
+,`,`,`,,`,`,`,,`,`,`,,`,`,`,`,`,`,`,`,`
+,`,`,`,,`,`,`,,`,`,`,,`,`,`,,`,,`,`,`
+,,`,,,,`,,,,`,,,,,,,`
+,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,,`,,`,`,`,,`,`,`,`,`
+,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,`,`,`,`,`,`,,`,`,`,`,`
+,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,,`,,`,`,`,,`,`,`,`,`
+,`,`,`,`,`,`,`,`,`,`,`,,,,,,`,,,,,,`,`,`,`,`
+,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,`,`,`,`,`,`,,`,`,`,`,`
+,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,`,`,`,`,`,`,,,,`
+,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,`,`,`,`,`,`,`,`,`,`
+,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,`,`,`,`,`,`
+,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,`,`,`,`,`,`,,`,,`,,`,,`
+,`,`,`,`,`,`,`,`,`,`,`,,,,,`,,`,,,,,`,,`,,`,,`
+,`,`,`,`,`,`,`,`,`,`,`,,,,`,`,`,`,`,,,,`,`,`,`,`,`,`,`,`
+,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`
+,`,`,`,`,`,`,`,`,`,`,`,,`,,`,`,`,`,`,,`,,`,`,`,`,`,`,`,`,`
+,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`
+,`,`,`,`,`,`,`,`,`,`,`,,,,`,`,`,`,`,,,,`,`,`,`,`,`,`,`,`
+,`,`,`,`,`,`,`,`,`,`,`,,,,,,`,,,,,,`,,`,,`,,`
+,`,`,`,`,`,`,`,`,`,`,`,,,,,,,,,,,,`,,`,,`,,`
+,`,`,`,`,`,`,`,`,`,`,`
+,`,`,`,`,`,`,`,`,`,`,`
+,`,`,`,`,`,`,`,`,`,`,`
+,`,`,`,`,`,`,`,`,`,`,`
+,`,`,`,`,`,`,`,`,`,`,`
+,`,`,`,`,`,`,`,`,`,`,`
+,,,,`,`,,`,`
+,`,`,`,`,`,,`,`,`,`,`
+,`,`,`,`,`,,`,`,`,`,`
+,`,`,`,`,`,,`,`,`,`,`
+,`,`,`,`,`,,`,`,`,`,`
+,`,`,`,`,`,,`,`,`,`,`
+
+"#build label(services_build2) start(18; 18) hidden() build rest of hospital and dining room, doors, prep for jail"
+
+,~,~,~,,~,~,~,,~,~,~,,`,`,`,,`,,`,`,`
+,`,`,`,,`,`,`,,`,`,`,,`,v,`,d,`,d,`,v,`
+,f,`,h,,f,`,h,,f,`,h,,`,`,`,,`,,`,`,`
+,,d,,,,d,,,,d,,,,,,,`
+,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,,`,,`,`,`,,`,`,`,`,`
+,`,`,`,`,`,`,`,`,`,`,`,,`,v,`,d,`,d,`,v,`,,`,`,c,`,`
+,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,,`,,`,`,`,,`,`,`,`,`
+,`,`,`,`,`,`,`,`,`,`,`,,,,,,~,,,,,,`,`,`,`,`
+,`,`,`,`,`,`,`,`,`,`,`,,b,~,~,~,`,~,~,~,h,,`,`,`,`,`
+,`,`,`,`,`,`,`,`,`,`,`,,b,`,`,`,~,`,`,`,`,,,,`
+,`,`,`,`,`,`,`,`,`,`,`,,b,`,`,`,`,`,`,`,`,~,`,`,`
+,`,`,`,`,`,`,`,`,`,`,`,,b,`,`,`,`,`,`,`,`
+,`,`,`,`,`,`,`,`,`,`,`,,b,`,`,`,`,`,`,`,a,,b,,b,,b,,~
+,`,`,`,`,`,`,`,`,`,`,`,,,,,~,,~,,,,,d,,d,,d,,d
+,`,`,`,`,`,`,`,`,`,`,`,,,,`,`,`,`,`,,,,`,`,`,~,`,`,`,d,~
+,`,c,t,t,c,`,c,t,t,c,`,~,`,d,`,`,`,`,`,d,`,d,`,`,`,`,`,`,~
+,`,c,t,t,c,`,c,t,t,c,`,,`,,`,`,`,`,`,,`,,`,`,`,~,`,`,`,d,~
+,`,c,t,t,c,`,c,t,t,c,`,~,`,d,`,`,`,`,`,d,`,d,`,`,`,`,`,`,f
+,`,c,t,~,~,`,c,t,t,c,`,,,,`,`,`,`,`,,,,`,`,`,t,`,`,`,d,~
+,`,c,t,t,c,`,c,t,t,c,`,,,,,,`,,,,,,d,,d,,d,,d
+,`,c,t,t,c,`,c,t,t,c,`,,,,,,,,,,,,b,,b,,b,,b
+,`,c,t,t,c,`,c,t,t,c,`
+,`,c,t,t,c,`,c,t,t,c,`
+,`,c,t,t,c,`,c,t,t,c,`
+,`,c,t,t,c,`,c,t,t,c,`
+,`,`,`,`,`,`,`,`,`,`,`
+,h,`,`,`,`,~,`,`,`,`,h
+,,,,d,d,,d,d
+,`,`,`,`,`,,`,`,`,`,`
+,`,`,`,`,`,,`,`,`,`,`
+,`,`,`,`,`,,`,`,`,`,`
+,`,`,`,`,`,,`,`,`,`,`
+,`,`,`,`,`,,`,`,`,`,`
 
+#>
 
-
-
-
-,,,,,,,,,,,,,,,,,,`,`,`,,`,,`,`,`
-,,,,,,,,,,,,,,,,,,`,`,`,d,`,d,`,`,`
-,,,,,,,,,,,,,,,,,,,,,,`
-,,,,,,,,,,,,,,,,,,,,,,`
-,,,,,,,,,,,,,,,,,,`,`,`,,`,,`,`,`
-,,,,,,,,,,,,,,,,,,`,`,`,d,`,d,`,`,`
-,,,,,,,,,,,,,,,,,,,,,,`
-,,,,,,,,,,,,,,,,,,,,,,`
-,,,,,,,,,,,,,,,,,,,,,,`
-,,,,,,,,,,,,,,,,,,,,,,`
-,,,,,,,,,,,,,,,,,,,,,,`
-,,,,,,,,,,,,,,,,,,,,,,`,`,`,`,`,`,`,`,`,`,`
-,,,,,,,,,,,,,,,,,,,,,,d,,,,,,,,,,`
-,,,,,,,,,,,,,,,,,,,,`,`,`,`,`,,,,,,,,d
-,,,,,,,,,,,,,,,,,,,,`,`,`,`,`,,,,,,,`,`,`
-,,,,,,,,,,,,,,,,,,,,`,`,`,`,`,,,,,,,`,`,`
-,,,,,,,,,,,,,,,,,,,,`,`,`,`,`
-,,,,,,,,,,,,,,,,,,,,`,`,`,`,`
-
-
-
-
-"#build label(services_build3) start(23; 22) hidden() jail, statues"
-
-
-,,,,~,~,~,,,~,~,~,,,~,~,~
-,,,,`,`,`,,,`,`,`,,,`,`,`
-,,,,~,`,~,,,~,`,~,,,~,`,~
-,,,,,~,,,,,~,,,,,~
-,,,,s,`,`,s,s,`,`,`,s,s,`,`,s,,t,l,b,,`,,t,l,b
-,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,,c,~,`,~,`,~,c,~,`
-,,,,s,`,`,`,`,`,`,`,`,`,`,`,s,,`,`,`,,`,,`,`,`
-,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,,,,,,`
-,,,,s,`,`,`,`,`,`,`,`,`,`,`,s,,t,l,b,,`,,t,l,b
-,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,,c,~,`,~,`,~,c,~,`
-,,,,s,`,`,`,`,`,`,`,`,`,`,`,s,,`,`,`,,`,,`,`,`
-,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,,,,,,~
-,,,,s,`,`,`,`,`,`,`,`,`,`,`,s,,~,`,`,`,`,`,`,`,~
-,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,,~,`,`,`,~,`,`,`,~
-,,,,s,`,`,`,`,`,`,`,`,`,`,`,s,,~,`,`,`,~,`,`,`,~,,~,`,s,s,`,~,~,~,~
-,,,,`,`,~,~,~,~,`,~,~,~,~,`,`,,~,`,`,`,`,`,`,`,~,,~,`,`,`,`,`,`,`,~
-,,,,s,`,~,~,~,~,`,~,~,~,~,`,s,,,,,~,,~,,,,,~,`,`,`,`,`,~,`,~
-,,,,`,`,~,~,~,~,`,~,~,~,~,`,`,,,,`,`,`,`,`,,,,`,`,`,`,`,`,`,`,`
-,,,,s,`,~,~,~,~,`,~,~,~,~,`,`,~,`,~,`,`,`,`,`,~,`,~,`,`,`,`,`,`,`,`,~
-,,,,`,`,~,~,~,~,`,~,~,~,~,`,`,,s,,`,`,`,`,`,,s,,`,`,`,`,~,`,`,`,~
-,,,,s,`,~,~,~,~,`,~,~,~,~,`,`,~,`,~,`,`,`,`,`,~,`,~,`,`,`,`,`,`,`,`,~
-,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,,,,`,`,`,`,`,,,,`,`,`,`,`,`,`,`,`
-,,,,~,s,s,~,`,`,`,`,`,~,s,s,~,,,,,,`,,,,,,~,`,`,`,`,`,~,`,~
-,,,,,,,,`,`,,`,`,,,,,,,,,,,,,,,,~,`,`,`,`,`,`,`,~
-,,,,`,`,`,`,`,`,,`,`,`,`,`,`,,,,,,,,,,,,~,`,s,s,`,~,~,~,~
-,,,,`,`,`,`,`,`,,`,`,`,`,`,`
-,,,,`,`,`,`,`,`,,`,`,`,`,`,`
-,,,,`,`,`,`,`,`,,`,`,`,`,`,`
-,,,,`,`,`,`,`,`,,`,`,`,`,`,`
-
-
-#place label(services_place_jail) start(23; 22) hidden()
-
-
-,,,,`,`,`,,,`,`,`,,,`,`,`
-,,,,`,`,`,,,`,`,`,,,`,`,`
-,,,,`,`,`,,,`,`,`,,,`,`,`
-,,,,,`,,,,,`,,,,,`
-,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,,`,,`,`,`
-,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,,`,`,f(1x2),`,`,`,`,`,f(1x2)
-,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,,f(2x1),`,`,,`,,f(2x1),`,`
-,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,,,,,,`
-,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,,`,,`,`,`
-,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,,`,`,f(1x2),`,`,`,`,`,f(1x2)
-,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,,f(2x1),`,`,,`,,f(2x1),`,`
-,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,,,,,,`
-,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,`,`,`,`,`,`
-,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,`,`,`,`,`,`
-,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,`,`,`,`,`,`,,`,`,`,`,`,`,`,`,`
-,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,`,`,`,`,`,`,,`,`,`,`,`,`,`,`,`
-,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,,,,,`,,`,,,,,`,`,`,`,`,`,`,`,`
-,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,,,,`,`,`,`,`,,,,`,`,`,`,`,`,`,`,`
-,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`
-,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,,`,,`,`,`,`,`,,`,,`,`,`,`,`,`,`,`,`
-,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`
-,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,,,,`,`,`,`,`,,,,`,`,`,`,`,`,`,`,`
-,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,,,,,,`,,,,,,`,`,`,`,`,`,`,`,`
-,,,,,,,,`,`,,`,`,,,,,,,,,,,,,,,,`,`,`,`,`,`,`,`,`
-,,,,`,`,`,`,`,`,,`,`,`,`,`,`,,,,,,,,,,,,`,`,`,`,`,`,`,`,`
-,,,,`,`,`,`,`,`,,`,`,`,`,`,`
-,,,,`,`,`,`,`,`,,`,`,`,`,`,`
-,,,,`,`,`,`,`,`,,`,`,`,`,`,`
-,,,,`,`,`,`,`,`,,`,`,`,`,`,`
-
-
-#query label(services_query_jail) start(23; 22) hidden() set up barracks and jail
-
-
-,,,,`,`,`,,,`,`,`,,,`,`,`
-,,,,`,`,`,,,`,`,`,,,`,`,`
-,,,,`,`,`,,,`,`,`,,,`,`,`
-,,,,,`,,,,,`,,,,,`
-,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,,`,,`,`,`
-,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,,`,"r--&j{givename name=""jail3""}","{booze}{givename name=""booze""}",`,`,`,`,"r--&j{givename name=""jail4""}","{booze}{givename name=""booze""}"
-,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,,"{preparedfood}{givename name=""prepared food""}",t{Down 4}&,t{Down 4}&,,`,,"{preparedfood}{givename name=""prepared food""}",t{Down 4}&,t{Down 4}&
-,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,,,,,,`
-,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,,`,,`,`,`
-,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,,`,"r--&j{givename name=""jail1""}","{booze}{givename name=""booze""}",`,`,`,`,"r--&j{givename name=""jail2""}","{booze}{givename name=""booze""}"
-,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,,"{preparedfood}{givename name=""prepared food""}",t{Down 14}{Left 10}&,t{Down 14}{Left 4}&,,`,,"{preparedfood}{givename name=""prepared food""}",t{Left 6}&,t{Left 6}&
-,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,,,,,,`
-,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,`,`,`,`,`,`
-,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,`,`,`,`,`,`
-,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,`,`,`,`,`,`,,`,`,`,`,`,`,`,`,`
-,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,`,`,`,`,`,`,,`,`,`,`,`,`,`,`,`
-,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,,,,,`,,`,,,,,`,`,`,`,`,`,`,`,`
-,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,,,,`,`,`,`,`,,,,`,`,`,`,`,`,`,`,`
-,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`
-,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,,`,,`,`,`,`,`,,`,,`,`,`,`,`,`,`,`,`
-,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`
-,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,,,,`,`,`,`,`,,,,`,`,`,`,`,`,`,`,`
-,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,,,,,,`,,,,,,`,`,`,`,`,`,`,`,`
-,,,,,,,,`,`,,`,`,,,,,,,,,,,,,,,,`,`,`,`,`,`,`,`,`
-,,,,`,`,`,`,`,`,,`,`,`,`,`,`,,,,,,,,,,,,`,`,`,`,`,`,`,`,`
-,,,,`,`,`,`,`,`,,`,`,`,`,`,`
-,,,,`,`,`,`,`,`,,`,`,`,`,`,`
-,,,,`,`,`,`,`,`,,`,`,`,`,`,`
-,,,,`,`,`,`,`,`,,`,`,`,`,`,`
-
+,,,,,,,,,,,,,`,`,`,,`,,`,`,`
+,,,,,,,,,,,,,`,`,`,d,`,d,`,`,`
+,,,,,,,,,,,,,,,,,`
+,,,,,,,,,,,,,,,,,`
+,,,,,,,,,,,,,`,`,`,,`,,`,`,`
+,,,,,,,,,,,,,`,`,`,d,`,d,`,`,`
+,,,,,,,,,,,,,,,,,`
+,,,,,,,,,,,,,,,,,`
+,,,,,,,,,,,,,,,,,`
+,,,,,,,,,,,,,,,,,`
+,,,,,,,,,,,,,,,,,`
+,,,,,,,,,,,,,,,,,`,`,`,`,`,`,`,`,`,`
+,,,,,,,,,,,,,,,,,`,,,,,,,,,`
+,,,,,,,,,,,,,,,,,d,,,,,,,,,`
+,,,,,,,,,,,,,,,`,`,`,`,`,,,,,,,d
+,,,,,,,,,,,,,,,`,`,`,`,`,,,,,,`,`,`
+,,,,,,,,,,,,,,,`,`,`,`,`,,,,,,`,`,`
+,,,,,,,,,,,,,,,`,`,`,`,`
+,,,,,,,,,,,,,,,`,`,`,`,`
+
+"#build label(services_build3) start(18; 18) hidden() jail, statues"
+
+,~,~,~,,~,~,~,,~,~,~,,t,l,b,,`,,t,l,b
+,`,`,`,,`,`,`,,`,`,`,,c,~,`,~,`,~,c,~,`
+,~,`,~,,~,`,~,,~,`,~,,`,`,`,,`,,`,`,`
+,,~,,,,~,,,,~,,,,,,,`
+,`,`,`,s,`,`,`,s,`,`,`,,t,l,b,,`,,t,l,b,,j,`,`,`,j
+,`,`,`,`,`,`,`,`,`,`,`,,c,~,`,~,`,~,c,~,`,,`,`,~,`,`
+,s,`,`,`,`,`,`,`,`,`,s,,`,`,`,,`,,`,`,`,,v,`,t,`,v
+,`,`,`,`,`,`,`,`,`,`,`,,,,,,~,,,,,,`,`,c,`,`
+,s,`,`,`,`,`,`,`,`,`,s,,~,~,~,~,`,~,~,~,~,,j,`,`,`,j
+,`,`,`,`,`,`,`,`,`,`,`,,~,`,`,`,~,`,`,`,`,,,,d
+,s,`,`,`,`,`,`,`,`,`,s,,~,`,`,`,`,`,`,`,`,~,`,`,`
+,`,`,`,`,`,`,`,`,`,`,`,,~,`,`,`,`,`,`,`,`
+,s,`,`,`,`,`,`,`,`,`,s,,~,`,`,`,`,`,`,`,~,,~,,~,,~,,~
+,`,`,`,`,`,`,`,`,`,`,`,,,,,~,,~,,,,,~,,~,,~,,~
+,`,`,`,`,`,`,`,`,`,`,`,,,,`,`,`,`,`,,,,`,s,`,~,`,`,`,~,~
+,`,~,~,~,~,`,~,~,~,~,`,~,`,~,`,`,`,`,`,~,`,~,`,`,`,`,`,`,~
+,`,~,~,~,~,`,~,~,~,~,`,,s,,`,`,`,`,`,,s,,`,`,`,~,`,`,`,~,~
+,`,~,~,~,~,`,~,~,~,~,`,~,`,~,`,`,`,`,`,~,`,~,`,`,`,`,`,`,~
+,`,~,~,~,~,`,~,~,~,~,`,,,,`,`,`,`,`,,,,`,s,`,~,`,`,`,~,~
+,`,~,~,~,~,`,~,~,~,~,`,,,,,,`,,,,,,~,,~,,~,,~
+,`,~,~,~,~,`,~,~,~,~,`,,,,,,,,,,,,~,,~,,~,,~
+,`,~,~,~,~,`,~,~,~,~,`
+,`,~,~,~,~,`,~,~,~,~,`
+,`,~,~,~,~,`,~,~,~,~,`
+,`,~,~,~,~,`,~,~,~,~,`
+,`,`,`,`,`,`,`,`,`,`,`
+,~,`,s,`,`,~,`,`,s,`,~
+,,,,~,~,,~,~
+,`,`,`,`,`,,`,`,`,`,`
+,`,`,`,`,`,,`,`,`,`,`
+,`,`,`,`,`,,`,`,`,`,`
+,`,`,`,`,`,,`,`,`,`,`
+,`,`,`,`,`,,`,`,`,`,`
+
+#place label(services_place_jail) start(18; 18) hidden()
+
+,`,`,`,,`,`,`,,`,`,`,,`,`,`,,`,,`,`,`
+,`,`,`,,`,`,`,,`,`,`,,`,`,f(1x2),`,`,`,`,`,f(1x2)
+,`,`,`,,`,`,`,,`,`,`,,f(2x1),`,`,,`,,f(2x1),`,`
+,,`,,,,`,,,,`,,,,,,,`
+,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,,`,,`,`,`,,`,`,`,`,`
+,`,`,`,`,`,`,`,`,`,`,`,,`,`,f(1x2),`,`,`,`,`,f(1x2),,`,`,`,`,`
+,`,`,`,`,`,`,`,`,`,`,`,,f(2x1),`,`,,`,,f(2x1),`,`,,`,`,`,`,`
+,`,`,`,`,`,`,`,`,`,`,`,,,,,,`,,,,,,`,`,`,`,`
+,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,`,`,`,`,`,`,,`,`,`,`,`
+,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,`,`,`,`,`,`,,,,`
+,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,`,`,`,`,`,`,`,`,`,`
+,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,`,`,`,`,`,`
+,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,`,`,`,`,`,`,,`,,`,,`,,`
+,`,`,`,`,`,`,`,`,`,`,`,,,,,`,,`,,,,,`,,`,,`,,`
+,`,`,`,`,`,`,`,`,`,`,`,,,,`,`,`,`,`,,,,`,`,`,`,`,`,`,`,`
+,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`
+,`,`,`,`,`,`,`,`,`,`,`,,`,,`,`,`,`,`,,`,,`,`,`,`,`,`,`,`,`
+,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`
+,`,`,`,`,`,`,`,`,`,`,`,,,,`,`,`,`,`,,,,`,`,`,`,`,`,`,`,`
+,`,`,`,`,`,`,`,`,`,`,`,,,,,,`,,,,,,`,,`,,`,,`
+,`,`,`,`,`,`,`,`,`,`,`,,,,,,,,,,,,`,,`,,`,,`
+,`,`,`,`,`,`,`,`,`,`,`
+,`,`,`,`,`,`,`,`,`,`,`
+,`,`,`,`,`,`,`,`,`,`,`
+,`,`,`,`,`,`,`,`,`,`,`
+,`,`,`,`,`,`,`,`,`,`,`
+,`,`,`,`,`,`,`,`,`,`,`
+,,,,`,`,,`,`
+,`,`,`,`,`,,`,`,`,`,`
+,`,`,`,`,`,,`,`,`,`,`
+,`,`,`,`,`,,`,`,`,`,`
+,`,`,`,`,`,,`,`,`,`,`
+,`,`,`,`,`,,`,`,`,`,`
+
+#query label(services_query_jail) start(18; 18) hidden() message(Assign the office to the right of the barracks to your Sheriff/Captain of the Guard to use it as your interrogation room) set up barracks and jail
+
+,`,`,`,,`,`,`,,`,`,`,,`,`,`,,`,,`,`,`
+,`,`,`,,`,`,`,,`,`,`,,`,"r--&j{givename name=""jail3""}","{booze}{givename name=""booze""}",`,`,`,`,"r--&j{givename name=""jail4""}","{booze}{givename name=""booze""}"
+,`,`,`,,`,`,`,,`,`,`,,"{preparedfood}{givename name=""prepared food""}",t{Down 4}&,t{Down 4}&,,`,,"{preparedfood}{givename name=""prepared food""}",t{Down 4}&,t{Down 4}&
+,,`,,,,`,,,,`,,,,,,,`
+,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,,`,,`,`,`,,`,`,`,`,`
+,`,`,`,`,`,`,`,`,`,`,`,,`,"r--&j{givename name=""jail1""}","{booze}{givename name=""booze""}",`,`,`,`,"r--&j{givename name=""jail2""}","{booze}{givename name=""booze""}",,`,`,"r+&{givename name=""sheriff's office""}",`,`
+,`,`,`,`,`,`,`,`,`,`,`,,"{preparedfood}{givename name=""prepared food""}",t{Down 22}{Left 10}&,t{Down 22}{Left 4}&,,`,,"{preparedfood}{givename name=""prepared food""}",t{Left 6}&,t{Left 6}&,,`,`,`,`,`
+,`,`,`,`,`,`,`,`,`,`,`,,,,,,`,,,,,,`,`,`,`,`
+,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,`,`,`,`,`,`,,`,`,`,`,`
+,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,`,`,`,`,`,`,,,,"{givename name=""interrogation""}"
+,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,`,`,`,`,`,`,`,`,`,`
+,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,`,`,`,`,`,`
+,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,`,`,`,`,`,`,,`,,`,,`,,`
+,`,`,`,`,`,`,`,`,`,`,`,,,,,`,,`,,,,,`,,`,,`,,`
+,`,`,`,`,`,`,`,`,`,`,`,,,,`,`,`,`,`,,,,`,`,`,`,`,`,`,`,`
+,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`
+,`,`,`,`,`,`,`,`,`,`,`,,`,,`,`,`,`,`,,`,,`,`,`,`,`,`,`,`,`
+,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`
+,`,`,`,`,`,`,`,`,`,`,`,,,,`,`,`,`,`,,,,`,`,`,`,`,`,`,`,`
+,`,`,`,`,`,`,`,`,`,`,`,,,,,,`,,,,,,`,,`,,`,,`
+,`,`,`,`,`,`,`,`,`,`,`,,,,,,,,,,,,`,,`,,`,,`
+,`,`,`,`,`,`,`,`,`,`,`
+,`,`,`,`,`,`,`,`,`,`,`
+,`,`,`,`,`,`,`,`,`,`,`
+,`,`,`,`,`,`,`,`,`,`,`
+,`,`,`,`,`,`,`,`,`,`,`
+,`,`,`,`,`,`,`,`,`,`,`
+,,,,`,`,,`,`
+,`,`,`,`,`,,`,`,`,`,`
+,`,`,`,`,`,,`,`,`,`,`
+,`,`,`,`,`,,`,`,`,`,`
+,`,`,`,`,`,,`,`,`,`,`
+,`,`,`,`,`,,`,`,`,`,`
 
 #notes label(guildhall_help)
 "Eight 7x7 rooms for guildhalls, temples, libraries, etc."
 Screenshot: https://drive.google.com/file/d/17jHiCKeZm6FSS-CI4V0r0GJZh09nzcO_
 ""
 Features:
-"- Big rooms, optionally pre-furnished. Double-thick walls to ensure engravings add value to the ""correct"" side. Declare locations as needed."
+"- Big rooms, optionally pre-furnished. Double-thick walls to ensure engravings add value to the ""correct"" side. Declare locations from the pre-created meeting zones as needed."
 ""
 Guildhall Walkthrough:
 1) Dig out the rooms with /guildhall1.
 ""
 "2) Once the area is dug out, pre-create the zones and add doors and a few statues with /guildhall2. Run ""quickfort orders"" for /guildhall2."
 ""
-"3) Furnish individual rooms manually, or get default furnishings for a variety of room types by running /guildhall3. Declare appropriate locations from the pre-created zones as you need guildhalls, libraries, and temples. If you need more rooms, you can dig another /guildhall1 in an unused z-level."
+"3) Furnish individual rooms manually, or get default furnishings for a variety of room types by running /guildhall3. If you use the default furnishings, also run ""quickfort orders"" for /guildhall3. Declare appropriate locations from the pre-created zones as you need guildhalls, libraries, and temples. If you'd like a ""no specific diety"" temple declared for the top room and a library declared for the bottom room, run /guildhall4. Both locations will be ""Residents only"" by default, but you can change this in the (l)ocation menu if you want them to attract visitors. If you need more rooms, you can dig another /guildhall1 in an unused z-level."
 "#dig label(guildhall1) start(15; 15; central stairs) message(Once the area is dug out, continue with /guildhall2.)"
 
 
@@ -2687,6 +2756,36 @@ Smooth/engrave tiles, furnish rooms, and declare locations as required.) build d
 ,,`,`,`,`,s,`,`,,,h,~c,~c,s,~c,~c,h,,,`,`,s,`,`,`,`
 
 
+"#query label(guildhall4) start(15; 15; central stairs) message(The library and temple are restricted to residents only by default. If you'd like them to attract vistors, please go to the (l)ocation menu and change the restriction.) declare a library and temple"
+
+
+,,`,`,`,`,`,`,`,,,`,`,`,`,`,`,`,,,`,`,`,`,`,`,`
+,,`,`,`,`,`,`,`,,,`,`,`,`,`,`,`,,,`,`,`,`,`,`,`
+,,`,`,`,`,`,`,`,,,`,`,`,`,`,`,`,,,`,`,`,`,`,`,`
+,,`,`,`,`,`,`,`,,,`,`,`,^ilat&^l{Up}r^q,,`,`,,,`,`,`,`,`,`,`
+,,`,`,`,`,`,`,`,,,`,`,`,`,`,`,`,,,`,`,`,`,`,`,`
+,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,`,`,`,`,`,`,`,,,`,`,`,`,`,`,`,,,`,`,`,`,`,`,`
+,,,,,,,`,,,,,,`,,`,,,,,,`
+,,,,,,,`,,,,,,`,`,`,,,,,,`
+,,`,`,`,`,`,`,`,,,,,`,,`,,,,,`,`,`,`,`,`,`
+,,`,`,`,`,`,`,`,,,,`,`,`,`,`,,,,`,`,`,`,`,`,`
+,,`,`,`,`,`,`,`,`,`,`,`,,,,`,`,`,`,`,`,`,`,`,`,`
+,,`,`,`,`,`,`,`,,`,,`,,`,,`,,`,,`,`,`,`,`,`,`
+,,`,`,`,`,`,`,`,`,`,`,`,,,,`,`,`,`,`,`,`,`,`,`,`
+,,`,`,`,`,`,`,`,,,,`,`,`,`,`,,,,`,`,`,`,`,`,`
+,,`,`,`,`,`,`,`,,,,,`,,`,,,,,`,`,`,`,`,`,`
+,,,,,,,`,,,,,,`,`,`,,,,,,`
+,,,,,,,`,,,,,,`,,`,,,,,,`
+,,`,`,`,`,`,`,`,,,`,`,`,`,`,`,`,,,`,`,`,`,`,`,`
+,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,`,`,`,`,`,`,`,,,`,`,`,`,`,`,`,,,`,`,`,`,`,`,`
+,,`,`,`,`,`,`,`,,,`,`,`,^ilal&^l{Up}r^q,,`,`,,,`,`,`,`,`,`,`
+,,`,`,`,`,`,`,`,,,`,`,`,`,`,`,`,,,`,`,`,`,`,`,`
+,,`,`,`,`,`,`,`,,,`,`,`,`,`,`,`,,,`,`,`,`,`,`,`
+,,`,`,`,`,`,`,`,,,`,`,`,`,`,`,`,,,`,`,`,`,`,`,`
+
+
 #notes label(beds_help)
 Suites for nobles and apartments for the teeming masses
 Suites screenshot: https://drive.google.com/file/d/1IBqCf6fF3lw7sHiBE_15Euubysl5AAiS
diff --git a/data/examples/orders/basic.json b/data/examples/orders/basic.json
index e8dee1680..4c785e7ab 100644
--- a/data/examples/orders/basic.json
+++ b/data/examples/orders/basic.json
@@ -563,37 +563,6 @@
 		"is_active" : false,
 		"is_validated" : false,
 		"item_conditions" : 
-		[
-			{
-				"condition" : "AtLeast",
-				"flags" : 
-				[
-					"collected",
-					"dyeable"
-				],
-				"item_type" : "THREAD",
-				"value" : 5
-			},
-			{
-				"condition" : "AtLeast",
-				"flags" : 
-				[
-					"unrotten",
-					"dye"
-				],
-				"value" : 15
-			}
-		],
-		"job" : "DyeThread"
-	},
-	{
-		"amount_left" : 1,
-		"amount_total" : 1,
-		"frequency" : "Daily",
-		"id" : 18,
-		"is_active" : false,
-		"is_validated" : false,
-		"item_conditions" : 
 		[
 			{
 				"condition" : "AtLeast",
@@ -611,7 +580,7 @@
 					"unrotten",
 					"dye"
 				],
-				"value" : 15
+				"value" : 3
 			}
 		],
 		"job" : "DyeCloth"
@@ -620,7 +589,7 @@
 		"amount_left" : 1,
 		"amount_total" : 1,
 		"frequency" : "Daily",
-		"id" : 19,
+		"id" : 18,
 		"is_active" : false,
 		"is_validated" : false,
 		"item_conditions" : 
@@ -655,20 +624,14 @@
 		"amount_left" : 1,
 		"amount_total" : 1,
 		"frequency" : "Daily",
-		"id" : 20,
+		"id" : 19,
 		"is_active" : false,
 		"is_validated" : false,
 		"item_conditions" : 
 		[
 			{
 				"condition" : "AtLeast",
-				"flags" : 
-				[
-					"non_economic",
-					"hard"
-				],
-				"item_type" : "BOULDER",
-				"material" : "INORGANIC",
+				"item_type" : "WOOD",
 				"value" : 20
 			},
 			{
@@ -684,13 +647,16 @@
 		],
 		"item_subtype" : "ITEM_TOOL_JUG",
 		"job" : "MakeTool",
-		"material" : "INORGANIC"
+		"material_category" : 
+		[
+			"wood"
+		]
 	},
 	{
 		"amount_left" : 1,
 		"amount_total" : 1,
 		"frequency" : "Daily",
-		"id" : 21,
+		"id" : 20,
 		"is_active" : false,
 		"is_validated" : false,
 		"item_conditions" : 
@@ -719,7 +685,7 @@
 		"amount_left" : 1,
 		"amount_total" : 1,
 		"frequency" : "Daily",
-		"id" : 22,
+		"id" : 21,
 		"is_active" : false,
 		"is_validated" : false,
 		"item_conditions" : 
@@ -747,7 +713,7 @@
 		"amount_left" : 1,
 		"amount_total" : 1,
 		"frequency" : "Daily",
-		"id" : 23,
+		"id" : 22,
 		"is_active" : false,
 		"is_validated" : false,
 		"item_conditions" : 
@@ -775,7 +741,7 @@
 		"amount_left" : 1,
 		"amount_total" : 1,
 		"frequency" : "Daily",
-		"id" : 24,
+		"id" : 23,
 		"is_active" : false,
 		"is_validated" : false,
 		"item_conditions" : 
@@ -805,7 +771,7 @@
 		"amount_left" : 1,
 		"amount_total" : 1,
 		"frequency" : "Daily",
-		"id" : 25,
+		"id" : 24,
 		"is_active" : false,
 		"is_validated" : false,
 		"item_conditions" : 
@@ -835,7 +801,7 @@
 		"amount_left" : 1,
 		"amount_total" : 1,
 		"frequency" : "Daily",
-		"id" : 26,
+		"id" : 25,
 		"is_active" : false,
 		"is_validated" : false,
 		"item_conditions" : 
@@ -864,7 +830,7 @@
 		"amount_left" : 1,
 		"amount_total" : 1,
 		"frequency" : "Daily",
-		"id" : 27,
+		"id" : 26,
 		"is_active" : false,
 		"is_validated" : false,
 		"item_conditions" : 
@@ -895,7 +861,7 @@
 		"amount_left" : 1,
 		"amount_total" : 1,
 		"frequency" : "Daily",
-		"id" : 28,
+		"id" : 27,
 		"is_active" : false,
 		"is_validated" : false,
 		"item_conditions" : 
@@ -931,7 +897,7 @@
 		"amount_left" : 1,
 		"amount_total" : 1,
 		"frequency" : "Daily",
-		"id" : 29,
+		"id" : 28,
 		"is_active" : false,
 		"is_validated" : false,
 		"item_conditions" : 
@@ -967,7 +933,7 @@
 		"amount_left" : 1,
 		"amount_total" : 1,
 		"frequency" : "Daily",
-		"id" : 30,
+		"id" : 29,
 		"is_active" : false,
 		"is_validated" : false,
 		"item_conditions" : 
@@ -1003,7 +969,7 @@
 		"amount_left" : 1,
 		"amount_total" : 1,
 		"frequency" : "Daily",
-		"id" : 31,
+		"id" : 30,
 		"is_active" : false,
 		"is_validated" : false,
 		"item_conditions" : 
@@ -1022,9 +988,9 @@
 		"amount_left" : 1,
 		"amount_total" : 1,
 		"frequency" : "Daily",
-		"id" : 32,
+		"id" : 31,
 		"is_active" : false,
-		"is_validated" : true,
+		"is_validated" : false,
 		"item_conditions" : 
 		[
 			{
@@ -1048,7 +1014,7 @@
 		"amount_left" : 1,
 		"amount_total" : 1,
 		"frequency" : "Daily",
-		"id" : 33,
+		"id" : 32,
 		"is_active" : false,
 		"is_validated" : false,
 		"item_conditions" : 
@@ -1070,7 +1036,7 @@
 		"amount_left" : 1,
 		"amount_total" : 1,
 		"frequency" : "Daily",
-		"id" : 34,
+		"id" : 33,
 		"is_active" : false,
 		"is_validated" : false,
 		"item_conditions" : 
@@ -1096,7 +1062,7 @@
 		"amount_left" : 1,
 		"amount_total" : 1,
 		"frequency" : "Daily",
-		"id" : 35,
+		"id" : 34,
 		"is_active" : false,
 		"is_validated" : false,
 		"item_conditions" : 
@@ -1122,7 +1088,7 @@
 		"amount_left" : 1,
 		"amount_total" : 1,
 		"frequency" : "Daily",
-		"id" : 36,
+		"id" : 35,
 		"is_active" : false,
 		"is_validated" : false,
 		"item_conditions" : 
@@ -1148,7 +1114,7 @@
 		"amount_left" : 1,
 		"amount_total" : 1,
 		"frequency" : "Daily",
-		"id" : 37,
+		"id" : 36,
 		"is_active" : false,
 		"is_validated" : false,
 		"item_conditions" : 
@@ -1181,7 +1147,7 @@
 		"amount_left" : 1,
 		"amount_total" : 1,
 		"frequency" : "Daily",
-		"id" : 38,
+		"id" : 37,
 		"is_active" : false,
 		"is_validated" : false,
 		"item_conditions" : 
@@ -1220,7 +1186,7 @@
 		"amount_left" : 1,
 		"amount_total" : 1,
 		"frequency" : "Daily",
-		"id" : 39,
+		"id" : 38,
 		"is_active" : false,
 		"is_validated" : false,
 		"item_conditions" : 
@@ -1254,7 +1220,7 @@
 		"amount_left" : 4,
 		"amount_total" : 4,
 		"frequency" : "Daily",
-		"id" : 40,
+		"id" : 39,
 		"is_active" : false,
 		"is_validated" : false,
 		"item_conditions" : 
@@ -1277,7 +1243,7 @@
 		"amount_left" : 1,
 		"amount_total" : 1,
 		"frequency" : "Daily",
-		"id" : 41,
+		"id" : 40,
 		"is_active" : false,
 		"is_validated" : false,
 		"item_conditions" : 
@@ -1301,7 +1267,7 @@
 		"amount_left" : 1,
 		"amount_total" : 1,
 		"frequency" : "Daily",
-		"id" : 42,
+		"id" : 41,
 		"is_active" : false,
 		"is_validated" : false,
 		"item_conditions" : 
@@ -1335,7 +1301,7 @@
 		"amount_left" : 1,
 		"amount_total" : 1,
 		"frequency" : "Daily",
-		"id" : 43,
+		"id" : 42,
 		"is_active" : false,
 		"is_validated" : false,
 		"item_conditions" : 
@@ -1364,7 +1330,7 @@
 		"amount_left" : 1,
 		"amount_total" : 1,
 		"frequency" : "Daily",
-		"id" : 44,
+		"id" : 43,
 		"is_active" : false,
 		"is_validated" : false,
 		"item_conditions" : 
@@ -1393,9 +1359,9 @@
 		"amount_left" : 1,
 		"amount_total" : 1,
 		"frequency" : "Daily",
-		"id" : 45,
+		"id" : 44,
 		"is_active" : false,
-		"is_validated" : true,
+		"is_validated" : false,
 		"item_conditions" : 
 		[
 			{
@@ -1424,7 +1390,7 @@
 		"amount_left" : 1,
 		"amount_total" : 1,
 		"frequency" : "Daily",
-		"id" : 46,
+		"id" : 45,
 		"is_active" : false,
 		"is_validated" : false,
 		"item_conditions" : 
diff --git a/data/quickfort/aliases-common.txt b/data/quickfort/aliases-common.txt
index e918b28a9..f000b5bd1 100644
--- a/data/quickfort/aliases-common.txt
+++ b/data/quickfort/aliases-common.txt
@@ -77,6 +77,11 @@ give10right: {give move={Right 10}}
 togglesequence: &{Down}
 togglesequence2: &{Down 2}
 
+# these aliases use the DFHack "search" plugin to filter the right column
+forbidsearch: s{search}&f{Left}{Right}
+permitsearch: s{search}&p{Left}{Right}
+togglesearch: s{search}&&{Left}{Right}
+
 masterworkonly: {prefix}{Right}{Up 2}f{Right}{Up 2}&^
 artifactonly:   {prefix}{Right}{Up 2}f{Right}{Up}&^
 
@@ -116,7 +121,7 @@ plants:         {foodprefix}b{Right}{Down 4}p^
 booze:          {foodprefix}b{Right}{Down 5}p{Down}p^
 seeds:          {foodprefix}b{Right}{Down 9}p^
 dye:            {foodprefix}b{Right}{Down 11}{Right}{Down 28}{togglesequence 4}^
-tallow:         {foodprefix}b{Right}{Down 13}{Right}stallow&p^
+tallow:         {foodprefix}b{Right}{Down 13}{Right}{permitsearch search=tallow}^
 miscliquid:     {foodprefix}b{Right}{Down 18}p^
 wax:            {foodprefix}b{Right}{Down 15}{Right}{Down 6}&^
 
@@ -126,7 +131,7 @@ forbidplants:         {foodprefix}{Right}{Down 4}f^
 forbidbooze:          {foodprefix}{Right}{Down 5}f{Down}f^
 forbidseeds:          {foodprefix}{Right}{Down 9}f^
 forbiddye:            {foodprefix}{Right}{Down 11}{Right}{Down 28}{togglesequence 4}^
-forbidtallow:         {foodprefix}{Right}{Down 13}{Right}stallow&f^
+forbidtallow:         {foodprefix}{Right}{Down 13}{Right}{forbidsearch search=tallow}^
 forbidmiscliquid:     {foodprefix}{Right}{Down 18}f^
 forbidwax:            {foodprefix}{Right}{Down 15}{Right}{Down 6}&^
 
@@ -136,7 +141,7 @@ permitplants:         {foodprefix}{Right}{Down 4}p^
 permitbooze:          {foodprefix}{Right}{Down 5}p{Down}p^
 permitseeds:          {foodprefix}{Right}{Down 9}p^
 permitdye:            {forbiddye}
-permittallow:         {foodprefix}{Right}{Down 13}{Right}stallow&p^
+permittallow:         {foodprefix}{Right}{Down 13}{Right}{permitsearch search=tallow}^
 permitmiscliquid:     {foodprefix}{Right}{Down 18}p^
 permitwax:            {forbidwax}
 
@@ -200,7 +205,8 @@ shells:      {refuseprefix}b{Right}{Down 5}p^
 teeth:       {refuseprefix}b{Right}{Down 6}p^
 horns:       {refuseprefix}b{Right}{Down 7}p^
 hair:        {refuseprefix}b{Right}{Down 8}p^
-craftrefuse: {skulls}{permitbones}{permitshells}{permitteeth}{permithorns}{permithair}
+usablehair:  {refuseprefix}b{Right}{Down 8}{Right}{togglesearch search=sheep}{togglesearch search=llama}{togglesearch search=alpaca}{togglesearch search=troll}^
+craftrefuse: {skulls}{permitbones}{permitshells}{permitteeth}{permithorns}{permitusablehair}
 
 forbidcorpses:     {refuseprefix}{Right}{Down}f^
 forbidrawhides:    {refuseprefix}{Right 2}{Down}&^
@@ -211,7 +217,8 @@ forbidshells:      {refuseprefix}{Right}{Down 5}f^
 forbidteeth:       {refuseprefix}{Right}{Down 6}f^
 forbidhorns:       {refuseprefix}{Right}{Down 7}f^
 forbidhair:        {refuseprefix}{Right}{Down 8}f^
-forbidcraftrefuse: {forbidskulls}{forbidbones}{forbidshells}{forbidteeth}{forbidhorns}{forbidhair}
+forbidusablehair:  {refuseprefix}{Right}{Down 8}{Right}{forbidsearch search=sheep}{forbidsearch search=llama}{forbidsearch search=alpaca}{forbidsearch search=troll}^
+forbidcraftrefuse: {forbidskulls}{forbidbones}{forbidshells}{forbidteeth}{forbidhorns}{forbidusablehair}
 
 permitcorpses:     {refuseprefix}{Right}{Down}p^
 permitrawhides:    {forbidrawhides}
@@ -222,7 +229,8 @@ permitshells:      {refuseprefix}{Right}{Down 5}p^
 permitteeth:       {refuseprefix}{Right}{Down 6}p^
 permithorns:       {refuseprefix}{Right}{Down 7}p^
 permithair:        {refuseprefix}{Right}{Down 8}p^
-permitcraftrefuse: {permitskulls}{permitbones}{permitshells}{permitteeth}{permithorns}{permithair}
+permitusablehair:  {refuseprefix}{Right}{Down 8}{Right}{permitsearch search=sheep}{permitsearch search=llama}{permitsearch search=alpaca}{permitsearch search=troll}^
+permitcraftrefuse: {permitskulls}{permitbones}{permitshells}{permitteeth}{permithorns}{permitusablehair}
 
 
 ##################################
@@ -352,9 +360,11 @@ finishedgoodsprefix:  {enter_sp_config}{Down 10}
 enablefinishedgoods:  {finishedgoodsprefix}e^
 disablefinishedgoods: {finishedgoodsprefix}d^
 
-crafts:  {finishedgoodsprefix}{Right}f{Right}{Down 9}{togglesequence 9}^
-goblets: {finishedgoodsprefix}{Right}f{Right}{Down 2}&^
-jugs:    {finishedgoodsprefix}{Right}f{Right}{Up 2}&{Left}{Down 2}f{Down}f{Down}f^
+crafts:      {finishedgoodsprefix}{Right}f{Right}{Down 9}{togglesequence 9}^
+goblets:     {finishedgoodsprefix}{Right}f{Right}{Down 2}&^
+jugs:        {finishedgoodsprefix}{Right}f{Right}{Up 2}&{Left}{Down 2}f{Down}f{Down}f^
+stonetools:  {finishedgoodsprefix}{Right}f{Right}{Up 2}&{Left}{Down 2}f{Down}f{Down}f^
+woodentools: {finishedgoodsprefix}{Right}f{Right}{Up 2}&{Left}{Down}f{Down}f{Down}f{Down}f{Right}&^
 
 forbidcrafts:  {finishedgoodsprefix}{Right 2}{Down 9}{togglesequence 9}^
 forbidgoblets: {finishedgoodsprefix}{Right 2}{Down 2}&^
@@ -385,6 +395,15 @@ adamantinethread: {clothprefix}b{Right}{Down 3}p^
 cloth:            {clothprefix}b{Right}{Down 4}p{Down}p{Down}p^
 adamantinecloth:  {clothprefix}b{Right}{Up}p^
 
+forbidthread:           {clothprefix}{Right}f{Down}f{Down}f^
+forbidadamantinethread: {clothprefix}{Right}{Down 3}f^
+forbidcloth:            {clothprefix}{Right}{Down 4}f{Down}f{Down}f^
+forbidadamantinecloth:  {clothprefix}{Right}{Up}f^
+
+permitthread:           {clothprefix}{Right}p{Down}p{Down}p^
+permitadamantinethread: {clothprefix}{Right}{Down 3}p^
+permitcloth:            {clothprefix}{Right}{Down 4}p{Down}p{Down}p^
+permitadamantinecloth:  {clothprefix}{Right}{Up}p^
 
 ##################################
 # weapon stockpile adjustments
diff --git a/dfhack.init-example b/dfhack.init-example
index d181fcaa7..bcc5615d6 100644
--- a/dfhack.init-example
+++ b/dfhack.init-example
@@ -36,6 +36,7 @@ keybinding add Ctrl-Alt-S@dwarfmode/Default quicksave
 
 # gui/quickfort script - apply pre-made blueprints to the map
 keybinding add Ctrl-Shift-Q@dwarfmode gui/quickfort
+keybinding add Alt-F@dwarfmode gui/quickfort
 
 # gui/rename script - rename units and buildings
 keybinding add Ctrl-Shift-N gui/rename
diff --git a/docs/changelog.txt b/docs/changelog.txt
index 4dd8404ac..19518fa75 100644
--- a/docs/changelog.txt
+++ b/docs/changelog.txt
@@ -43,7 +43,16 @@ changelog.txt uses a syntax similar to RST, with a few special sequences:
 ## Misc Improvements
 - `confirm`: added a confirmation dialog for removing manager orders
 - `confirm`: allow players to pause the confirmation dialog until they exit the current screen
-- `dfhack-examples-guide`: refine food preparation orders and fix conditions for making jugs and pots in the ``basic`` manager orders
+- `dfhack-examples-guide`: refine food preparation orders so meal types are chosen intelligently according to the amount of meals that exist and the number of aviailable items to cook with
+- `dfhack-examples-guide`: reduce required stock of dye for "Dye cloth" orders
+- `dfhack-examples-guide`: fix material conditions for making jugs and pots
+- `dfhack-examples-guide`: make wooden jugs by default to differentiate them from other stone tools. this allows players to more easily select jugs out with a properly-configured stockpile (i.e. the new ``woodentools`` alias)
+- `quickfort-alias-guide`: new aliases: ``forbidsearch``, ``permitsearch``, and ``togglesearch`` use the `search-plugin` plugin to alter the settings for a filtered list of item types when configuring stockpiles
+- `quickfort-alias-guide`: new aliases: ``stonetools`` and ``woodentools``.  the ``jugs`` alias is deprecated. please use ``stonetools`` instead, which is the same as the old ``jugs`` alias.
+- `quickfort-alias-guide`: new aliases: ``usablehair``, ``permitusablehair``, and ``forbidusablehair`` alter settings for the types of hair/wool that can be made into cloth: sheep, llama, alpaca, and troll. The ``craftrefuse`` aliases have been altered to use this alias as well.
+- `quickfort-alias-guide`: new aliases: ``forbidthread``, ``permitthread``, ``forbidadamantinethread``, ``permitadamantinethread``, ``forbidcloth``, ``permitcloth``, ``forbidadamantinecloth``, and ``permitadamantinecloth`` give you more control how adamantine-derived items are stored
+- `quickfort`: `Dreamfort <quickfort-blueprint-guide>` blueprint set improvements: automatically create tavern, library, and temple locations (restricted to residents only by default), automatically associate the rented rooms with the tavern
+- `quickfort`: `Dreamfort <quickfort-blueprint-guide>` blueprint set improvements: new design for the services level, including a werebeast-proof hospital recovery rooms and an appropriately-themed interrogation room next to the jail! Also fits better in a 1x1 embark for minimalist players.
 
 ## Documentation
 
diff --git a/docs/guides/quickfort-alias-guide.rst b/docs/guides/quickfort-alias-guide.rst
index 37de7603b..6afad7569 100644
--- a/docs/guides/quickfort-alias-guide.rst
+++ b/docs/guides/quickfort-alias-guide.rst
@@ -521,6 +521,9 @@ give10right
 give              move
 togglesequence
 togglesequence2
+forbidsearch      search
+permitsearch      search
+togglesearch      search
 masterworkonly    prefix
 artifactonly      prefix
 togglemasterwork  prefix
@@ -588,6 +591,12 @@ four adjacent items::
 
     dye: {foodprefix}b{Right}{Down 11}{Right}{Down 28}{togglesequence 4}^
 
+``forbidsearch``, ``permitsearch``, and ``togglesearch`` use the DFHack
+`search-plugin` plugin to forbid or permit a filtered list, or toggle the first
+(or only) item in the list. Specify the search string in the ``search``
+sub-alias. Be sure to move the cursor over to the right column before invoking
+these aliases. The search filter will be cleared before this alias completes.
+
 Finally, the ``masterwork`` and ``artifact`` group of aliases configure the
 corresponding allowable core quality for the stockpile categories that have
 them. This alias is used to implement category-specific aliases below, like
@@ -724,13 +733,16 @@ shells       forbidshells        permitshells
 teeth        forbidteeth         permitteeth
 horns        forbidhorns         permithorns
 hair         forbidhair          permithair
+usablehair   forbidusablehair    permitusablehair
 craftrefuse  forbidcraftrefuse   permitcraftrefuse
 ===========  ==================  ==================
 
 Notes:
 
-* ``craftrefuse`` includes everything a craftsdwarf can use: skulls, bones,
-  shells, teeth, horns, and hair.
+* ``usablehair`` Only hair and wool that can make usable clothing is included,
+  i.e. from sheep, llamas, alpacas, and trolls.
+* ``craftrefuse`` includes everything a craftsdwarf or tailor can use: skulls,
+  bones, shells, teeth, horns, and "usable" hair/wool (defined above).
 
 Stone stockpile adjustments
 ```````````````````````````
@@ -802,7 +814,8 @@ Finished goods stockpile adjustments
 =======================  =============================  =============================
 Exclusive                Forbid                         Permit
 =======================  =============================  =============================
-jugs
+stonetools
+woodentools
 crafts                   forbidcrafts                   permitcrafts
 goblets                  forbidgoblets                  permitgoblets
 masterworkfinishedgoods  forbidmasterworkfinishedgoods  permitmasterworkfinishedgoods
@@ -812,17 +825,18 @@ artifactfinishedgoods    forbidartifactfinishedgoods    permitartifactfinishedgo
 Cloth stockpile adjustments
 ```````````````````````````
 
-+------------------+
-| Exclusive        |
-+==================+
-| thread           |
-+------------------+
-| adamantinethread |
-+------------------+
-| cloth            |
-+------------------+
-| adamantinecloth  |
-+------------------+
+================  ======================  ======================
+Exclusive         Forbid                  Permit
+================  ======================  ======================
+thread            forbidthread            permitthread
+adamantinethread  forbidadamantinethread  permitadamantinethread
+cloth             forbidcloth             permitcloth
+adamantinecloth   forbidadamantinecloth   permitadamantinecloth
+================  ======================  ======================
+
+Notes:
+
+* ``thread`` and ``cloth`` refers to all materials that are not adamantine.
 
 Weapon stockpile adjustments
 ````````````````````````````
diff --git a/docs/guides/quickfort-user-guide.rst b/docs/guides/quickfort-user-guide.rst
index 5225aea34..a886773f9 100644
--- a/docs/guides/quickfort-user-guide.rst
+++ b/docs/guides/quickfort-user-guide.rst
@@ -1418,15 +1418,10 @@ Tips and tricks
 Caveats and limitations
 -----------------------
 
--  If you use the ``jugs`` alias in your ``#query``-mode blueprints, be aware
-   that there is no way to differentiate jugs from other types of tools in the
-   game. Therefore, ``jugs`` stockpiles will also take nest boxes, scroll
-   rollers, and other tools. The only workaround is not to have other tools
-   lying around in your fort.
-
--  Likewise for the ``bags`` alias. The game does not differentiate between
-   empty and full bags, so you'll get bags of gypsum power in your "bags"
-   stockpile unless you are careful to assign all your gypsum to your hospital.
+-  If you use the the ``bags`` alias, be aware that the game does not
+   differentiate between empty and full bags. Therefore, you can get bags of
+   gypsum power in your "bags" stockpile unless you are careful to assign all
+   your gypsum to your hospital.
 
 -  Weapon traps and upright spear/spike traps can currently only be built with a
    single weapon.

From c277d7cedb83977f22ce1c6d3aafda449db044b2 Mon Sep 17 00:00:00 2001
From: DFHack-Urist via GitHub Actions
 <63161697+DFHack-Urist@users.noreply.github.com>
Date: Fri, 3 Jun 2022 20:03:29 +0000
Subject: [PATCH 085/854] Auto-update submodules

scripts: master
---
 scripts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts b/scripts
index b70dec06c..1ff42c6ef 160000
--- a/scripts
+++ b/scripts
@@ -1 +1 @@
-Subproject commit b70dec06ca2a8622bce6cdece7153852356591f2
+Subproject commit 1ff42c6ef47933f4cb71fcd333f9ff520678e11f

From 514e5ee5bb2e228e4d4564042aab037473e487ca Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Fri, 3 Jun 2022 13:18:16 -0700
Subject: [PATCH 086/854] convert status message to debug message

ref: #2164
---
 plugins/confirm.cpp | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/plugins/confirm.cpp b/plugins/confirm.cpp
index 60735ef94..bf102d2ba 100644
--- a/plugins/confirm.cpp
+++ b/plugins/confirm.cpp
@@ -5,6 +5,7 @@
 #include "Console.h"
 #include "Core.h"
 #include "DataDefs.h"
+#include "Debug.h"
 #include "Error.h"
 #include "Export.h"
 #include "LuaTools.h"
@@ -50,6 +51,9 @@ bool paused = false;
 // if set, confirm will unpause when this screen is no longer on the stack
 df::viewscreen *paused_screen = NULL;
 
+namespace DFHack {
+    DBG_DECLARE(confirm,status);
+}
 
 template <typename VT, typename FT>
 inline bool in_vector (std::vector<VT> &vec, FT item)
@@ -238,7 +242,7 @@ namespace conf_lua {
         }
         int unpause(lua_State *)
         {
-            Core::getInstance().print("unpausing\n");
+            DEBUG(status).print("unpausing\n"),
             paused = false;
             paused_screen = NULL;
             return 0;
@@ -333,7 +337,7 @@ public:
                 set_state(SELECTED);
             else if (input->count(df::interface_key::CUSTOM_P))
             {
-                Core::getInstance().print("pausing\n");
+                DEBUG(status).print("pausing\n"),
                 paused = true;
                 // only record the screen when we're not at the top viewscreen
                 // since this screen will *always* be on the stack. for

From d9addb0f24a10c9797307f39d14c726d7ba722e5 Mon Sep 17 00:00:00 2001
From: Myk <myk002@yahoo.com>
Date: Fri, 3 Jun 2022 13:19:56 -0700
Subject: [PATCH 087/854] [gui/quantum] add integration test (#2175)

* add integration test for gui/quantum

* exercise the gui/quantum ui a little more
---
 .../ecosystem/golden/gui_quantum-build.csv    |   5 +
 .../ecosystem/golden/gui_quantum-place.csv    |   6 +
 .../test/ecosystem/golden/meta-dig.csv        |   2 +-
 .../test/ecosystem/golden/transform-build.csv |   2 +-
 .../test/ecosystem/golden/transform-dig.csv   |   2 +-
 .../test/ecosystem/in/gui_quantum-build.csv   |   1 +
 .../test/ecosystem/in/gui_quantum-place.csv   |   2 +
 .../test/ecosystem/in/gui_quantum-spec.csv    |   5 +
 test/quickfort/ecosystem.lua                  | 164 +++++++++++++++---
 9 files changed, 165 insertions(+), 24 deletions(-)
 create mode 100644 data/blueprints/library/test/ecosystem/golden/gui_quantum-build.csv
 create mode 100644 data/blueprints/library/test/ecosystem/golden/gui_quantum-place.csv
 create mode 100644 data/blueprints/library/test/ecosystem/in/gui_quantum-build.csv
 create mode 100644 data/blueprints/library/test/ecosystem/in/gui_quantum-place.csv
 create mode 100644 data/blueprints/library/test/ecosystem/in/gui_quantum-spec.csv

diff --git a/data/blueprints/library/test/ecosystem/golden/gui_quantum-build.csv b/data/blueprints/library/test/ecosystem/golden/gui_quantum-build.csv
new file mode 100644
index 000000000..102c98f4a
--- /dev/null
+++ b/data/blueprints/library/test/ecosystem/golden/gui_quantum-build.csv
@@ -0,0 +1,5 @@
+#build label(build)
+
+
+
+,,CSdd
diff --git a/data/blueprints/library/test/ecosystem/golden/gui_quantum-place.csv b/data/blueprints/library/test/ecosystem/golden/gui_quantum-place.csv
new file mode 100644
index 000000000..0cb7a5b6b
--- /dev/null
+++ b/data/blueprints/library/test/ecosystem/golden/gui_quantum-place.csv
@@ -0,0 +1,6 @@
+#place label(place)
+s(5x3)
+
+
+
+,,afunswebhlzSgpd
diff --git a/data/blueprints/library/test/ecosystem/golden/meta-dig.csv b/data/blueprints/library/test/ecosystem/golden/meta-dig.csv
index 827ccaf73..456d2ba92 100644
--- a/data/blueprints/library/test/ecosystem/golden/meta-dig.csv
+++ b/data/blueprints/library/test/ecosystem/golden/meta-dig.csv
@@ -1,4 +1,4 @@
-#dig label(dig)
+#dig label(dig) start(3;3)
 d,d,,,d
 d,,j,,d
 d,u,d,u,d
diff --git a/data/blueprints/library/test/ecosystem/golden/transform-build.csv b/data/blueprints/library/test/ecosystem/golden/transform-build.csv
index feb7a3cb5..2cab6e804 100644
--- a/data/blueprints/library/test/ecosystem/golden/transform-build.csv
+++ b/data/blueprints/library/test/ecosystem/golden/transform-build.csv
@@ -1,4 +1,4 @@
-#build label(build)
+#build label(build) start(14;14)
 ,trackNS,trackE,,trackW,trackS,trackN,,gs(1x2),ga(2x1),,gx(1x2),gw(1x2),,gw(1x2),gx(1x2),gd(2x1),,gs(1x2),,trackN,trackS,trackE,,trackW,trackNS
 trackEW,,trackSE,,trackSW,trackNE,trackNW,,,gd(2x1),,,,,,,ga(2x1),,,,trackNE,trackNW,trackSE,,trackSW,,trackEW
 trackS,trackSE,,,trackNSE,trackNSW,trackEW,,Mrsssqq(2x1),,,Msh,,,,,Msk,Mrsqq(2x1),,,trackEW,trackNSE,trackNSW,,,trackSW,trackS
diff --git a/data/blueprints/library/test/ecosystem/golden/transform-dig.csv b/data/blueprints/library/test/ecosystem/golden/transform-dig.csv
index 3772f2d5f..b26339d8a 100644
--- a/data/blueprints/library/test/ecosystem/golden/transform-dig.csv
+++ b/data/blueprints/library/test/ecosystem/golden/transform-dig.csv
@@ -1,4 +1,4 @@
-#dig label(dig)
+#dig label(dig) start(14;14)
 ,d,d,,d,d,d,,d,d,d,d,d,,d,d,d,d,d,,d,d,d,,d,d
 d,,d,,d,d,d,,d,d,d,d,d,,d,d,d,d,d,,d,d,d,,d,,d
 d,d,,,d,d,d,,d,d,d,d,d,,d,d,d,d,d,,d,d,d,,,d,d
diff --git a/data/blueprints/library/test/ecosystem/in/gui_quantum-build.csv b/data/blueprints/library/test/ecosystem/in/gui_quantum-build.csv
new file mode 100644
index 000000000..ebbc0207d
--- /dev/null
+++ b/data/blueprints/library/test/ecosystem/in/gui_quantum-build.csv
@@ -0,0 +1 @@
+#build
diff --git a/data/blueprints/library/test/ecosystem/in/gui_quantum-place.csv b/data/blueprints/library/test/ecosystem/in/gui_quantum-place.csv
new file mode 100644
index 000000000..ec9f6e42d
--- /dev/null
+++ b/data/blueprints/library/test/ecosystem/in/gui_quantum-place.csv
@@ -0,0 +1,2 @@
+#place label(place)
+s(5x3)
diff --git a/data/blueprints/library/test/ecosystem/in/gui_quantum-spec.csv b/data/blueprints/library/test/ecosystem/in/gui_quantum-spec.csv
new file mode 100644
index 000000000..91fde500d
--- /dev/null
+++ b/data/blueprints/library/test/ecosystem/in/gui_quantum-spec.csv
@@ -0,0 +1,5 @@
+#notes
+description=integration test for the gui/quantum script
+width=5
+height=5
+extra_fn=test_gui_quantum
diff --git a/test/quickfort/ecosystem.lua b/test/quickfort/ecosystem.lua
index 320dc9979..39d0f6be1 100644
--- a/test/quickfort/ecosystem.lua
+++ b/test/quickfort/ecosystem.lua
@@ -10,9 +10,11 @@
 --   height (required)
 --   depth (default is 1)
 --   start (cursor offset for input blueprints, default is 1,1)
+--   extra_fn (the name of a global function in this file to run after applying
+--             all blueprints but before comparing results)
 --
 -- depends on blueprint, buildingplan, and dig-now plugins (as well as the
--- quickfort script, of course)
+-- quickfort script and anything else run in the extra_fns, of course)
 --
 -- note that this test harness cannot (yet) test #query blueprints that define
 -- rooms since furniture is not actually built during the test. It also cannot
@@ -24,10 +26,18 @@
 config.mode = 'fortress'
 
 local argparse = require('argparse')
+local gui = require('gui')
+local guidm = require('gui.dwarfmode')
+local utils = require('utils')
+
 local blueprint = require('plugins.blueprint')
+local confirm = require('plugins.confirm')
+
+local assign_minecarts = reqscript('assign-minecarts')
+local quantum = reqscript('gui/quantum')
+local quickfort = reqscript('quickfort')
 local quickfort_list = reqscript('internal/quickfort/list')
 local quickfort_command = reqscript('internal/quickfort/command')
-local utils = require('utils')
 
 local blueprints_dir = 'blueprints/'
 local input_dir = 'library/test/ecosystem/in/'
@@ -86,14 +96,14 @@ local function get_blueprint_sets()
             local _,_,file_part = fname:find('/([^/]+)$')
             local _,_,basename = file_part:find('^([^-.]+)')
             if not sets[basename] then sets[basename] = {spec={}, phases={}} end
-            local golden_path = blueprints_dir..golden_dir..file_part
-            if not os_exists(golden_path) then
-                golden_path = blueprints_dir..fname
+            local golden_path = golden_dir..file_part
+            if not os_exists(blueprints_dir..golden_path) then
+                golden_path = fname
             end
             sets[basename].phases[phase] = {
                 listnum=listnum,
                 golden_filepath=golden_path,
-                output_filepath=blueprints_dir..output_dir..file_part}
+                output_filepath=output_dir..file_part}
         end
     end
 
@@ -193,17 +203,17 @@ local function get_cursor_arg(pos, start)
     return ('--cursor=%d,%d,%d'):format(pos.x+start.x-1, pos.y+start.y-1, pos.z)
 end
 
-local function quickfort_cmd(cmd, listnum, pos, start)
-    dfhack.run_script('quickfort', cmd, '-q', listnum,
+local function quickfort_cmd(cmd, listnum_or_path, pos, start)
+    dfhack.run_script('quickfort', cmd, '-q', listnum_or_path,
                       get_cursor_arg(pos, start))
 end
 
-local function quickfort_run(listnum, pos, start)
-    quickfort_cmd('run', listnum, pos, start)
+local function quickfort_run(listnum_or_path, pos, start)
+    quickfort_cmd('run', listnum_or_path, pos, start)
 end
 
-local function quickfort_undo(listnum, pos, start)
-    quickfort_cmd('undo', listnum, pos, start)
+local function quickfort_undo(listnum_or_path, pos, start)
+    quickfort_cmd('undo', listnum_or_path, pos, start)
 end
 
 local function designate_area(pos, spec)
@@ -224,10 +234,20 @@ local function run_dig_now(area)
                        format_pos(area.endpos), '--clean')
 end
 
-local function run_blueprint(basename, set, pos)
-    blueprint.run(tostring(set.spec.width), tostring(set.spec.height),
-                  tostring(-set.spec.depth), output_dir..basename,
-                  get_cursor_arg(pos), '-tphase')
+local function get_playback_start_arg(start)
+    if not start then return end
+    return ('--playback-start=%d,%d'):format(start.x, start.y)
+end
+
+local function run_blueprint(basename, spec, pos)
+    local args = {tostring(spec.width), tostring(spec.height),
+                  tostring(-spec.depth), output_dir..basename,
+                  get_cursor_arg(pos), '-tphase'}
+    local playback_start_arg = get_playback_start_arg(spec.start)
+    if playback_start_arg then
+        table.insert(args, playback_start_arg)
+    end
+    blueprint.run(table.unpack(args))
 end
 
 local function reset_area(area, spec)
@@ -308,13 +328,19 @@ function test.end_to_end()
         if phases.zone then do_phase(phases.zone, area, spec) end
         if phases.query then do_phase(phases.query, area, spec) end
 
+        -- run any extra commands, if defined by the blueprint spec
+        if spec.extra_fn then
+            _ENV[spec.extra_fn](area.pos)
+        end
+
         -- run blueprint to generate files in output dir
-        run_blueprint(basename, set, area.pos)
+        run_blueprint(basename, spec, area.pos)
 
-        -- quickfort undo blueprints
+        -- quickfort undo blueprints (order shouldn't matter)
         for _,phase_name in ipairs(phase_names) do
             if phases[phase_name] then
-                quickfort_undo(phases[phase_name].listnum, area.pos, spec.start)
+                quickfort_undo(phases[phase_name].golden_filepath,
+                               area.pos, spec.start)
             end
         end
 
@@ -326,8 +352,8 @@ function test.end_to_end()
         for phase,phase_data in pairs(phases) do
             if phase == 'notes' then goto continue end
             print(('  verifying phase: %s'):format(phase))
-            local golden_filepath = phase_data.golden_filepath
-            local output_filepath = phase_data.output_filepath
+            local golden_filepath = blueprints_dir..phase_data.golden_filepath
+            local output_filepath = blueprints_dir..phase_data.output_filepath
             local input_hash, input_size = md5File(golden_filepath)
             local output_hash, output_size = md5File(output_filepath)
             expect.eq(input_hash, output_hash,
@@ -345,6 +371,7 @@ function test.end_to_end()
                 input:close()
                 output:close()
                 expect.table_eq(input_lines, output_lines)
+                return nil
             end
             ::continue::
         end
@@ -352,3 +379,98 @@ function test.end_to_end()
         ::continue::
     end
 end
+
+local function send_keys(...)
+    local keys = {...}
+    for _,key in ipairs(keys) do
+        gui.simulateInput(dfhack.gui.getCurViewscreen(true), key)
+    end
+end
+
+function test_gui_quantum(pos)
+    local vehicles = assign_minecarts.get_free_vehicles()
+    local confirm_state = confirm.isEnabled()
+    local confirm_conf = confirm.get_conf_data()
+    local routes = df.global.ui.hauling.routes
+    local num_routes = #routes
+    local next_order_id = df.global.world.manager_order_next_id
+
+    return dfhack.with_finalize(
+        function()
+            -- unforbid the minecarts we forbade
+            for _,minecart in ipairs(vehicles) do
+                local item = df.item.find(minecart.item_id)
+                if not item then error('could not find item in list') end
+                item.flags.forbid = false
+            end
+
+            if confirm_state then
+                dfhack.run_command('enable confirm')
+                for _,c in pairs(confirm_conf) do
+                    confirm.set_conf_state(c.id, c.enabled)
+                end
+            end
+        end,
+        function()
+            -- forbid all available minecarts
+            for _,minecart in ipairs(vehicles) do
+                local item = df.item.find(minecart.item_id)
+                if not item then error('could not find item in list') end
+                item.flags.forbid = true
+            end
+
+            dfhack.run_script('gui/quantum')
+            local view = quantum.view
+            view:onRender()
+            guidm.setCursorPos(pos)
+            -- select the feeder stockpile
+            send_keys('CURSOR_RIGHT', 'CURSOR_RIGHT', 'SELECT')
+            view:onRender()
+            -- deselect the feeder stockpile
+            send_keys('LEAVESCREEN')
+            view:onRender()
+            -- reselect the feeder stockpile
+            send_keys('SELECT')
+            view:onRender()
+            -- set a custom name
+            send_keys('CUSTOM_N')
+            view:onRender()
+            view:onInput({_STRING=string.byte('f')})
+            view:onInput({_STRING=string.byte('o')})
+            view:onInput({_STRING=string.byte('o')})
+            send_keys('SELECT')
+            -- rotate the dump direction to the south
+            send_keys('CUSTOM_D')
+            view:onRender()
+            -- move the cursor to the dump position
+            send_keys('CURSOR_DOWN', 'CURSOR_DOWN', 'CURSOR_DOWN')
+            view:onRender()
+            -- commit and dismiss the dialog
+            send_keys('SELECT', 'SELECT')
+
+            -- verify the created route
+            expect.eq(num_routes + 1, #routes)
+            local route = routes[#routes-1]
+            expect.eq(0, #route.vehicle_ids, 'minecart should not be assigned')
+            expect.eq(1, #route.stops, 'should have 1 stop')
+            expect.eq(1, #route.stops[0].stockpiles,
+                      'should have 1 link')
+
+            -- verify the created order
+            expect.eq(next_order_id + 1, df.global.world.manager_order_next_id)
+            local orders = df.global.world.manager_orders
+            local order = orders[#orders - 1]
+            expect.eq(df.job_type.MakeTool, order.job_type)
+
+            -- if confirm is enabled, temporarily disable it so we can remove
+            -- the route and manager order via the ui (easier than walking the
+            -- structures and carefully deleting all the memory)
+            if confirm_state then
+                dfhack.run_command('disable confirm')
+            end
+            -- delete last route
+            quickfort.apply_blueprint{mode='config', data='h--x^'}
+            -- delete last manager order
+            quickfort.apply_blueprint{mode='config', data='jm{Up}r^^'}
+        end)
+end

From a8916a269e14137093837a68f70f159e1a977533 Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Fri, 3 Jun 2022 13:36:09 -0700
Subject: [PATCH 088/854] fix syntax error

ref: #2164
---
 plugins/confirm.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/confirm.cpp b/plugins/confirm.cpp
index bf102d2ba..32da4e1f8 100644
--- a/plugins/confirm.cpp
+++ b/plugins/confirm.cpp
@@ -242,7 +242,7 @@ namespace conf_lua {
         }
         int unpause(lua_State *)
         {
-            DEBUG(status).print("unpausing\n"),
+            DEBUG(status).print("unpausing\n");
             paused = false;
             paused_screen = NULL;
             return 0;
@@ -337,7 +337,7 @@ public:
                 set_state(SELECTED);
             else if (input->count(df::interface_key::CUSTOM_P))
             {
-                DEBUG(status).print("pausing\n"),
+                DEBUG(status).print("pausing\n");
                 paused = true;
                 // only record the screen when we're not at the top viewscreen
                 // since this screen will *always* be on the stack. for

From f290b1c804f6207afc786b3a3ca83e8cd87c44d9 Mon Sep 17 00:00:00 2001
From: DFHack-Urist via GitHub Actions
 <63161697+DFHack-Urist@users.noreply.github.com>
Date: Sat, 4 Jun 2022 07:16:44 +0000
Subject: [PATCH 089/854] Auto-update submodules

library/xml: master
scripts: master
---
 library/xml | 2 +-
 scripts     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/library/xml b/library/xml
index f503096c1..b5ec10a98 160000
--- a/library/xml
+++ b/library/xml
@@ -1 +1 @@
-Subproject commit f503096c130661dda7a9b7e4b471b0854981f0f5
+Subproject commit b5ec10a9817d0990f8c39cceb0c3a2cb69fca10c
diff --git a/scripts b/scripts
index 1ff42c6ef..a1f31a8d9 160000
--- a/scripts
+++ b/scripts
@@ -1 +1 @@
-Subproject commit 1ff42c6ef47933f4cb71fcd333f9ff520678e11f
+Subproject commit a1f31a8d99db600b225f1022c490bfa63ade935a

From 42c35b05cc8e30bff3bbf5654af3165bcc921ab8 Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Fri, 3 Jun 2022 17:02:01 -0700
Subject: [PATCH 090/854] update help text for library blueprints

refer users to gui/blueprint for interactive positioning
---
 data/blueprints/library/aquifer_tap.csv | 13 +++++++------
 data/blueprints/library/pump_stack.csv  | 22 +++++++++++-----------
 2 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/data/blueprints/library/aquifer_tap.csv b/data/blueprints/library/aquifer_tap.csv
index 22025d8e7..649e9161e 100644
--- a/data/blueprints/library/aquifer_tap.csv
+++ b/data/blueprints/library/aquifer_tap.csv
@@ -5,21 +5,21 @@ Here's the procedure:
 ""
 1) Dig a tunnel from where you want the water to end up (e.g. your well cistern) off to an unused portion of the map. Be sure to dig a one-tile-wide diagonal segment in this tunnel so water that will eventually flow through the tunnel is depressurized.
 ""
-"2) From the end of that tunnel, dig a staircase straight up to the z-level just below the lowest aquifer level. Also dig the staircase down one z-level."
+"2) From the end of that tunnel, dig a staircase straight up to the z-level just below the lowest aquifer level. Also dig the staircase down one z-level below the tunnel level."
 ""
-"3) From the bottom of the staircase (the z-level below where the water will flow to your cisterns), dig a straight, one-tile wide tunnel to the edge of the map. Smooth the map edge tile and carve a fortification. The water can flow through the fortification and off the map, allowing the dwarves to dig out the aquifer tap without drowning."
+"3) From the bottom of the staircase (the z-level below where the water will flow to your cisterns), dig a straight, one-tile wide tunnel to the edge of the map. This is your drainage tunnel. Smooth the map edge tile and carve a fortification. The water can flow through the fortification and off the map, allowing the dwarves to dig out the aquifer tap without drowning."
 ""
-4) Place a lever-controlled floodgate in the drainage tunnel and open the floodgate.
+4) Place a lever-controlled floodgate in the drainage tunnel and open the floodgate. Place the lever somewhere else in your fort so that it will remain dry and accessible.
 ""
-"5) If you care about how nice things look, haul away any boulders and smooth the tiles. You won't be able to access any of this area once it fills up with water!"
+"5) If you care about how nice things look, haul away any boulders in the tunnels and smooth the tiles. You won't be able to access any of this area once it fills up with water!"
 ""
-"6) Apply this blueprint (quickfort run library/aquifer_tap.csv -n /dig) to the z-level above the top of the staircase, inside the lowest aquifer level. Do not unpause until after the next step."
+"6) Apply this blueprint (gui/quickfort library/aquifer_tap.csv -n /dig) to the z-level above the top of the staircase, inside the lowest aquifer level. Do not unpause until after the next step."
 ""
 "7) Damp tiles cancel dig designations if the tile is currently hidden, so to avoid having to re-apply this blueprint after every tile your dwarves dig, position the cursor straight up (north) of the left-most tile designated for digging and straight left (west) of the topmost designated tile and run the following commands in the DFHack console:"
 tiletypes-command f any ; f designated 1 ; p any ; p hidden 0 ; r 23 23 1
 tiletypes-here
 ""
-"8) Unpause and dig out the tap. If you care about appearances, haul away any boulders and feel free to remove the ramps (d-z). The water will safely flow down the staircase, through the open floodgate, and off the map until you choose to close the floodgate."
+"8) Unpause and dig out the tap. If you care about appearances, haul away any boulders and feel free to remove the ramps (d-z). The water will safely flow down the staircase, through the open floodgate, down the drainage tunnel, and off the map until you choose to close the floodgate."
 
 "9) Once everything is dug out and all dwarves are out of the waterways, close the floodgate. Your cisterns will fill with water. Since the waterway to your cisterns is depressurized, the cisterns will stay forever full, but will not flood."
 ""
@@ -58,3 +58,4 @@ u <- drainage level
 ,,,,,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r
 ,,,,,,,,,,,,r
 ,,,,,,,,,,,,r
+
diff --git a/data/blueprints/library/pump_stack.csv b/data/blueprints/library/pump_stack.csv
index c49a2c310..6bd129308 100644
--- a/data/blueprints/library/pump_stack.csv
+++ b/data/blueprints/library/pump_stack.csv
@@ -1,23 +1,23 @@
 #notes label(help)
 A pump stack is useful for moving water or magma up through the z-levels.
 ""
-To use these blueprints:
+"These blueprints can be used from the quickfort commandline, but are much easier to use with the visual interface. That way you can check the vertical path interactively before you apply. Run gui/quickfort pump_stack"
 ""
-1) Measure how many z-levels the pump stack should span.
+"1) Select the ""dig"" blueprint and position the blueprint preview on the bottom level of the future pump stack. It should be on the z-level just above the liquid you want to pump."
 ""
-"2) Position the cursor on the bottom level of the future pump stack. It should be on the z-level just above the liquid you want to pump. Run ""quickfort run library/pump_stack.csv -n /dig2SN"" to see where the suction hole will end up. Replace ""run"" with ""undo"" in the previous command to clean up."
+"2) Enable repetitions with the ""R"" hotkey and lock the blueprint in place with the ""L"" hotkey. Move up the z-levels to check that the pump stack has a clear path and doesn't intersect with any open areas (e.g. caverns). Increase the number of repetitions with the ""+"" or ""*"" hotkeys if you need the pump stack to extend further up. Unlock the blueprint and shift it around if you need to, then lock it again to recheck the vertical path."
 ""
-"3) If you need an East-West pump stack, or if you need the staircase in another spot, use the ""--transform"" commandline option to alter the blueprint to your needs. For example: ""quickfort run library/pump_stack.csv -n /dig2SN --transform rotcw,fliph"". If you use a transformation, be sure to use the same option for the remaining commandlines."
+"3) If you need to flip the pump stack around to make it fit through the rock layers, enable transformations with the ""t"" hotkey and rotate/flip the blueprint with Ctrl+arrow keys."
 ""
-"4) Once you have everything lined up, run ""quickfort run library/pump_stack.csv -n /dig2SN --repeat up,20"" to designate the entire pump stack for digging. Replace that last ""20"" with the height of your pump stack divided by 2 (since each repetition of /dig2SN is two z-levels high). If the height ends up being one too many at the top, manually undesignate the top level."
+"4) Once you have everything lined up, hit Enter to apply. If the height ends up being one too many at the top, manually undesignate the top level."
 ""
-"5) Since you do not need to transmit power down below the lowest level, replace the channel designation on the middle tile of the bottom-most pump stack level with a regular dig designation. Likewise, replace the Up/Down staircase designation on the lowest level with an Up staircase designation."
+"5) Since you do not need to transmit power down below the lowest level, replace the channel designation on the middle tile of the bottom-most pump stack level with a regular dig designation. Likewise, replace the Up/Down staircase designation on the lowest level with an Up staircase designation. Otherwise you might get magma critters climbing up through your access stairway!"
 ""
-"6) After the stack is dug out, prepare for building by setting the buildingplan plugin material filters for screw pumps (b-M-s-M). If you are planning to move magma, be sure to select magma-safe materials."
+"6) After the stack is dug out, prepare for building by setting the buildingplan plugin material filters for screw pumps (b-M-s-M). If you are planning to move magma, be sure to select magma-safe materials (like green glass) for all three components of the screw pump."
 ""
-"7) Finally, position the cursor back on the access stairs on the lowest level and run ""quickfort run library/pump_stack.csv -n /build2SN --repeat up,20"" (with 20 replaced with your desired repetition count and with your --transform command, if any)."
+"7) Finally, position the cursor back on the access stairs on the lowest level and run the ""build"" blueprint with the same repetition and transformation settings that you used for the ""dig"" blueprint. As you manufacture the materials you need to construct the screw pumps, your dwarves will build the pump stack from the bottom up."
 ""
-"Sometimes, a screw pump will spontaneously deconstruct while you are building the stack. This will reduce the efficiency of the stack a little, but it's nothing to worry about. Just re-run the /build2SN blueprint over the entire stack to ""fix up"" any broken pieces. The blueprint will harmlessly skip over any correctly-built screw pumps."
+"Sometimes, a screw pump will spontaneously deconstruct while you are building the stack. This will reduce the efficiency of the stack a little, but it's nothing to worry about. Just re-run the ""build"" blueprint over the entire stack to ""fix up"" any broken pieces. The blueprint will harmlessly skip over any correctly-built screw pumps."
 ""
 See the wiki for more info on pump stacks: https://dwarffortresswiki.org/index.php/Screw_pump#Pump_stack
 #dig label(digSN) start(2;4;on access stairs) hidden() for a pump from south level
@@ -34,7 +34,7 @@ See the wiki for more info on pump stacks: https://dwarffortresswiki.org/index.p
 ,i,,h
 ,,,d
 
-#meta label(dig2SN) start(at the bottom level on the access stairs) 2 levels of pump stack - bottom level pumps from the south
+#meta label(dig) start(at the bottom level on the access stairs) 2 levels of pump stack - bottom level pumps from the south
 /digSN
 #<
 /digNS
@@ -52,7 +52,7 @@ See the wiki for more info on pump stacks: https://dwarffortresswiki.org/index.p
 ,`,,Msu
 ,,,`
 
-#meta label(build2SN) start(at the bottom level on the access stairs) 2 levels of pump stack - bottom level pumps from the south
+#meta label(build) start(at the bottom level on the access stairs) 2 levels of pump stack - bottom level pumps from the south
 /buildSN
 #<
 /buildNS

From 3928bb67d7fbff07703286f8d4831b6631ff3947 Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Fri, 3 Jun 2022 17:15:57 -0700
Subject: [PATCH 091/854] promote gui/quickfort in the library guide

also add a link to the TheQuickFortress online spreadsheets
---
 docs/guides/quickfort-library-guide.rst | 25 ++++++++++++++-----------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/docs/guides/quickfort-library-guide.rst b/docs/guides/quickfort-library-guide.rst
index 366272052..2f9b3a06f 100644
--- a/docs/guides/quickfort-library-guide.rst
+++ b/docs/guides/quickfort-library-guide.rst
@@ -7,10 +7,12 @@ Blueprint Library Index
 This guide contains a high-level overview of the blueprints available in the
 :source:`quickfort blueprint library <data/blueprints/library>`. You can list
 library blueprints by running ``quickfort list --library`` or by hitting
-:kbd:`Alt`:kbd:`l` in the ``quickfort gui`` interactive dialog.
+:kbd:`Alt`:kbd:`l` in the ``gui/quickfort`` file load dialog.
 
 Each file is hyperlinked to its online version so you can see exactly what the
-blueprints do before you run them.
+blueprints do before you run them. Also, if you use `gui/quickfort`, you will
+get a live preview of which tiles will be modified by the blueprint before you
+apply it to your map.
 
 Whole fort blueprint sets
 -------------------------
@@ -34,7 +36,7 @@ automate basic fort needs, such as food, booze, and item production. It can
 function by itself or as the core of a larger, more ambitious fortress. Read the
 high-level walkthrough by running ``quickfort run library/dreamfort.csv`` and
 list the walkthroughs for the individual levels by running ``quickfort list -l
-dreamfort -m notes`` or ``quickfort gui -l dreamfort notes``.
+dreamfort -m notes`` or ``gui/quickfort dreamfort notes``.
 
 Dreamfort blueprints are available for easy viewing and copying `online
 <https://drive.google.com/drive/folders/1iS90EEVqUkxTeZiiukVj1pLloZqabKuP>`__.
@@ -47,14 +49,14 @@ and a convenient `checklist
 <https://docs.google.com/spreadsheets/d/13PVZ2h3Mm3x_G1OXQvwKd7oIR2lK4A1Ahf6Om1kFigw/edit#gid=1459509569>`__
 from which you can copy the ``quickfort`` commands.
 
-You can download a fully built Dreamfort-based fort from `dffd
+If you like, you can download a fully built Dreamfort-based fort from `dffd
 <https://dffd.bay12games.com/file.php?id=15434>`__, load it, and explore it
 interactively.
 
 Visual overview
 ```````````````
 
-Here are some annotated screenshots of the major levels (or click `here
+Here are annotated screenshots of the major Dreamfort levels (or click `here
 <https://drive.google.com/drive/folders/14KdE2E2wQKj4F_E-NAe3G3E4x1wiWtrc>`__
 for a slideshow).
 
@@ -136,7 +138,8 @@ The Quick Fortress is an updated version of the example fortress that came with
 inspired DFHack quickfort). While it is not a complete fortress by
 itself, it is much simpler than Dreamfort and is good for a first introduction
 to `quickfort` blueprints. Read its walkthrough with ``quickfort run
-library/quickfortress.csv``.
+library/quickfortress.csv`` or view the blueprints `online
+<https://docs.google.com/spreadsheets/d/1WuLYZBM6S2nt-XsPS30kpDnngpOQCuIdlw4zjrcITdY>`__.
 
 Layout helpers
 --------------
@@ -205,8 +208,8 @@ running ``quickfort run library/aquifer_tap.csv -n /help``.
 You can see how to nullify the water pressure (so you don't flood your fort) in
 the `Dreamfort screenshot above <example-plumbing-to-fill-cisterns>`.
 
-Blueprint spreadsheet also available
-`online <https://docs.google.com/spreadsheets/d/1kwuCipF9FYAHNP9C_XlMpqVseaPu4SmL9YLUSQkbW4s/edit#gid=611877584>`__
+The blueprint spreadsheet is also available
+`online <https://docs.google.com/spreadsheets/d/1kwuCipF9FYAHNP9C_XlMpqVseaPu4SmL9YLUSQkbW4s/edit#gid=611877584>`__.
 
 Post-embark
 ~~~~~~~~~~~
@@ -219,9 +222,9 @@ starting stockpiles.
 Pump Stack
 ~~~~~~~~~~
 
-The pump stack blueprints help you move water and magma up to move convenient
+The pump stack blueprints help you move water and magma up to more convenient
 locations in your fort. See the step-by-step guide for using it by running
 ``quickfort run library/pump_stack.csv -n /help``.
 
-Blueprint spreadsheet also available
-`online <https://docs.google.com/spreadsheets/d/1TP2n-W-O9f30Dtl6yoTcn6yczWQRu11iM7U6TEE9634/edit#gid=0>`__
+The blueprint spreadsheet is also available
+`online <https://docs.google.com/spreadsheets/d/1TP2n-W-O9f30Dtl6yoTcn6yczWQRu11iM7U6TEE9634/edit#gid=0>`__.

From 1424e8c867f8b7d3be31c339e113ae33c173f928 Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Fri, 3 Jun 2022 17:19:11 -0700
Subject: [PATCH 092/854] remove extra EOF newline

---
 data/blueprints/library/aquifer_tap.csv | 1 -
 1 file changed, 1 deletion(-)

diff --git a/data/blueprints/library/aquifer_tap.csv b/data/blueprints/library/aquifer_tap.csv
index 649e9161e..3cc560ce8 100644
--- a/data/blueprints/library/aquifer_tap.csv
+++ b/data/blueprints/library/aquifer_tap.csv
@@ -58,4 +58,3 @@ u <- drainage level
 ,,,,,r,r,r,r,r,r,r,r,r,r,r,r,r,r,r
 ,,,,,,,,,,,,r
 ,,,,,,,,,,,,r
-

From 7b2cb8f9a631b8b44bfc2ff1f4e684d34b18b5f6 Mon Sep 17 00:00:00 2001
From: DFHack-Urist via GitHub Actions
 <63161697+DFHack-Urist@users.noreply.github.com>
Date: Sun, 5 Jun 2022 07:16:27 +0000
Subject: [PATCH 093/854] Auto-update submodules

library/xml: master
---
 library/xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/library/xml b/library/xml
index b5ec10a98..a24581cc5 160000
--- a/library/xml
+++ b/library/xml
@@ -1 +1 @@
-Subproject commit b5ec10a9817d0990f8c39cceb0c3a2cb69fca10c
+Subproject commit a24581cc5318bdbc6227f368f67bc03a9082c19c

From 46f80bed3daeb105e6350a6ef12854447c245663 Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Sun, 5 Jun 2022 21:46:24 -0700
Subject: [PATCH 094/854] allow ccache to function again

---
 .github/workflows/build.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 07febaa63..15c653bf8 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -65,7 +65,9 @@ jobs:
       uses: actions/cache@v2
       with:
         path: ~/.ccache
-        key: ccache-${{ matrix.os }}-gcc-${{ matrix.gcc }}
+        key: ccache-${{ matrix.os }}-gcc-${{ matrix.gcc }}-${{ github.sha }}
+        restore-keys: |
+          ccache-${{ matrix.os }}-gcc-${{ matrix.gcc }}
     - name: Download DF
       run: |
         sh ci/download-df.sh

From 5e0a947d518be1494f9b9f7135e668454812a261 Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Mon, 6 Jun 2022 01:49:00 -0400
Subject: [PATCH 095/854] Fix changelog entry and release for #2028

---
 docs/changelog.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/changelog.txt b/docs/changelog.txt
index 19518fa75..0e3c90855 100644
--- a/docs/changelog.txt
+++ b/docs/changelog.txt
@@ -111,6 +111,7 @@ changelog.txt uses a syntax similar to RST, with a few special sequences:
 
 ## API
 - add functions reverse-engineered from ambushing unit code: ``Units::isHidden()``, ``Units::isFortControlled()``, ``Units::getOuterContainerRef()``, ``Items::getOuterContainerRef()``
+- ``Job::removeJob()``: use the job cancel vmethod graciously provided by The Toady One in place of a synthetic method derived from reverse engineering
 
 ## Lua
 - `custom-raw-tokens`: library for accessing tokens added to raws by mods
@@ -161,7 +162,6 @@ changelog.txt uses a syntax similar to RST, with a few special sequences:
 
 ## API
 - ``Buildings::findCivzonesAt()``: lookups now complete in constant time instead of linearly scanning through all civzones in the game
-- ``Job::remove_postings()``: use the job cancel vmethod graciously provided by The Toady One in place of a synthetic method derived from reverse engineering
 
 ## Lua
 - ``argparse.processArgsGetopt()``: you can now have long form parameters that are not an alias for a short form parameter. For example, you can now have a parameter like ``--longparam`` without needing to have an equivalent one-letter ``-l`` param.

From 97775766efe353c7e0a202af4644a07bc04cc445 Mon Sep 17 00:00:00 2001
From: DFHack-Urist via GitHub Actions
 <63161697+DFHack-Urist@users.noreply.github.com>
Date: Mon, 6 Jun 2022 07:16:06 +0000
Subject: [PATCH 096/854] Auto-update submodules

scripts: master
---
 scripts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts b/scripts
index a1f31a8d9..52e21c5e0 160000
--- a/scripts
+++ b/scripts
@@ -1 +1 @@
-Subproject commit a1f31a8d99db600b225f1022c490bfa63ade935a
+Subproject commit 52e21c5e0c78e17acdad23f94efffb043290d5b5

From 1f6726bb031da11c54b79edf18c018b76e5e99f7 Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Sun, 5 Jun 2022 21:54:53 -0700
Subject: [PATCH 097/854] namespace the ccache key with the repo and branch

---
 .github/workflows/build.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 15c653bf8..6dbb43e15 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -65,8 +65,9 @@ jobs:
       uses: actions/cache@v2
       with:
         path: ~/.ccache
-        key: ccache-${{ matrix.os }}-gcc-${{ matrix.gcc }}-${{ github.sha }}
+        key: ccache-${{ matrix.os }}-gcc-${{ matrix.gcc }}-${{ github.repository_owner }}-${{ github.ref_name }}-${{ github.sha }}
         restore-keys: |
+          ccache-${{ matrix.os }}-gcc-${{ matrix.gcc }}-${{ github.repository_owner }}-${{ github.ref_name }}
           ccache-${{ matrix.os }}-gcc-${{ matrix.gcc }}
     - name: Download DF
       run: |

From 9c31e4b42384fc6cb1f1fd5de0ba73fd77cf1127 Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Sun, 5 Jun 2022 22:02:25 -0700
Subject: [PATCH 098/854] change the key so we no longer match our old cache

---
 .github/workflows/build.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 6dbb43e15..8ab2221c7 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -65,10 +65,10 @@ jobs:
       uses: actions/cache@v2
       with:
         path: ~/.ccache
-        key: ccache-${{ matrix.os }}-gcc-${{ matrix.gcc }}-${{ github.repository_owner }}-${{ github.ref_name }}-${{ github.sha }}
+        key: ccache-v2-${{ matrix.os }}-gcc-${{ matrix.gcc }}-${{ github.repository_owner }}-${{ github.ref_name }}-${{ github.sha }}
         restore-keys: |
-          ccache-${{ matrix.os }}-gcc-${{ matrix.gcc }}-${{ github.repository_owner }}-${{ github.ref_name }}
-          ccache-${{ matrix.os }}-gcc-${{ matrix.gcc }}
+          ccache-v2-${{ matrix.os }}-gcc-${{ matrix.gcc }}-${{ github.repository_owner }}-${{ github.ref_name }}
+          ccache-v2-${{ matrix.os }}-gcc-${{ matrix.gcc }}
     - name: Download DF
       run: |
         sh ci/download-df.sh

From 24d2e8e115b0c4721b34191d04863ea216e5f2b8 Mon Sep 17 00:00:00 2001
From: Myk <myk002@yahoo.com>
Date: Sun, 5 Jun 2022 23:41:11 -0700
Subject: [PATCH 099/854] Update build.yml

---
 .github/workflows/build.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 8ab2221c7..4ef4187be 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -65,9 +65,9 @@ jobs:
       uses: actions/cache@v2
       with:
         path: ~/.ccache
-        key: ccache-v2-${{ matrix.os }}-gcc-${{ matrix.gcc }}-${{ github.repository_owner }}-${{ github.ref_name }}-${{ github.sha }}
+        key: ccache-v2-${{ matrix.os }}-gcc-${{ matrix.gcc }}-${{ github.ref_name }}-${{ github.sha }}
         restore-keys: |
-          ccache-v2-${{ matrix.os }}-gcc-${{ matrix.gcc }}-${{ github.repository_owner }}-${{ github.ref_name }}
+          ccache-v2-${{ matrix.os }}-gcc-${{ matrix.gcc }}-${{ github.ref_name }}
           ccache-v2-${{ matrix.os }}-gcc-${{ matrix.gcc }}
     - name: Download DF
       run: |

From 1a4a2ec63a1a967d2726dd7b13443d4f7c9b7d1a Mon Sep 17 00:00:00 2001
From: "pre-commit-ci[bot]"
 <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Date: Mon, 6 Jun 2022 19:34:53 +0000
Subject: [PATCH 100/854] [pre-commit.ci] pre-commit autoupdate
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

updates:
- [github.com/python-jsonschema/check-jsonschema: 0.14.3 → 0.16.0](https://github.com/python-jsonschema/check-jsonschema/compare/0.14.3...0.16.0)
- [github.com/Lucas-C/pre-commit-hooks: v1.1.13 → v1.2.0](https://github.com/Lucas-C/pre-commit-hooks/compare/v1.1.13...v1.2.0)
---
 .pre-commit-config.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 336bda270..d1bb4ccff 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -20,11 +20,11 @@ repos:
       args: ['--fix=lf']
     - id: trailing-whitespace
 - repo: https://github.com/python-jsonschema/check-jsonschema
-  rev: 0.14.3
+  rev: 0.16.0
   hooks:
     - id: check-github-workflows
 - repo: https://github.com/Lucas-C/pre-commit-hooks
-  rev: v1.1.13
+  rev: v1.2.0
   hooks:
     - id: forbid-tabs
       exclude_types:

From f1ebfe94419d12ef42b7f932a651b1630a071e1e Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Sun, 5 Jun 2022 21:21:23 -0700
Subject: [PATCH 101/854] key the DF cache on the hash of download-df.sh

---
 .github/workflows/build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 4ef4187be..31fde3b1d 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -60,7 +60,7 @@ jobs:
       uses: actions/cache@v2
       with:
         path: ~/DF
-        key: ${{ steps.env_setup.outputs.df_version }}
+        key: ${{ steps.env_setup.outputs.df_version }}-${{ hashFiles('ci/download-df.sh') }}
     - name: Fetch ccache
       uses: actions/cache@v2
       with:

From c940f086b5fea09234eb9de3e773a667c0843b99 Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Mon, 6 Jun 2022 16:38:40 -0700
Subject: [PATCH 102/854] make the extra_fns functionality clearer

---
 .../library/test/ecosystem/in/gui_quantum-spec.csv   |  2 +-
 test/quickfort/ecosystem.lua                         | 12 ++++++++----
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/data/blueprints/library/test/ecosystem/in/gui_quantum-spec.csv b/data/blueprints/library/test/ecosystem/in/gui_quantum-spec.csv
index 91fde500d..7ba7b2ecb 100644
--- a/data/blueprints/library/test/ecosystem/in/gui_quantum-spec.csv
+++ b/data/blueprints/library/test/ecosystem/in/gui_quantum-spec.csv
@@ -2,4 +2,4 @@
 description=integration test for the gui/quantum script
 width=5
 height=5
-extra_fn=test_gui_quantum
+extra_fn=gui_quantum
diff --git a/test/quickfort/ecosystem.lua b/test/quickfort/ecosystem.lua
index 39d0f6be1..716f22e01 100644
--- a/test/quickfort/ecosystem.lua
+++ b/test/quickfort/ecosystem.lua
@@ -10,8 +10,10 @@
 --   height (required)
 --   depth (default is 1)
 --   start (cursor offset for input blueprints, default is 1,1)
---   extra_fn (the name of a global function in this file to run after applying
---             all blueprints but before comparing results)
+--   extra_fn (the name of a function in the extra_fns table in this file to
+--             run after applying all blueprints but before comparing results.
+--             this function will get the map coordinate of the upper-left
+--             corner of the test area passed to it)
 --
 -- depends on blueprint, buildingplan, and dig-now plugins (as well as the
 -- quickfort script and anything else run in the extra_fns, of course)
@@ -301,6 +303,8 @@ local function do_dig_phase(phase_data, area, spec)
     run_dig_now(area)
 end
 
+local extra_fns = {}
+
 function test.end_to_end()
     -- read in test plan
     local sets = get_blueprint_sets()
@@ -330,7 +334,7 @@ function test.end_to_end()
 
         -- run any extra commands, if defined by the blueprint spec
         if spec.extra_fn then
-            _ENV[spec.extra_fn](area.pos)
+            extra_fns[spec.extra_fn](area.pos)
         end
 
         -- run blueprint to generate files in output dir
@@ -387,7 +391,7 @@ local function send_keys(...)
     end
 end
 
-function test_gui_quantum(pos)
+function extra_fns.gui_quantum(pos)
     local vehicles = assign_minecarts.get_free_vehicles()
     local confirm_state = confirm.isEnabled()
     local confirm_conf = confirm.get_conf_data()

From 40a6fcdd9928d482e409801078d365b41de4e5c5 Mon Sep 17 00:00:00 2001
From: DFHack-Urist via GitHub Actions
 <63161697+DFHack-Urist@users.noreply.github.com>
Date: Tue, 7 Jun 2022 07:18:05 +0000
Subject: [PATCH 103/854] Auto-update submodules

library/xml: master
scripts: master
---
 library/xml | 2 +-
 scripts     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/library/xml b/library/xml
index a24581cc5..51991bb39 160000
--- a/library/xml
+++ b/library/xml
@@ -1 +1 @@
-Subproject commit a24581cc5318bdbc6227f368f67bc03a9082c19c
+Subproject commit 51991bb39224fee8111fc5edce026dcbabf078ad
diff --git a/scripts b/scripts
index 52e21c5e0..5ae30f01d 160000
--- a/scripts
+++ b/scripts
@@ -1 +1 @@
-Subproject commit 52e21c5e0c78e17acdad23f94efffb043290d5b5
+Subproject commit 5ae30f01d9d96453d6ef435d018686db4b4a76f7

From ec2f2446d2a674ffd965167626cba1e78dcd7861 Mon Sep 17 00:00:00 2001
From: DFHack-Urist via GitHub Actions
 <63161697+DFHack-Urist@users.noreply.github.com>
Date: Wed, 8 Jun 2022 07:18:16 +0000
Subject: [PATCH 104/854] Auto-update submodules

library/xml: master
scripts: master
---
 library/xml | 2 +-
 scripts     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/library/xml b/library/xml
index 51991bb39..482c43cf7 160000
--- a/library/xml
+++ b/library/xml
@@ -1 +1 @@
-Subproject commit 51991bb39224fee8111fc5edce026dcbabf078ad
+Subproject commit 482c43cf7bef8642fb9a85e834ffbabfd6dc4a03
diff --git a/scripts b/scripts
index 5ae30f01d..a25389df2 160000
--- a/scripts
+++ b/scripts
@@ -1 +1 @@
-Subproject commit 5ae30f01d9d96453d6ef435d018686db4b4a76f7
+Subproject commit a25389df2a7d8f99d0dc2d5e6f298a05f88d63f4

From f146cced95452f6d1455527b1accd944923b11be Mon Sep 17 00:00:00 2001
From: Josh Cooper <cooper.s.josh@outlook.com>
Date: Sun, 5 Jun 2022 13:03:38 -0700
Subject: [PATCH 105/854] Adds definition for "undeclared reference"

---
 plugins/debug.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/plugins/debug.cpp b/plugins/debug.cpp
index 30a5028f8..4fbc48759 100644
--- a/plugins/debug.cpp
+++ b/plugins/debug.cpp
@@ -511,6 +511,8 @@ private:
     DebugManager::categorySignal_t::Connection connection_;
 };
 
+constexpr const char* FilterManager::configPath;
+
 FilterManager::~FilterManager()
 {
 }

From 0eb9eee7738db2429a4b97edc09a7f6ea2dc9596 Mon Sep 17 00:00:00 2001
From: Josh Cooper <cooper.s.josh@outlook.com>
Date: Sun, 5 Jun 2022 13:04:16 -0700
Subject: [PATCH 106/854] Fixes presumed typo in if statement

---
 plugins/embark-assistant/matcher.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/plugins/embark-assistant/matcher.cpp b/plugins/embark-assistant/matcher.cpp
index 52348ea33..e550b5ca2 100644
--- a/plugins/embark-assistant/matcher.cpp
+++ b/plugins/embark-assistant/matcher.cpp
@@ -475,7 +475,8 @@ namespace embark_assist {
                 return;  //  We're at the world edge, so no incursions from the outside.
             }
 
-            if (!&survey_results->at(fetch_x).at(fetch_y).surveyed) {
+            if (!survey_results->at(fetch_x).at(fetch_y).surveyed) {
+                // todo: this has never been executed before /*std::cerr << hello, is anybody out there*/
                 *failed_match = true;
                 return;
             }

From f8d46a10c107881d51a863267f0ab34ab231e712 Mon Sep 17 00:00:00 2001
From: Josh Cooper <cooper.s.josh@outlook.com>
Date: Sun, 5 Jun 2022 13:05:14 -0700
Subject: [PATCH 107/854] Removes unhelpful inheritance

---
 plugins/prospector.cpp              | 6 +++---
 plugins/stockpiles/StockpileUtils.h | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/plugins/prospector.cpp b/plugins/prospector.cpp
index 7bc8f2388..6b2079cf0 100644
--- a/plugins/prospector.cpp
+++ b/plugins/prospector.cpp
@@ -85,10 +85,10 @@ bool operator>(const matdata & q1, const matdata & q2)
     return q1.count > q2.count;
 }
 
-template<typename _Tp = matdata >
-struct shallower : public binary_function<_Tp, _Tp, bool>
+template<typename Tp = matdata >
+struct shallower
 {
-    bool operator()(const _Tp& top, const _Tp& bottom) const
+    bool operator()(const Tp& top, const Tp& bottom) const
     {
         float topavg = (top.lower_z + top.upper_z)/2.0f;
         float btmavg = (bottom.lower_z + bottom.upper_z)/2.0f;
diff --git a/plugins/stockpiles/StockpileUtils.h b/plugins/stockpiles/StockpileUtils.h
index 8558485e4..f5570be92 100644
--- a/plugins/stockpiles/StockpileUtils.h
+++ b/plugins/stockpiles/StockpileUtils.h
@@ -52,7 +52,7 @@ static inline size_t find_plant ( const std::string &plant_id )
     return linear_index ( df::global::world->raws.plants.all, &df::plant_raw::id, plant_id );
 }
 
-struct less_than_no_case: public std::binary_function< char,char,bool >
+struct less_than_no_case
 {
    bool operator () (char x, char y) const
    {

From cec8a358b5e7c34a7aa5870b762718e7958bba87 Mon Sep 17 00:00:00 2001
From: Josh Cooper <cooper.s.josh@outlook.com>
Date: Sun, 5 Jun 2022 13:05:30 -0700
Subject: [PATCH 108/854] Replaces deprecated code with lambdas

---
 plugins/uicommon.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/uicommon.h b/plugins/uicommon.h
index 54a948eb2..dc57c9374 100644
--- a/plugins/uicommon.h
+++ b/plugins/uicommon.h
@@ -174,13 +174,13 @@ static inline void set_to_limit(int &value, const int maximum, const int min = 0
 
 // trim from start
 static inline std::string &ltrim(std::string &s) {
-    s.erase(s.begin(), std::find_if(s.begin(), s.end(), std::not1(std::ptr_fun<int, int>(std::isspace))));
+    s.erase(s.begin(), std::find_if(s.begin(), s.end(), [](char x){ return !std::isspace(x); }));
     return s;
 }
 
 // trim from end
 static inline std::string &rtrim(std::string &s) {
-    s.erase(std::find_if(s.rbegin(), s.rend(), std::not1(std::ptr_fun<int, int>(std::isspace))).base(), s.end());
+    s.erase(std::find_if(s.rbegin(), s.rend(), [](char x){ return !std::isspace(x); }).base(), s.end());
     return s;
 }
 

From 04058c752958712dbc035b2e41a9ad11e4489991 Mon Sep 17 00:00:00 2001
From: Josh Cooper <cppcooper@users.noreply.github.com>
Date: Wed, 8 Jun 2022 11:47:22 -0700
Subject: [PATCH 109/854] Update matcher.cpp

---
 plugins/embark-assistant/matcher.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/plugins/embark-assistant/matcher.cpp b/plugins/embark-assistant/matcher.cpp
index e550b5ca2..011a65fa3 100644
--- a/plugins/embark-assistant/matcher.cpp
+++ b/plugins/embark-assistant/matcher.cpp
@@ -476,7 +476,8 @@ namespace embark_assist {
             }
 
             if (!survey_results->at(fetch_x).at(fetch_y).surveyed) {
-                // todo: this has never been executed before /*std::cerr << hello, is anybody out there*/
+                // If the data has been collected, incursion processing should be performed to evaluate whether a match actually is present.
+                // but if it hasn't we need to return with a failed_match
                 *failed_match = true;
                 return;
             }

From 62e7303c68f35660c94a4ef80583b7440545d1a3 Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Wed, 8 Jun 2022 17:48:14 -0400
Subject: [PATCH 110/854] Upgrade pre-commit-hooks to v4.3.0 (+ submodules)

This contains a fix on Windows that checks for the executable bit according to
Git, instead of according to Windows, which reduces false-positive
"check-executables-have-shebangs" failures.
---
 .pre-commit-config.yaml | 2 +-
 library/xml             | 2 +-
 scripts                 | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index d1bb4ccff..774c42a95 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -4,7 +4,7 @@ ci:
 repos:
 # shared across repos:
 - repo: https://github.com/pre-commit/pre-commit-hooks
-  rev: v4.2.0
+  rev: v4.3.0
   hooks:
     - id: check-added-large-files
     - id: check-case-conflict
diff --git a/library/xml b/library/xml
index 482c43cf7..5dd972b8b 160000
--- a/library/xml
+++ b/library/xml
@@ -1 +1 @@
-Subproject commit 482c43cf7bef8642fb9a85e834ffbabfd6dc4a03
+Subproject commit 5dd972b8b5823e46a1b418fe483d4913347a13b1
diff --git a/scripts b/scripts
index a25389df2..5246b643a 160000
--- a/scripts
+++ b/scripts
@@ -1 +1 @@
-Subproject commit a25389df2a7d8f99d0dc2d5e6f298a05f88d63f4
+Subproject commit 5246b643a91e109e934b7fb75f4cf3780ecadc85

From ff373bb9e242103cacf7f93f5e0e55f1ed8b6a20 Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Wed, 8 Jun 2022 16:44:06 -0700
Subject: [PATCH 111/854] use extlinks where appropriate in docs

---
 docs/guides/examples-guide.rst          | 4 ++--
 docs/guides/quickfort-library-guide.rst | 5 ++---
 docs/guides/quickfort-user-guide.rst    | 3 +--
 3 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/docs/guides/examples-guide.rst b/docs/guides/examples-guide.rst
index 409ceaa00..d643ec15f 100644
--- a/docs/guides/examples-guide.rst
+++ b/docs/guides/examples-guide.rst
@@ -91,8 +91,8 @@ order to save resources. It handles:
 - adamantine processing
 - item melting
 
-Orders are missing for plaster powder until DF `bug 11803
-<https://www.bay12games.com/dwarves/mantisbt/view.php?id=11803>`_ is fixed.
+Orders are missing for plaster powder until DF :bug:`bug 11803 <11803>` is
+fixed.
 
 :source:`military.json <data/examples/orders/military.json>`
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
diff --git a/docs/guides/quickfort-library-guide.rst b/docs/guides/quickfort-library-guide.rst
index 2f9b3a06f..ab80bab5f 100644
--- a/docs/guides/quickfort-library-guide.rst
+++ b/docs/guides/quickfort-library-guide.rst
@@ -49,9 +49,8 @@ and a convenient `checklist
 <https://docs.google.com/spreadsheets/d/13PVZ2h3Mm3x_G1OXQvwKd7oIR2lK4A1Ahf6Om1kFigw/edit#gid=1459509569>`__
 from which you can copy the ``quickfort`` commands.
 
-If you like, you can download a fully built Dreamfort-based fort from `dffd
-<https://dffd.bay12games.com/file.php?id=15434>`__, load it, and explore it
-interactively.
+If you like, you can download a fully built Dreamfort-based fort from
+:dffd:`dffd <15434>`, load it, and explore it interactively.
 
 Visual overview
 ```````````````
diff --git a/docs/guides/quickfort-user-guide.rst b/docs/guides/quickfort-user-guide.rst
index a886773f9..e92b7d3e8 100644
--- a/docs/guides/quickfort-user-guide.rst
+++ b/docs/guides/quickfort-user-guide.rst
@@ -1462,8 +1462,7 @@ parts that might not be obvious just from looking at them.
 If you haven't built Dreamfort before, maybe try an embark in a flat area and
 take it for a spin! It will help put the following sections in context. There is
 also a pre-built Dreamfort available for download on
-`dffd <https://dffd.bay12games.com/file.php?id=15434>`__ if you just want an
-interactive reference.
+:dffd:`dffd <15434>` if you just want an interactive reference.
 
 Dreamfort organization and packaging
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

From 698dc562223ce33cc7f14aa3cd9b2febd47b9f81 Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Sun, 5 Jun 2022 19:20:02 -0400
Subject: [PATCH 112/854] GitHub Actions: Upgrade newest matrix entry to Ubuntu
 22.04, GCC 12

---
 .github/workflows/build.yml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 31fde3b1d..285a44578 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -17,9 +17,12 @@ jobs:
         plugins:
         - default
         include:
-        - os: ubuntu-20.04
+        - os: ubuntu-22.04
           gcc: 11
           plugins: all
+        - os: ubuntu-22.04
+          gcc: 12
+          plugins: all
     steps:
     - name: Set up Python 3
       uses: actions/setup-python@v2

From 4152be13c70758d0d8d0385e6ec6f6294543458e Mon Sep 17 00:00:00 2001
From: Myk <myk002@yahoo.com>
Date: Wed, 8 Jun 2022 19:02:58 -0700
Subject: [PATCH 113/854] Simplify bug extlink

---
 docs/guides/examples-guide.rst | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/docs/guides/examples-guide.rst b/docs/guides/examples-guide.rst
index d643ec15f..8ea463d8c 100644
--- a/docs/guides/examples-guide.rst
+++ b/docs/guides/examples-guide.rst
@@ -91,8 +91,7 @@ order to save resources. It handles:
 - adamantine processing
 - item melting
 
-Orders are missing for plaster powder until DF :bug:`bug 11803 <11803>` is
-fixed.
+Orders are missing for plaster powder until DF :bug:`11803` is fixed.
 
 :source:`military.json <data/examples/orders/military.json>`
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

From 3f6b30af15dc023341e711f0096788763b3b7785 Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Wed, 8 Jun 2022 22:01:52 -0400
Subject: [PATCH 114/854] Update stonesense

---
 plugins/stonesense | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/stonesense b/plugins/stonesense
index 290862549..841803ca6 160000
--- a/plugins/stonesense
+++ b/plugins/stonesense
@@ -1 +1 @@
-Subproject commit 2908625499accc4899e9a9f0e999c95be26ce14d
+Subproject commit 841803ca6f173f4d97eea376b4dcd512336e35e2

From e3f617d98e59363daca706a36f26afc0c1f89d01 Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Wed, 8 Jun 2022 22:18:13 -0400
Subject: [PATCH 115/854] build.yml: Force CMake to use ccache

CMake in the Ubuntu 22.04 environment doesn't seem to pick up on ccache
implicitly anymore.
---
 .github/workflows/build.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 285a44578..bbb44a2cd 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -90,6 +90,8 @@ jobs:
           -DBUILD_SIZECHECK:BOOL=${{ matrix.plugins == 'all' }} \
           -DBUILD_STONESENSE:BOOL=${{ matrix.plugins == 'all' }} \
           -DBUILD_SUPPORTED:BOOL=1 \
+          -DCMAKE_C_COMPILER_LAUNCHER=ccache \
+          -DCMAKE_CXX_COMPILER_LAUNCHER=ccache \
           -DCMAKE_INSTALL_PREFIX="$DF_FOLDER"
     - name: Build DFHack
       run: |

From b3618810c37afa5acc04f5d906e52271ba51ba4f Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Wed, 8 Jun 2022 22:21:48 -0400
Subject: [PATCH 116/854] Add ccache stats to build output

---
 .github/workflows/build.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index bbb44a2cd..02e6709fb 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -96,6 +96,7 @@ jobs:
     - name: Build DFHack
       run: |
         ninja -C build-ci install
+        ccache --show-stats
     - name: Run tests
       id: run_tests
       run: |

From fbdeba62168a83dbce81894f5ad086329f815458 Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Thu, 9 Jun 2022 01:02:37 -0400
Subject: [PATCH 117/854] Force consistent ccache cache directory

This changed to use ~/.cache/ccache instead of ~/.ccache in ccache 4.

Squashed: fixed to expand `$HOME` in a shell, because `~` in an `env:` block
does not get expanded.
---
 .github/workflows/build.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 02e6709fb..e48aaad06 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -59,6 +59,7 @@ jobs:
         echo "::set-output name=df_version::${DF_VERSION}"
         echo "DF_VERSION=${DF_VERSION}" >> $GITHUB_ENV
         echo "DF_FOLDER=${HOME}/DF/${DF_VERSION}/df_linux" >> $GITHUB_ENV
+        echo "CCACHE_DIR=${HOME}/.ccache" >> $GITHUB_ENV
     - name: Fetch DF cache
       uses: actions/cache@v2
       with:

From 078256cc2a7720da5a059c6a00cd045434447f57 Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Thu, 9 Jun 2022 01:35:55 -0400
Subject: [PATCH 118/854] Remove GCC 11 from build matrix

---
 .github/workflows/build.yml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index e48aaad06..21b3096d3 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -17,9 +17,6 @@ jobs:
         plugins:
         - default
         include:
-        - os: ubuntu-22.04
-          gcc: 11
-          plugins: all
         - os: ubuntu-22.04
           gcc: 12
           plugins: all

From d12134d326351eecef86a6e694153a4152f4899c Mon Sep 17 00:00:00 2001
From: Myk <myk002@yahoo.com>
Date: Thu, 9 Jun 2022 11:21:14 -0700
Subject: [PATCH 119/854] check for files, not md5 receipt in download-df.sh
 (#2196)

---
 .github/workflows/build.yml |  2 +-
 ci/download-df.sh           | 19 +++----------------
 2 files changed, 4 insertions(+), 17 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 21b3096d3..2c710d91a 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -61,7 +61,7 @@ jobs:
       uses: actions/cache@v2
       with:
         path: ~/DF
-        key: ${{ steps.env_setup.outputs.df_version }}-${{ hashFiles('ci/download-df.sh') }}
+        key: dfcache-${{ steps.env_setup.outputs.df_version }}-${{ hashFiles('ci/download-df.sh') }}
     - name: Fetch ccache
       uses: actions/cache@v2
       with:
diff --git a/ci/download-df.sh b/ci/download-df.sh
index 2fd095c1d..bb1e91759 100755
--- a/ci/download-df.sh
+++ b/ci/download-df.sh
@@ -5,9 +5,6 @@ set -e
 df_tardest="df.tar.bz2"
 save_tardest="test_save.tgz"
 
-selfmd5=$(openssl md5 < "$0")
-echo $selfmd5
-
 cd "$(dirname "$0")"
 echo "DF_VERSION: $DF_VERSION"
 echo "DF_FOLDER: $DF_FOLDER"
@@ -15,17 +12,7 @@ mkdir -p "$DF_FOLDER"
 # back out of df_linux
 cd "$DF_FOLDER/.."
 
-if [ -f receipt ]; then
-    if [ "$selfmd5" != "$(cat receipt)" ]; then
-        echo "download-df.sh changed; re-downloading tarballs"
-        rm receipt
-    else
-        echo "Already downloaded $DF_VERSION tarballs"
-    fi
-fi
-
-if [ ! -f receipt ]; then
-    rm -f "$df_tardest" "$save_tardest"
+if ! test -f "$df_tardest"; then
     minor=$(echo "$DF_VERSION" | cut -d. -f2)
     patch=$(echo "$DF_VERSION" | cut -d. -f3)
     echo "Downloading DF $DF_VERSION"
@@ -43,6 +30,7 @@ URLS
         echo "DF failed to download: $df_tardest not found"
         exit 1
     fi
+
     echo "Downloading test save"
     #test_save_url="https://files.dfhack.org/DF/0.${minor}.${patch}/test_save.tgz"
     test_save_url="https://drive.google.com/uc?export=download&id=1XvYngl-DFONiZ9SD9OC4B2Ooecu8rPFz"
@@ -61,5 +49,4 @@ tar xf "$df_tardest" --strip-components=1 -C df_linux
 tar xf "$save_tardest" -C df_linux/data/save
 echo Done
 
-echo "$selfmd5" > receipt
-ls
+ls -l

From 1f38936723a3e8443f025288bcf06f5a316713bb Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Fri, 10 Jun 2022 13:35:25 -0700
Subject: [PATCH 120/854] don't create the unused manipulator/ directory

---
 plugins/manipulator.cpp | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/plugins/manipulator.cpp b/plugins/manipulator.cpp
index 5604b9760..4604cd7ea 100644
--- a/plugins/manipulator.cpp
+++ b/plugins/manipulator.cpp
@@ -53,8 +53,6 @@ REQUIRE_GLOBAL(ui);
 REQUIRE_GLOBAL(gps);
 REQUIRE_GLOBAL(enabler);
 
-#define CONFIG_PATH "manipulator"
-
 struct SkillLevel
 {
     const char *name;
@@ -2307,11 +2305,6 @@ DFhackCExport command_result plugin_enable(color_ostream &out, bool enable)
 
 DFhackCExport command_result plugin_init ( color_ostream &out, vector <PluginCommand> &commands)
 {
-    if (!Filesystem::isdir(CONFIG_PATH) && !Filesystem::mkdir(CONFIG_PATH))
-    {
-        out.printerr("manipulator: Could not create configuration folder: \"%s\"\n", CONFIG_PATH);
-        return CR_FAILURE;
-    }
     return CR_OK;
 }
 

From d846a1c93f8cd8ac5a76ed4688c3f655a5836e23 Mon Sep 17 00:00:00 2001
From: DFHack-Urist via GitHub Actions
 <63161697+DFHack-Urist@users.noreply.github.com>
Date: Fri, 10 Jun 2022 22:48:30 +0000
Subject: [PATCH 121/854] Auto-update submodules

scripts: master
depends/xlsxio: dfhack
---
 depends/xlsxio | 2 +-
 scripts        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/depends/xlsxio b/depends/xlsxio
index ab8fd7f3e..439fdbc25 160000
--- a/depends/xlsxio
+++ b/depends/xlsxio
@@ -1 +1 @@
-Subproject commit ab8fd7f3e9df457e8bc1b5cb31b78d57df0ac5a4
+Subproject commit 439fdbc259c13f23a3122e68ba35ad5a13bcd97c
diff --git a/scripts b/scripts
index 5246b643a..791748739 160000
--- a/scripts
+++ b/scripts
@@ -1 +1 @@
-Subproject commit 5246b643a91e109e934b7fb75f4cf3780ecadc85
+Subproject commit 791748739ada792591995585a0c8218ea87402ec

From 4de5b89fa3ff23fed11db1231a1100628a3c94d9 Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Fri, 10 Jun 2022 15:59:19 -0700
Subject: [PATCH 122/854] don't try to build up stairs on flat ground

---
 data/blueprints/library/dreamfort.csv | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/data/blueprints/library/dreamfort.csv b/data/blueprints/library/dreamfort.csv
index 9ac0f58d2..296e6c88b 100644
--- a/data/blueprints/library/dreamfort.csv
+++ b/data/blueprints/library/dreamfort.csv
@@ -334,10 +334,11 @@ corridor/surface_corridor
 message(Once the central stairs are mined out deeply enough, you should start digging the industry level in a non-aquifer rock layer. You'll need the boulders from the digging to make blocks.
 If your wagon is within the fort perimeter, deconstruct it to get it out of the way.
 Once the marked trees are all chopped down (if any), continue with /surface2.) clear trees and set up pastures"
-central_stairs/central_stairs repeat(down 10)
 clear_small/surface_clear_small
 zones/surface_zones
 name_zones/surface_name_zones
+#>
+central_stairs/central_stairs repeat(down 10)
 ""
 "#meta label(surface2) start(central stairs) message(Remember to enqueue manager orders for this blueprint.
 Once the channels are dug out and the marked trees are cleared, continue with /surface3.) set up starting workshops/stockpiles, channel miasma vents, and clear more trees"
@@ -387,9 +388,9 @@ corridor/surface_corridor
 corridor_traps/surface_corridor_traps
 query_corridor/surface_query_corridor
 #dig label(central_stairs_odd) start(2;2) hidden() spiral stairs odd levels
-`,u,`
-j6,`,j6
-`,u,`
+`,j6,`
+u,`,u
+`,j6,`
 #meta label(central_stairs_even) hidden() spiral stairs even levels
 /central_stairs_odd transform(cw)
 #meta label(central_stairs) two levels of spiral stairs (use --repeat down)
@@ -413,11 +414,11 @@ j6,`,j6
 ,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
 ,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
 ,,,`,,`,`,`,`,`,t1,`,`,`,`,`,`,,`,,`,`,`,`,`,t1,`,`,`,t1,`,`,,`
-,,,`,,`,,`,t1,t1,,,,,,`,,,,,,`,,,,,,,,,,`,,`
-,,,`,,`,,`,,,,,,,,,,`,`,`,,,,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,,`,,`,~,`,,`,,,,,,,,,,`,,`
-,,,`,,`,,`,,,,,,,,,,`,`,`,,,,,,,,,,,,`,,`
-,,,`,,`,,`,,,,,,,,`,,,,,,`,,,,,,,,,,`,,`
+,,,`,,`,,`,t1,t1,,,,,,`,t1,t1,t1,t1,t1,`,,,,,,,,,,`,,`
+,,,`,,`,,`,,,,,,,,,t1,t1,t1,t1,t1,,,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,,`,t1,j,t1,j,t1,`,,,,,,,,,,`,,`
+,,,`,,`,,`,,,,,,,,,t1,t1,t1,t1,t1,,,,,,,,,,,`,,`
+,,,`,,`,,`,,,,,,,,`,t1,t1,t1,t1,t1,`,,,,,,,,,,`,,`
 ,,,`,,`,`,`,`,`,`,`,,`,`,`,`,,`,,`,`,`,`,,`,`,`,`,`,`,`,,`
 ,,,`,,`,,,,,,,,,`,t1,,,,,,t1,`,,,,,,,,,`,,`
 ,,,`,,`,,,,,,,,,t1,t1,,,,,,t1,t1,,,,,,,,,`,,`

From 98112050c309231f4cfa47eeb60dce4f6c421553 Mon Sep 17 00:00:00 2001
From: DFHack-Urist via GitHub Actions
 <63161697+DFHack-Urist@users.noreply.github.com>
Date: Sat, 11 Jun 2022 07:16:22 +0000
Subject: [PATCH 123/854] Auto-update submodules

scripts: master
---
 scripts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts b/scripts
index 791748739..4941cacca 160000
--- a/scripts
+++ b/scripts
@@ -1 +1 @@
-Subproject commit 791748739ada792591995585a0c8218ea87402ec
+Subproject commit 4941caccab6dd775d43250e79b8d1a75b8a24b57

From 85d7489b3c66e3f61b418fe138b22da1da2ce032 Mon Sep 17 00:00:00 2001
From: Myk <myk002@yahoo.com>
Date: Sat, 11 Jun 2022 07:38:22 -0700
Subject: [PATCH 124/854] ensure refs are cleaned up when we remove a job
 (#2184)

* ensure job items are disassociated from the job

when the job is removed. the new df-provided ``cancel_job()`` doesn't do
this for us whereas the old custom implementation did.
ref: #2028

* remove trailing whitespace

* Clean up general refs before removing job

Because the game method doesn't do it itself

* Fix typo in var name

* clean up code

* update changelog
---
 docs/changelog.txt      |  1 +
 library/modules/Job.cpp | 38 ++++++++++++++++++++++++++++++++------
 2 files changed, 33 insertions(+), 6 deletions(-)

diff --git a/docs/changelog.txt b/docs/changelog.txt
index 0e3c90855..57cd2f6f6 100644
--- a/docs/changelog.txt
+++ b/docs/changelog.txt
@@ -39,6 +39,7 @@ changelog.txt uses a syntax similar to RST, with a few special sequences:
 
 ## Fixes
 - ``widgets.CycleHotkeyLabel``: allow initial option values to be specified as an index instead of an option value
+- ``job.removeJob()``: fixes regression in DFHack 0.47.05-r5 where items/buildings associated with the job were not getting disassociated when the job is removed. Now `build-now` can build buildings and `gui/mass-remove` can cancel building deconstruction again
 
 ## Misc Improvements
 - `confirm`: added a confirmation dialog for removing manager orders
diff --git a/library/modules/Job.cpp b/library/modules/Job.cpp
index ac800cffc..749be199e 100644
--- a/library/modules/Job.cpp
+++ b/library/modules/Job.cpp
@@ -298,10 +298,10 @@ void DFHack::Job::setJobCooldown(df::building *workshop, df::unit *worker, int c
     }
 }
 
-void DFHack::Job::disconnectJobItem(df::job *job, df::job_item_ref *ref) {
-    if (!ref) return;
+void DFHack::Job::disconnectJobItem(df::job *job, df::job_item_ref *item_ref) {
+    if (!item_ref) return;
 
-    auto item = ref->item;
+    auto item = item_ref->item;
     if (!item) return;
 
     //Work backward through the specific refs & remove/delete all specific refs to this job
@@ -360,10 +360,36 @@ bool DFHack::Job::removeJob(df::job* job) {
     using df::global::world;
     CHECK_NULL_POINTER(job);
 
-    // call the job cancel vmethod graciously provided by The Toady One.
-    // job_handler::cancel_job calls job::~job, and then deletes job (this has been confirmed by disassembly)
-    // this method cannot fail; it will either delete the job or crash/corrupt DF
+    // cancel_job below does not clean up refs, so we have to do that first
+
+    // clean up general refs
+    for (auto genRef : job->general_refs) {
+        if (!genRef) continue;
+
+        // disconnectJobGeneralRef only handles buildings and units
+        if (genRef->getType() != general_ref_type::BUILDING_HOLDER &&
+                genRef->getType() != general_ref_type::UNIT_WORKER)
+            return false;
+    }
 
+    for (auto genRef : job->general_refs) {
+        // this should always succeed because of the check in the preceding loop
+        bool success = disconnectJobGeneralRef(job, genRef);
+        assert(success); (void)success;
+        if (genRef) delete genRef;
+    }
+    job->general_refs.resize(0);
+
+    // clean up item refs
+    for (auto &item_ref : job->items) {
+       disconnectJobItem(job, item_ref);
+       if (item_ref) delete item_ref;
+    }
+    job->items.resize(0);
+
+    // call the job cancel vmethod graciously provided by The Toady One.
+    // job_handler::cancel_job calls job::~job, and then deletes job (this has
+    // been confirmed by disassembly).
     world->jobs.cancel_job(job);
 
     return true;

From 1a629a26bf895f93f5fdb54f328dbd3456deebe2 Mon Sep 17 00:00:00 2001
From: Timur Kelman <tymur.gubayev@gmail.com>
Date: Sun, 12 Jun 2022 16:03:04 +0200
Subject: [PATCH 125/854] add `ItemTraitsDialog` to materials.lua (#2199)

* add `ItemTraitDialog` to materials.lua

* rename `ItemTraitDialog` to `ItemTraitsDialog` (plural)

* Update changelog.txt
---
 docs/changelog.txt            |   1 +
 library/lua/gui/materials.lua | 262 ++++++++++++++++++++++++++++++++++
 2 files changed, 263 insertions(+)

diff --git a/docs/changelog.txt b/docs/changelog.txt
index 57cd2f6f6..4c034b5bc 100644
--- a/docs/changelog.txt
+++ b/docs/changelog.txt
@@ -66,6 +66,7 @@ changelog.txt uses a syntax similar to RST, with a few special sequences:
 - ``widgets.EditField``: the ``key_sep`` string is now configurable
 - ``widgets.EditField``: can now display an optional string label in addition to the activation key
 - ``widgets.EditField``: views that have an ``EditField`` subview no longer need to manually manage the ``EditField`` activation state and input routing.  This is now handled automatically by the new ``gui.View`` keyboard focus subsystem.
+- ``materials.ItemTraitsDialog``: new dialog to edit item traits (where "item" is part of a job or work order or similar). The list of traits is the same as in vanilla work order conditions "``t`` change traits".
 
 # 0.47.05-r5
 
diff --git a/library/lua/gui/materials.lua b/library/lua/gui/materials.lua
index 8894b36af..c9eaaf38d 100644
--- a/library/lua/gui/materials.lua
+++ b/library/lua/gui/materials.lua
@@ -343,4 +343,266 @@ function ItemTypeDialog(args)
     return dlg.ListBox(args)
 end
 
+function ItemTraitsDialog(args)
+    local job_item_flags_map = {}
+    for i = 1, 3 do
+        for _, f in ipairs(df['job_item_flags'..i]) do
+            if f then
+                job_item_flags_map[f] = 'flags'..i
+            end
+        end
+    end
+    local job_item_flags = {}
+    for k, _ in pairs(job_item_flags_map) do
+        job_item_flags[#job_item_flags + 1] = k
+    end
+    table.sort(job_item_flags)
+    --------------------------------------
+    local tool_uses = {}
+    for i, _ in ipairs(df.tool_uses) do
+        tool_uses[#tool_uses + 1] = df.tool_uses[i]
+    end
+    local restore_none = false
+    if tool_uses[1] == 'NONE' then
+        restore_none = true
+        table.remove(tool_uses, 1)
+    end
+    table.sort(tool_uses)
+    if restore_none then
+        table.insert(tool_uses, 1, 'NONE')
+    end
+    --------------------------------------
+    local set_ore_ix = {}
+    for i, raw in ipairs(df.global.world.raws.inorganics) do
+        for _, ix in ipairs(raw.metal_ore.mat_index) do
+            set_ore_ix[ix] = true
+        end
+    end
+    local ores = {}
+    for ix in pairs(set_ore_ix) do
+        local raw = df.global.world.raws.inorganics[ix]
+        ores[#ores+1] = {mat_index = ix, name = raw.material.state_name.Solid}
+    end
+    table.sort(ores, function(a,b) return a.name < b.name end)
+
+    --------------------------------------
+    -- CALCIUM_CARBONATE, CAN_GLAZE, FAT, FLUX,
+    -- GYPSUM, PAPER_PLANT, PAPER_SLURRY, TALLOW, WAX
+    local reaction_classes_set = {}
+    for ix,reaction in ipairs(df.global.world.raws.reactions.reactions) do
+        if #reaction.reagents > 0 then
+            for _, r in ipairs(reaction.reagents) do
+                if r.reaction_class and r.reaction_class ~= '' then
+                    reaction_classes_set[r.reaction_class] = true
+                end
+            end
+        end --if
+    end
+    local reaction_classes = {}
+    for k in pairs(reaction_classes_set) do
+        reaction_classes[#reaction_classes + 1] = k
+    end
+    table.sort(reaction_classes)
+    --------------------------------------
+    -- PRESS_LIQUID_MAT, TAN_MAT, BAG_ITEM etc
+    local product_materials_set = {}
+    for ix,reaction in ipairs(df.global.world.raws.reactions.reactions) do
+        if #reaction.products > 0 then
+            --for _, p in ipairs(reaction.products) do
+            -- in the list in work order conditions there is no SEED_MAT.
+            -- I think it's because the game doesn't iterate over all products.
+                local p = reaction.products[0]
+                local mat = p.get_material
+                if mat and mat.product_code ~= '' then
+                    product_materials_set[mat.product_code] = true
+                end
+            --end
+        end --if
+    end
+    local product_materials = {}
+    for k in pairs(product_materials_set) do
+        product_materials[#product_materials + 1] = k
+    end
+    table.sort(product_materials)
+    --==================================--
+
+    local function set_search_keys(choices)
+        for _, choice in ipairs(choices) do
+            if not choice.search_key then
+                if type(choice.text) == 'table' then
+                    local search_key = {}
+                    for _, token in ipairs(choice.text) do
+                        search_key[#search_key+1] = string.lower(token.text or '')
+                    end
+                    choice.search_key = table.concat(search_key, ' ')
+                elseif choice.text then
+                    choice.search_key = string.lower(choice.text)
+                end
+            end
+        end
+    end
+
+    args.text = args.prompt or 'Type or select an item trait'
+    args.text_pen = COLOR_WHITE
+    args.with_filter = true
+    args.icon_width = 2
+    args.dismiss_on_select = false
+
+    local pen_active = COLOR_LIGHTCYAN
+    local pen_active_d = COLOR_CYAN
+    local pen_not_active = COLOR_LIGHTRED
+    local pen_not_active_d = COLOR_RED
+    local pen_action = COLOR_WHITE
+    local pen_action_d = COLOR_GREY
+
+    local job_item = args.job_item
+    local choices = {}
+
+    local pen_cb = function(args, fnc)
+        if not (args and fnc) then
+            return COLOR_YELLOW
+        end
+        return fnc(args) and pen_active or pen_not_active
+    end
+    local pen_d_cb = function(args, fnc)
+        if not (args and fnc) then
+            return COLOR_YELLOW
+        end
+        return fnc(args) and pen_active_d or pen_not_active_d
+    end
+    local icon_cb = function(args, fnc)
+        if not (args and fnc) then
+            return '\19' -- ‼
+        end
+        -- '\251' is a checkmark
+        -- '\254' is a square
+        return fnc(args) and '\251' or '\254'
+    end
+
+    if not args.hide_none then
+        table.insert(choices, {
+            icon = '!',
+            text = {{text = args.none_caption or 'none', pen = pen_action, dpen = pen_action_d}},
+            reset_all_traits = true
+        })
+    end
+
+    local isActiveFlag = function (obj)
+        return obj.job_item[obj.ffield][obj.flag]
+    end
+    table.insert(choices, {
+        icon = '!',
+        text = {{text = 'unset flags', pen = pen_action, dpen = pen_action_d}},
+        reset_flags = true
+    })
+    for _, flag in ipairs(job_item_flags) do
+        local ffield = job_item_flags_map[flag]
+        local text = 'is ' .. (value and '' or 'any ') .. string.lower(flag)
+        local args = {job_item=job_item, ffield=ffield, flag=flag}
+        table.insert(choices, {
+            icon = curry(icon_cb, args, isActiveFlag),
+            text = {{text = text,
+                    pen = curry(pen_cb, args, isActiveFlag),
+                    dpen = curry(pen_d_cb, args, isActiveFlag),
+            }},
+            ffield = ffield, flag = flag
+        })
+    end
+
+    local isActiveTool = function (args)
+        return df.tool_uses[args.tool_use] == args.job_item.has_tool_use
+    end
+    for _, tool_use in ipairs(tool_uses) do
+        if tool_use == 'NONE' then
+            table.insert(choices, {
+                icon = '!',
+                text = {{text = 'unset use', pen = pen_action, dpen = pen_action_d}},
+                tool_use = tool_use
+            })
+        else
+            local args = {job_item = job_item, tool_use=tool_use}
+            table.insert(choices, {
+                icon = ' ',
+                text = {{text = 'has use ' .. tool_use,
+                        pen = curry(pen_cb, args, isActiveTool),
+                        dpen = curry(pen_d_cb, args, isActiveTool),
+                }},
+                tool_use = tool_use
+            })
+        end
+    end
+
+    local isActiveOre = function(args)
+        return (args.job_item.metal_ore == args.mat_index)
+    end
+    table.insert(choices, {
+            icon = '!',
+            text = {{text = 'unset ore', pen = pen_action, dpen = pen_action_d}},
+            ore_ix = -1
+        })
+    for _, ore in ipairs(ores) do
+        local args = {job_item = job_item, mat_index=ore.mat_index}
+        table.insert(choices, {
+            icon = ' ',
+            text = {{text = 'ore of ' .. ore.name,
+                    pen = curry(pen_cb, args, isActiveOre),
+                    dpen = curry(pen_d_cb, args, isActiveOre),
+            }},
+            ore_ix = ore.mat_index
+        })
+    end
+
+    local isActiveReactionClass = function(args)
+        return (args.job_item.reaction_class == args.reaction_class)
+    end
+    table.insert(choices, {
+            icon = '!',
+            text = {{text = 'unset reaction class', pen = pen_action, dpen = pen_action_d}},
+            reaction_class = ''
+        })
+    for _, reaction_class in ipairs(reaction_classes) do
+        local args = {job_item = job_item, reaction_class=reaction_class}
+        table.insert(choices, {
+            icon = ' ',
+            text = {{text = 'reaction class ' .. reaction_class,
+                    pen = curry(pen_cb, args, isActiveReactionClass),
+                    dpen = curry(pen_d_cb, args, isActiveReactionClass)
+            }},
+            reaction_class = reaction_class
+        })
+    end
+
+    local isActiveProduct = function(args)
+        return (args.job_item.has_material_reaction_product == args.product_materials)
+    end
+    table.insert(choices, {
+            icon = '!',
+            text = {{text = 'unset producing', pen = pen_action, dpen = pen_action_d}},
+            product_materials = ''
+        })
+    for _, product_materials in ipairs(product_materials) do
+        local args = {job_item = job_item, product_materials=product_materials}
+        table.insert(choices, {
+            icon = ' ',
+            text = {{text = product_materials .. '-producing',
+                    pen = curry(pen_cb, args, isActiveProduct),
+                    dpen = curry(pen_d_cb, args, isActiveProduct)
+            }},
+            product_materials = product_materials
+        })
+    end
+
+    set_search_keys(choices)
+    args.choices = choices
+
+    if args.on_select then
+        local cb = args.on_select
+        args.on_select = function(idx, obj)
+            return cb(obj)
+        end
+    end
+
+    return dlg.ListBox(args)
+end
+
 return _ENV

From fc384fd1a2bee65315fe79831a55ca74c8e6717b Mon Sep 17 00:00:00 2001
From: Warmist <warmist@gmail.com>
Date: Sun, 12 Jun 2022 17:12:49 +0300
Subject: [PATCH 126/854] Update eventful.lua (#2203)

* Update eventful.lua

Had wrong function. Fixes https://github.com/DFHack/dfhack/issues/2202

* Update Lua API.rst

Update docs to add onReactionCompleting and remove outdated info

* Update Lua API.rst

Some more minor doc fixes

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* add changelog entry

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
---
 docs/Lua API.rst         | 27 ++++++++++++++++-----------
 docs/changelog.txt       |  1 +
 plugins/lua/eventful.lua |  2 +-
 3 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/docs/Lua API.rst b/docs/Lua API.rst
index bbcf0b145..55a217757 100644
--- a/docs/Lua API.rst	
+++ b/docs/Lua API.rst	
@@ -4587,35 +4587,40 @@ on DF world events.
 List of events
 --------------
 
-1. ``onReactionComplete(reaction,reaction_product,unit,input_items,input_reagents,output_items,call_native)``
+1. ``onReactionCompleting(reaction,reaction_product,unit,input_items,input_reagents,output_items,call_native)``
 
-   Auto activates if detects reactions starting with ``LUA_HOOK_``. Is called when reaction finishes.
+   Is called once per reaction product, before reaction had a chance to call native code for item creation.
+   Setting ``call_native.value=false`` cancels further processing: no items are created and ``onReactionComplete`` is not called.
 
-2. ``onItemContaminateWound(item,unit,wound,number1,number2)``
+2. ``onReactionComplete(reaction,reaction_product,unit,input_items,input_reagents,output_items)``
+
+   Is called once per reaction product, when reaction finishes and has at least one product.
+
+3. ``onItemContaminateWound(item,unit,wound,number1,number2)``
 
    Is called when item tries to contaminate wound (e.g. stuck in).
 
-3. ``onProjItemCheckMovement(projectile)``
+4. ``onProjItemCheckMovement(projectile)``
 
    Is called when projectile moves.
 
-4. ``onProjItemCheckImpact(projectile,somebool)``
+5. ``onProjItemCheckImpact(projectile,somebool)``
 
    Is called when projectile hits something.
 
-5. ``onProjUnitCheckMovement(projectile)``
+6. ``onProjUnitCheckMovement(projectile)``
 
    Is called when projectile moves.
 
-6. ``onProjUnitCheckImpact(projectile,somebool)``
+7. ``onProjUnitCheckImpact(projectile,somebool)``
 
    Is called when projectile hits something.
 
-7. ``onWorkshopFillSidebarMenu(workshop,callnative)``
+8. ``onWorkshopFillSidebarMenu(workshop,callnative)``
 
    Is called when viewing a workshop in 'q' mode, to populate reactions, useful for custom viewscreens for shops.
 
-8. ``postWorkshopFillSidebarMenu(workshop)``
+9. ``postWorkshopFillSidebarMenu(workshop)``
 
    Is called after calling (or not) native fillSidebarMenu(). Useful for job button
    tweaking (e.g. adding custom reactions)
@@ -4683,7 +4688,7 @@ Functions
 
 1. ``registerReaction(reaction_name,callback)``
 
-   Simplified way of using onReactionComplete; the callback is function (same params as event).
+   Simplified way of using onReactionCompleting; the callback is function (same params as event).
 
 2. ``removeNative(shop_name)``
 
@@ -4715,7 +4720,7 @@ Reaction complete example::
 
   b=require "plugins.eventful"
 
-  b.registerReaction("LUA_HOOK_LAY_BOMB",function(reaction,unit,in_items,in_reag,out_items,call_native)
+  b.registerReaction("LAY_BOMB",function(reaction,unit,in_items,in_reag,out_items,call_native)
     local pos=copyall(unit.pos)
     -- spawn dragonbreath after 100 ticks
     dfhack.timeout(100,"ticks",function() dfhack.maps.spawnFlow(pos,6,0,0,50000) end)
diff --git a/docs/changelog.txt b/docs/changelog.txt
index 4c034b5bc..1302cf82e 100644
--- a/docs/changelog.txt
+++ b/docs/changelog.txt
@@ -40,6 +40,7 @@ changelog.txt uses a syntax similar to RST, with a few special sequences:
 ## Fixes
 - ``widgets.CycleHotkeyLabel``: allow initial option values to be specified as an index instead of an option value
 - ``job.removeJob()``: fixes regression in DFHack 0.47.05-r5 where items/buildings associated with the job were not getting disassociated when the job is removed. Now `build-now` can build buildings and `gui/mass-remove` can cancel building deconstruction again
+- `eventful`: fix ``eventful.registerReaction`` to correctly pass ``call_native`` argument thus allowing canceling vanilla item creation. Updated related documentation.
 
 ## Misc Improvements
 - `confirm`: added a confirmation dialog for removing manager orders
diff --git a/plugins/lua/eventful.lua b/plugins/lua/eventful.lua
index 293874393..b1520dac1 100644
--- a/plugins/lua/eventful.lua
+++ b/plugins/lua/eventful.lua
@@ -93,7 +93,7 @@ end
 function registerReaction(reaction_name,callback)
     _registeredStuff.reactionCallbacks=_registeredStuff.reactionCallbacks or {}
     _registeredStuff.reactionCallbacks[reaction_name]=callback
-    onReactionComplete._library=onReact
+    onReactionCompleting._library=onReact
     dfhack.onStateChange.eventful=unregall
 end
 

From ae5b00523ead243c1f319453f6e69a533c04b367 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafa=C5=82?= <CarabusX@users.noreply.github.com>
Date: Tue, 14 Jun 2022 06:35:59 +0200
Subject: [PATCH 127/854] Add myself to Authors.rst (#2208)

As suggested in: https://github.com/DFHack/scripts/pull/404#issuecomment-1152780958
---
 docs/Authors.rst | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/Authors.rst b/docs/Authors.rst
index afb0a3f14..2369d393d 100644
--- a/docs/Authors.rst
+++ b/docs/Authors.rst
@@ -134,6 +134,7 @@ potato
 Priit Laes              plaes
 Putnam                  Putnam3145
 Quietust                quietust                _Q
+Rafał Karczmarczyk      CarabusX
 Raidau                  Raidau
 Ralph Bisschops         ralpha
 Ramblurr                Ramblurr

From d38ab1d152892ccdd3b53e0303ff2266bdf1ff46 Mon Sep 17 00:00:00 2001
From: Josh Cooper <cppcooper@users.noreply.github.com>
Date: Fri, 17 Jun 2022 09:34:41 -0700
Subject: [PATCH 128/854] Fix UNIT_NEW_ACTIVE events (#2197)

* Updates eventful.lua to use UNIT_NEW_ACTIVE

* Fixes bug #2189

* Revises activeUnits declaration/initialization

* Fixes build error

* Update changelog.txt

* reword changelog entry

* add changelog entry for event name change

Co-authored-by: Myk <myk002@yahoo.com>
---
 docs/changelog.txt               | 2 ++
 library/modules/EventManager.cpp | 9 ++++++++-
 plugins/lua/eventful.lua         | 2 +-
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/docs/changelog.txt b/docs/changelog.txt
index 1302cf82e..4aa3e85c9 100644
--- a/docs/changelog.txt
+++ b/docs/changelog.txt
@@ -38,6 +38,7 @@ changelog.txt uses a syntax similar to RST, with a few special sequences:
 ## New Tweaks
 
 ## Fixes
+- `eventful`: fixed UNIT_NEW_ACTIVE event firing too often
 - ``widgets.CycleHotkeyLabel``: allow initial option values to be specified as an index instead of an option value
 - ``job.removeJob()``: fixes regression in DFHack 0.47.05-r5 where items/buildings associated with the job were not getting disassociated when the job is removed. Now `build-now` can build buildings and `gui/mass-remove` can cancel building deconstruction again
 - `eventful`: fix ``eventful.registerReaction`` to correctly pass ``call_native`` argument thus allowing canceling vanilla item creation. Updated related documentation.
@@ -49,6 +50,7 @@ changelog.txt uses a syntax similar to RST, with a few special sequences:
 - `dfhack-examples-guide`: reduce required stock of dye for "Dye cloth" orders
 - `dfhack-examples-guide`: fix material conditions for making jugs and pots
 - `dfhack-examples-guide`: make wooden jugs by default to differentiate them from other stone tools. this allows players to more easily select jugs out with a properly-configured stockpile (i.e. the new ``woodentools`` alias)
+- `eventful`: renamed NEW_UNIT_ACTIVE event to UNIT_NEW_ACTIVE to match the ``EventManager`` event name
 - `quickfort-alias-guide`: new aliases: ``forbidsearch``, ``permitsearch``, and ``togglesearch`` use the `search-plugin` plugin to alter the settings for a filtered list of item types when configuring stockpiles
 - `quickfort-alias-guide`: new aliases: ``stonetools`` and ``woodentools``.  the ``jugs`` alias is deprecated. please use ``stonetools`` instead, which is the same as the old ``jugs`` alias.
 - `quickfort-alias-guide`: new aliases: ``usablehair``, ``permitusablehair``, and ``forbidusablehair`` alter settings for the types of hair/wool that can be made into cloth: sheep, llama, alpaca, and troll. The ``craftrefuse`` aliases have been altered to use this alias as well.
diff --git a/library/modules/EventManager.cpp b/library/modules/EventManager.cpp
index 70908aada..5d2a24ad0 100644
--- a/library/modules/EventManager.cpp
+++ b/library/modules/EventManager.cpp
@@ -199,6 +199,9 @@ static int32_t lastJobId = -1;
 //job completed
 static unordered_map<int32_t, df::job*> prevJobs;
 
+//active units
+static unordered_set<int32_t> activeUnits;
+
 //unit death
 static unordered_set<int32_t> livingUnits;
 
@@ -256,6 +259,7 @@ void DFHack::EventManager::onStateChange(color_ostream& out, state_change_event
         buildings.clear();
         constructions.clear();
         equipmentLog.clear();
+        activeUnits.clear();
 
         Buildings::clearBuildings(out);
         lastReport = -1;
@@ -314,6 +318,9 @@ void DFHack::EventManager::onStateChange(color_ostream& out, state_change_event
         }
         lastSyndromeTime = -1;
         for (auto unit : df::global::world->units.all) {
+            if (Units::isActive(unit)) {
+                activeUnits.emplace(unit->id);
+            }
             for (auto syndrome : unit->syndromes.active) {
                 int32_t startTime = syndrome->year*ticksPerYear + syndrome->year_time;
                 if ( startTime > lastSyndromeTime )
@@ -592,7 +599,6 @@ static void manageNewUnitActiveEvent(color_ostream& out) {
     if (!df::global::world)
         return;
 
-    static unordered_set<int32_t> activeUnits;
     multimap<Plugin*,EventHandler> copy(handlers[EventType::UNIT_NEW_ACTIVE].begin(), handlers[EventType::UNIT_NEW_ACTIVE].end());
     // iterate event handler callbacks
     for (auto &key_value : copy) {
@@ -600,6 +606,7 @@ static void manageNewUnitActiveEvent(color_ostream& out) {
         for (df::unit* unit : df::global::world->units.active) {
             int32_t id = unit->id;
             if (!activeUnits.count(id)) {
+                activeUnits.emplace(id);
                 handler.eventHandler(out, (void*) intptr_t(id)); // intptr_t() avoids cast from smaller type warning
             }
         }
diff --git a/plugins/lua/eventful.lua b/plugins/lua/eventful.lua
index b1520dac1..1e3170c45 100644
--- a/plugins/lua/eventful.lua
+++ b/plugins/lua/eventful.lua
@@ -154,7 +154,7 @@ eventType=invertTable{
     "JOB_INITIATED",
     "JOB_STARTED",
     "JOB_COMPLETED",
-    "NEW_UNIT_ACTIVE",
+    "UNIT_NEW_ACTIVE",
     "UNIT_DEATH",
     "ITEM_CREATED",
     "BUILDING",

From b361a66a52d4eefcd368f601383c8e92d8e07191 Mon Sep 17 00:00:00 2001
From: Myk <myk002@yahoo.com>
Date: Fri, 17 Jun 2022 09:35:31 -0700
Subject: [PATCH 129/854] ensure our docs build cleanly with sphinx-5 (#2193)

* ensure our docs build cleanly with sphinx-5

* adapt to the API change in sphinx 5

while keeping compatibility with <5

* get rid of the extra colons in field lists
---
 conf.py                 | 31 ++++++++++++++++++++++---------
 docs/styles/sphinx5.css |  3 +++
 2 files changed, 25 insertions(+), 9 deletions(-)
 create mode 100644 docs/styles/sphinx5.css

diff --git a/conf.py b/conf.py
index c762a3cfa..79b873bf9 100644
--- a/conf.py
+++ b/conf.py
@@ -19,6 +19,7 @@ from io import open
 import os
 import re
 import shlex  # pylint:disable=unused-import
+import sphinx
 import sys
 
 
@@ -28,6 +29,7 @@ import sys
 from docutils import nodes
 from docutils.parsers.rst import roles
 
+sphinx_major_version = sphinx.version_info[0]
 
 def get_keybinds():
     """Get the implemented keybinds, and return a dict of
@@ -197,20 +199,28 @@ extensions = [
     'dfhack.lexer',
 ]
 
+def get_caption_str(prefix=''):
+    return prefix + (sphinx_major_version >= 5 and '%s' or '')
+
 # This config value must be a dictionary of external sites, mapping unique
 # short alias names to a base URL and a prefix.
 # See http://sphinx-doc.org/ext/extlinks.html
 extlinks = {
-    'wiki': ('https://dwarffortresswiki.org/%s', ''),
+    'wiki': ('https://dwarffortresswiki.org/%s', get_caption_str()),
     'forums': ('http://www.bay12forums.com/smf/index.php?topic=%s',
-               'Bay12 forums thread '),
-    'dffd': ('https://dffd.bay12games.com/file.php?id=%s', 'DFFD file '),
+               get_caption_str('Bay12 forums thread ')),
+    'dffd': ('https://dffd.bay12games.com/file.php?id=%s',
+             get_caption_str('DFFD file ')),
     'bug': ('https://www.bay12games.com/dwarves/mantisbt/view.php?id=%s',
-            'Bug '),
-    'source': ('https://github.com/DFHack/dfhack/tree/develop/%s', ''),
-    'source-scripts': ('https://github.com/DFHack/scripts/tree/master/%s', ''),
-    'issue': ('https://github.com/DFHack/dfhack/issues/%s', 'Issue '),
-    'commit': ('https://github.com/DFHack/dfhack/commit/%s', 'Commit '),
+            get_caption_str('Bug ')),
+    'source': ('https://github.com/DFHack/dfhack/tree/develop/%s',
+               get_caption_str()),
+    'source-scripts': ('https://github.com/DFHack/scripts/tree/master/%s',
+                       get_caption_str()),
+    'issue': ('https://github.com/DFHack/dfhack/issues/%s',
+               get_caption_str('Issue ')),
+    'commit': ('https://github.com/DFHack/dfhack/commit/%s',
+               get_caption_str('Commit ')),
 }
 
 # Add any paths that contain templates here, relative to this directory.
@@ -259,7 +269,7 @@ version = release = get_version()
 # for a list of supported languages.
 # This is also used if you do content translation via gettext catalogs.
 # Usually you set "language" from the command line for these cases.
-language = None
+language = 'en'
 
 # strftime format for |today| and 'Last updated on:' timestamp at page bottom
 today_fmt = html_last_updated_fmt = '%Y-%m-%d'
@@ -355,6 +365,9 @@ html_css_files = [
     'dfhack.css',
 ]
 
+if sphinx_major_version >= 5:
+    html_css_files.append('sphinx5.css')
+
 # -- Options for LaTeX output ---------------------------------------------
 
 # Grouping the document tree into LaTeX files. List of tuples
diff --git a/docs/styles/sphinx5.css b/docs/styles/sphinx5.css
new file mode 100644
index 000000000..385569510
--- /dev/null
+++ b/docs/styles/sphinx5.css
@@ -0,0 +1,3 @@
+dl.field-list > dt:after {
+  display: none;
+}

From 88ae50b9aeb87caed87c3a331fd6b360ad969605 Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Fri, 17 Jun 2022 15:42:23 -0700
Subject: [PATCH 130/854] update version and changelog to 0.47.05-r6

---
 CMakeLists.txt     |  2 +-
 docs/changelog.txt | 26 ++++++++++++++++++--------
 library/xml        |  2 +-
 scripts            |  2 +-
 4 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7cbf13789..8271840e6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -192,7 +192,7 @@ endif()
 
 # set up versioning.
 set(DF_VERSION "0.47.05")
-set(DFHACK_RELEASE "r5")
+set(DFHACK_RELEASE "r6")
 set(DFHACK_PRERELEASE FALSE)
 
 set(DFHACK_VERSION "${DF_VERSION}-${DFHACK_RELEASE}")
diff --git a/docs/changelog.txt b/docs/changelog.txt
index 4aa3e85c9..e91a427a9 100644
--- a/docs/changelog.txt
+++ b/docs/changelog.txt
@@ -38,10 +38,23 @@ changelog.txt uses a syntax similar to RST, with a few special sequences:
 ## New Tweaks
 
 ## Fixes
+
+## Misc Improvements
+
+## Documentation
+
+## API
+
+## Lua
+
+# 0.47.05-r6
+
+## Fixes
+- `eventful`: fix ``eventful.registerReaction`` to correctly pass ``call_native`` argument thus allowing canceling vanilla item creation. Updated related documentation.
+- `eventful`: renamed NEW_UNIT_ACTIVE event to UNIT_NEW_ACTIVE to match the ``EventManager`` event name
 - `eventful`: fixed UNIT_NEW_ACTIVE event firing too often
-- ``widgets.CycleHotkeyLabel``: allow initial option values to be specified as an index instead of an option value
 - ``job.removeJob()``: fixes regression in DFHack 0.47.05-r5 where items/buildings associated with the job were not getting disassociated when the job is removed. Now `build-now` can build buildings and `gui/mass-remove` can cancel building deconstruction again
-- `eventful`: fix ``eventful.registerReaction`` to correctly pass ``call_native`` argument thus allowing canceling vanilla item creation. Updated related documentation.
+- ``widgets.CycleHotkeyLabel``: allow initial option values to be specified as an index instead of an option value
 
 ## Misc Improvements
 - `confirm`: added a confirmation dialog for removing manager orders
@@ -50,26 +63,23 @@ changelog.txt uses a syntax similar to RST, with a few special sequences:
 - `dfhack-examples-guide`: reduce required stock of dye for "Dye cloth" orders
 - `dfhack-examples-guide`: fix material conditions for making jugs and pots
 - `dfhack-examples-guide`: make wooden jugs by default to differentiate them from other stone tools. this allows players to more easily select jugs out with a properly-configured stockpile (i.e. the new ``woodentools`` alias)
-- `eventful`: renamed NEW_UNIT_ACTIVE event to UNIT_NEW_ACTIVE to match the ``EventManager`` event name
 - `quickfort-alias-guide`: new aliases: ``forbidsearch``, ``permitsearch``, and ``togglesearch`` use the `search-plugin` plugin to alter the settings for a filtered list of item types when configuring stockpiles
 - `quickfort-alias-guide`: new aliases: ``stonetools`` and ``woodentools``.  the ``jugs`` alias is deprecated. please use ``stonetools`` instead, which is the same as the old ``jugs`` alias.
 - `quickfort-alias-guide`: new aliases: ``usablehair``, ``permitusablehair``, and ``forbidusablehair`` alter settings for the types of hair/wool that can be made into cloth: sheep, llama, alpaca, and troll. The ``craftrefuse`` aliases have been altered to use this alias as well.
 - `quickfort-alias-guide`: new aliases: ``forbidthread``, ``permitthread``, ``forbidadamantinethread``, ``permitadamantinethread``, ``forbidcloth``, ``permitcloth``, ``forbidadamantinecloth``, and ``permitadamantinecloth`` give you more control how adamantine-derived items are stored
 - `quickfort`: `Dreamfort <quickfort-blueprint-guide>` blueprint set improvements: automatically create tavern, library, and temple locations (restricted to residents only by default), automatically associate the rented rooms with the tavern
-- `quickfort`: `Dreamfort <quickfort-blueprint-guide>` blueprint set improvements: new design for the services level, including a werebeast-proof hospital recovery rooms and an appropriately-themed interrogation room next to the jail! Also fits better in a 1x1 embark for minimalist players.
-
-## Documentation
+- `quickfort`: `Dreamfort <quickfort-blueprint-guide>` blueprint set improvements: new design for the services level, including were-bitten hospital recovery rooms and an appropriately-themed interrogation room next to the jail! Also fits better in a 1x1 embark for minimalist players.
 
 ## API
 - ``word_wrap``: argument ``bool collapse_whitespace`` converted to enum ``word_wrap_whitespace_mode mode``, with valid modes ``WSMODE_KEEP_ALL``, ``WSMODE_COLLAPSE_ALL``, and ``WSMODE_TRIM_LEADING``.
 
 ## Lua
 - ``gui.View``: all ``View`` subclasses (including all ``Widgets``) can now acquire keyboard focus with the new ``View:setFocus()`` function. See docs for details.
-- ``widgets.HotkeyLabel``: the ``key_sep`` string is now configurable
+- ``materials.ItemTraitsDialog``: new dialog to edit item traits (where "item" is part of a job or work order or similar). The list of traits is the same as in vanilla work order conditions "``t`` change traits".
 - ``widgets.EditField``: the ``key_sep`` string is now configurable
 - ``widgets.EditField``: can now display an optional string label in addition to the activation key
 - ``widgets.EditField``: views that have an ``EditField`` subview no longer need to manually manage the ``EditField`` activation state and input routing.  This is now handled automatically by the new ``gui.View`` keyboard focus subsystem.
-- ``materials.ItemTraitsDialog``: new dialog to edit item traits (where "item" is part of a job or work order or similar). The list of traits is the same as in vanilla work order conditions "``t`` change traits".
+- ``widgets.HotkeyLabel``: the ``key_sep`` string is now configurable
 
 # 0.47.05-r5
 
diff --git a/library/xml b/library/xml
index 5dd972b8b..ef5c180ff 160000
--- a/library/xml
+++ b/library/xml
@@ -1 +1 @@
-Subproject commit 5dd972b8b5823e46a1b418fe483d4913347a13b1
+Subproject commit ef5c180ff220e53ec6b51e01ca3594a5780b8b4b
diff --git a/scripts b/scripts
index 4941cacca..592f6bd41 160000
--- a/scripts
+++ b/scripts
@@ -1 +1 @@
-Subproject commit 4941caccab6dd775d43250e79b8d1a75b8a24b57
+Subproject commit 592f6bd41b4ad90655a09d1939da589e6c421be6

From 0ae8a420800540692916395fbc8b629e6f9a8179 Mon Sep 17 00:00:00 2001
From: Tachytaenius <henryfthomson@gmail.com>
Date: Mon, 20 Jun 2022 19:38:23 +0100
Subject: [PATCH 131/854] Unfinished modding guide

---
 docs/changelog.txt            |  5 +++
 docs/guides/modding-guide.rst | 74 +++++++++++++++++++++++++++++++++++
 2 files changed, 79 insertions(+)
 create mode 100644 docs/guides/modding-guide.rst

diff --git a/docs/changelog.txt b/docs/changelog.txt
index e91a427a9..e944b7799 100644
--- a/docs/changelog.txt
+++ b/docs/changelog.txt
@@ -69,6 +69,11 @@ changelog.txt uses a syntax similar to RST, with a few special sequences:
 - `quickfort-alias-guide`: new aliases: ``forbidthread``, ``permitthread``, ``forbidadamantinethread``, ``permitadamantinethread``, ``forbidcloth``, ``permitcloth``, ``forbidadamantinecloth``, and ``permitadamantinecloth`` give you more control how adamantine-derived items are stored
 - `quickfort`: `Dreamfort <quickfort-blueprint-guide>` blueprint set improvements: automatically create tavern, library, and temple locations (restricted to residents only by default), automatically associate the rented rooms with the tavern
 - `quickfort`: `Dreamfort <quickfort-blueprint-guide>` blueprint set improvements: new design for the services level, including were-bitten hospital recovery rooms and an appropriately-themed interrogation room next to the jail! Also fits better in a 1x1 embark for minimalist players.
+- `quickfort`: `Dreamfort <quickfort-blueprint-guide>` blueprint set improvements: new design for the services level, including a werebeast-proof hospital recovery rooms and an appropriately-themed interrogation room next to the jail! Also fits better in a 1x1 embark for minimalist players.
+
+## Documentation
+- Added modding guide
+- Added anchor for DF data structure wrapper in Lua API
 
 ## API
 - ``word_wrap``: argument ``bool collapse_whitespace`` converted to enum ``word_wrap_whitespace_mode mode``, with valid modes ``WSMODE_KEEP_ALL``, ``WSMODE_COLLAPSE_ALL``, and ``WSMODE_TRIM_LEADING``.
diff --git a/docs/guides/modding-guide.rst b/docs/guides/modding-guide.rst
new file mode 100644
index 000000000..d2c453829
--- /dev/null
+++ b/docs/guides/modding-guide.rst
@@ -0,0 +1,74 @@
+DFHack modding guide
+====================
+
+Preface
+-------
+
+Why not just use raw modding?
+
+It's much less hacky for many things, easier to maintain, and easier to extend. Of course if you're adding a new creature or whatever do use raw modding, but for things like adding syndromes when certain actions are performed, absolutely try out DFHack. Many things will require a mix of raw modding and DFHack.
+
+What kind of things can we make?
+
+Lots of things, and the list grows as more and more hooks and tools are developed within DFHack. You can modify behaviours by cleverly watching and modifying certain areas of the game with functions that run on every tick or by using hooks. Familiarising yourself with the many structs oof the game will help with ideas immensely, and you can always ask for help in the right places (e.g. DFHack's Discord).
+
+You will need to know Lua for the scripting guides herein.
+
+A script-maker's environment
+----------------------------
+
+A script is run by writing its path and name from a script path folder without the file extension. E.g. gui/gm-editor for hack/scripts/gui/gm-editor.lua. You can make all your scripts in hack/scripts/, but this is not recommended as it makes things much harder to maintain each update. It's recommended to make a folder with a name like "own-scripts" and add it to dfhack-config/script-paths.txt. You should also make a folder for external installed scripts from the internet that are not in hack/scripts/.
+
+The structure of the game
+-------------------------
+
+"The game" is in the global variable `df <lua-df>`. The game's memory can be found in ``df.global``, containing things like the list of all items, whether to reindex pathfinding, et cetera. Also relevant to us in ``df`` are the various types found in the game, e.g. ``df.pronoun_type`` which we will be using.
+
+A script that prints data from a unit
+-------------------------------------
+
+So! It's time to write your first script. We are going to make a script that will get the pronoun type of the currently selected unit (there are many contexts where the function that gets the currently selected unit works).
+
+First line, we get the unit.::
+
+    local unit = dfhack.gui.getSelectedUnit()
+
+If no unit is selected, an error message will be printed (which can be silenced by passing ``true`` to ``getSelectedUnit``) and ``unit`` will be ``nil``.
+
+If ``unit`` is ``nil``, we don't want the script to run anymore.::
+
+    if not unit then
+        return
+    end
+
+Now, the field ``sex`` in a unit is an integer, but each integer corresponds to a string value (it, she, or he). We get this value by indexing the bidirectional map ``df.pronoun_type`` with an integer from the unit. Indexing the other way, with one of the strings, will yield its corresponding number. So:::
+
+    local pronounTypeString = df.pronoun_type[unit.sex]
+    print(pronounTypeString)
+
+Simple.
+
+Getting used to gm-editor and DFStructs exploration
+---------------------------------------------------
+
+So how could you have known about the field and type we just used?
+
+A script that prints more complex data from a unit
+--------------------------------------------------
+
+s
+
+Something that uses eventful and/or repeat-util
+-----------------------------------------------
+
+s
+
+Setting up an environment for a more advanced modular mod
+---------------------------------------------------------
+
+s
+
+A whole mod with multiple hooks and multiple functions that happen on tick
+--------------------------------------------------------------------------
+
+s

From 063e4897a84b8579bfcfd022f02602dff26ddb62 Mon Sep 17 00:00:00 2001
From: Tachytaenius <henryfthomson@gmail.com>
Date: Mon, 20 Jun 2022 20:31:19 +0100
Subject: [PATCH 132/854] Forgot to stage a change

---
 docs/Lua API.rst | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/Lua API.rst b/docs/Lua API.rst
index 55a217757..f2f252c4b 100644
--- a/docs/Lua API.rst	
+++ b/docs/Lua API.rst	
@@ -30,6 +30,7 @@ implemented by Lua files located in :file:`hack/lua/*`
   :local:
   :depth: 2
 
+.. _lua-df:
 
 =========================
 DF data structure wrapper

From f33c9bc8813a8588c3288304f271cddb295d0e9d Mon Sep 17 00:00:00 2001
From: quarque2 <107313885+quarque2@users.noreply.github.com>
Date: Mon, 20 Jun 2022 21:38:37 +0200
Subject: [PATCH 133/854] Update tile-material.lua (#2218)

* Update tile-material.lua

* Update changelog.txt

* Update changelog.txt

* Update changelog.txt

* Update tile-material.lua
---
 docs/changelog.txt            |   1 +
 library/lua/tile-material.lua | 154 +++++++++++++++-------------------
 2 files changed, 69 insertions(+), 86 deletions(-)

diff --git a/docs/changelog.txt b/docs/changelog.txt
index e91a427a9..35f344adb 100644
--- a/docs/changelog.txt
+++ b/docs/changelog.txt
@@ -46,6 +46,7 @@ changelog.txt uses a syntax similar to RST, with a few special sequences:
 ## API
 
 ## Lua
+- ``tile-material``: fix the order of declarations. The ``GetTileMat`` function now returns the material as intended (always returned nil before). Also changed the license info, with permission of the original author.
 
 # 0.47.05-r6
 
diff --git a/library/lua/tile-material.lua b/library/lua/tile-material.lua
index 0e5565d09..ca8b25030 100644
--- a/library/lua/tile-material.lua
+++ b/library/lua/tile-material.lua
@@ -1,25 +1,7 @@
 -- tile-material: Functions to help retrieve the material for a tile.
 
 --[[
-Copyright 2015-2016 Milo Christiansen
-
-This software is provided 'as-is', without any express or implied warranty. In
-no event will the authors be held liable for any damages arising from the use of
-this software.
-
-Permission is granted to anyone to use this software for any purpose, including
-commercial applications, and to alter it and redistribute it freely, subject to
-the following restrictions:
-
-1. The origin of this software must not be misrepresented; you must not claim
-that you wrote the original software. If you use this software in a product, an
-acknowledgment in the product documentation would be appreciated but is not
-required.
-
-2. Altered source versions must be plainly marked as such, and must not be
-misrepresented as being the original software.
-
-3. This notice may not be removed or altered from any source distribution.
+Original code provided by Milo Christiansen in 2015 under the MIT license. Relicensed under the ZLib license to align with the rest of DFHack, with his permission.
 ]]
 
 local _ENV = mkmodule("tile-material")
@@ -85,73 +67,6 @@ local function fixedMat(id)
     end
 end
 
--- BasicMats is a matspec table to pass to GetTileMatSpec or GetTileTypeMat. This particular
--- matspec table covers the common case of returning plant materials for plant tiles and other
--- materials for the remaining tiles.
-BasicMats = {
-    [df.tiletype_material.AIR] = nil, -- Empty
-    [df.tiletype_material.SOIL] = GetLayerMat,
-    [df.tiletype_material.STONE] = GetLayerMat,
-    [df.tiletype_material.FEATURE] = GetFeatureMat,
-    [df.tiletype_material.LAVA_STONE] = GetLavaStone,
-    [df.tiletype_material.MINERAL] = GetVeinMat,
-    [df.tiletype_material.FROZEN_LIQUID] = fixedMat("WATER:NONE"),
-    [df.tiletype_material.CONSTRUCTION] = GetConstructionMat,
-    [df.tiletype_material.GRASS_LIGHT] = GetGrassMat,
-    [df.tiletype_material.GRASS_DARK] = GetGrassMat,
-    [df.tiletype_material.GRASS_DRY] = GetGrassMat,
-    [df.tiletype_material.GRASS_DEAD] = GetGrassMat,
-    [df.tiletype_material.PLANT] = GetShrubMat,
-    [df.tiletype_material.HFS] = nil, -- Eerie Glowing Pit
-    [df.tiletype_material.CAMPFIRE] = GetLayerMat,
-    [df.tiletype_material.FIRE] = GetLayerMat,
-    [df.tiletype_material.ASHES] = GetLayerMat,
-    [df.tiletype_material.MAGMA] = nil, -- SMR
-    [df.tiletype_material.DRIFTWOOD] = GetLayerMat,
-    [df.tiletype_material.POOL] = GetLayerMat,
-    [df.tiletype_material.BROOK] = GetLayerMat,
-    [df.tiletype_material.ROOT] = GetLayerMat,
-    [df.tiletype_material.TREE] = GetTreeMat,
-    [df.tiletype_material.MUSHROOM] = GetTreeMat,
-    [df.tiletype_material.UNDERWORLD_GATE] = nil, -- I guess this is for the gates found in vaults?
-}
-
--- NoPlantMats is a matspec table to pass to GetTileMatSpec or GetTileTypeMat. This particular
--- matspec table will ignore plants, returning layer materials (or nil for trees) instead.
-NoPlantMats = {
-    [df.tiletype_material.SOIL] = GetLayerMat,
-    [df.tiletype_material.STONE] = GetLayerMat,
-    [df.tiletype_material.FEATURE] = GetFeatureMat,
-    [df.tiletype_material.LAVA_STONE] = GetLavaStone,
-    [df.tiletype_material.MINERAL] = GetVeinMat,
-    [df.tiletype_material.FROZEN_LIQUID] = fixedMat("WATER:NONE"),
-    [df.tiletype_material.CONSTRUCTION] = GetConstructionMat,
-    [df.tiletype_material.GRASS_LIGHT] = GetLayerMat,
-    [df.tiletype_material.GRASS_DARK] = GetLayerMat,
-    [df.tiletype_material.GRASS_DRY] = GetLayerMat,
-    [df.tiletype_material.GRASS_DEAD] = GetLayerMat,
-    [df.tiletype_material.PLANT] = GetLayerMat,
-    [df.tiletype_material.CAMPFIRE] = GetLayerMat,
-    [df.tiletype_material.FIRE] = GetLayerMat,
-    [df.tiletype_material.ASHES] = GetLayerMat,
-    [df.tiletype_material.DRIFTWOOD] = GetLayerMat,
-    [df.tiletype_material.POOL] = GetLayerMat,
-    [df.tiletype_material.BROOK] = GetLayerMat,
-    [df.tiletype_material.ROOT] = GetLayerMat,
-}
-
--- OnlyPlantMats is a matspec table to pass to GetTileMatSpec or GetTileTypeMat. This particular
--- matspec table will return nil for any non-plant tile. Plant tiles return the plant material.
-OnlyPlantMats = {
-    [df.tiletype_material.GRASS_LIGHT] = GetGrassMat,
-    [df.tiletype_material.GRASS_DARK] = GetGrassMat,
-    [df.tiletype_material.GRASS_DRY] = GetGrassMat,
-    [df.tiletype_material.GRASS_DEAD] = GetGrassMat,
-    [df.tiletype_material.PLANT] = GetShrubMat,
-    [df.tiletype_material.TREE] = GetTreeMat,
-    [df.tiletype_material.MUSHROOM] = GetTreeMat,
-}
-
 -- GetLayerMat returns the layer material for the given tile.
 -- AFAIK this will never return nil.
 function GetLayerMat(x, y, z)
@@ -349,6 +264,73 @@ function GetFeatureMat(x, y, z)
     return nil
 end
 
+-- BasicMats is a matspec table to pass to GetTileMatSpec or GetTileTypeMat. This particular
+-- matspec table covers the common case of returning plant materials for plant tiles and other
+-- materials for the remaining tiles.
+BasicMats = {
+    [df.tiletype_material.AIR] = nil, -- Empty
+    [df.tiletype_material.SOIL] = GetLayerMat,
+    [df.tiletype_material.STONE] = GetLayerMat,
+    [df.tiletype_material.FEATURE] = GetFeatureMat,
+    [df.tiletype_material.LAVA_STONE] = GetLavaStone,
+    [df.tiletype_material.MINERAL] = GetVeinMat,
+    [df.tiletype_material.FROZEN_LIQUID] = fixedMat("WATER:NONE"),
+    [df.tiletype_material.CONSTRUCTION] = GetConstructionMat,
+    [df.tiletype_material.GRASS_LIGHT] = GetGrassMat,
+    [df.tiletype_material.GRASS_DARK] = GetGrassMat,
+    [df.tiletype_material.GRASS_DRY] = GetGrassMat,
+    [df.tiletype_material.GRASS_DEAD] = GetGrassMat,
+    [df.tiletype_material.PLANT] = GetShrubMat,
+    [df.tiletype_material.HFS] = nil, -- Eerie Glowing Pit
+    [df.tiletype_material.CAMPFIRE] = GetLayerMat,
+    [df.tiletype_material.FIRE] = GetLayerMat,
+    [df.tiletype_material.ASHES] = GetLayerMat,
+    [df.tiletype_material.MAGMA] = nil, -- SMR
+    [df.tiletype_material.DRIFTWOOD] = GetLayerMat,
+    [df.tiletype_material.POOL] = GetLayerMat,
+    [df.tiletype_material.BROOK] = GetLayerMat,
+    [df.tiletype_material.ROOT] = GetLayerMat,
+    [df.tiletype_material.TREE] = GetTreeMat,
+    [df.tiletype_material.MUSHROOM] = GetTreeMat,
+    [df.tiletype_material.UNDERWORLD_GATE] = nil, -- I guess this is for the gates found in vaults?
+}
+
+-- NoPlantMats is a matspec table to pass to GetTileMatSpec or GetTileTypeMat. This particular
+-- matspec table will ignore plants, returning layer materials (or nil for trees) instead.
+NoPlantMats = {
+    [df.tiletype_material.SOIL] = GetLayerMat,
+    [df.tiletype_material.STONE] = GetLayerMat,
+    [df.tiletype_material.FEATURE] = GetFeatureMat,
+    [df.tiletype_material.LAVA_STONE] = GetLavaStone,
+    [df.tiletype_material.MINERAL] = GetVeinMat,
+    [df.tiletype_material.FROZEN_LIQUID] = fixedMat("WATER:NONE"),
+    [df.tiletype_material.CONSTRUCTION] = GetConstructionMat,
+    [df.tiletype_material.GRASS_LIGHT] = GetLayerMat,
+    [df.tiletype_material.GRASS_DARK] = GetLayerMat,
+    [df.tiletype_material.GRASS_DRY] = GetLayerMat,
+    [df.tiletype_material.GRASS_DEAD] = GetLayerMat,
+    [df.tiletype_material.PLANT] = GetLayerMat,
+    [df.tiletype_material.CAMPFIRE] = GetLayerMat,
+    [df.tiletype_material.FIRE] = GetLayerMat,
+    [df.tiletype_material.ASHES] = GetLayerMat,
+    [df.tiletype_material.DRIFTWOOD] = GetLayerMat,
+    [df.tiletype_material.POOL] = GetLayerMat,
+    [df.tiletype_material.BROOK] = GetLayerMat,
+    [df.tiletype_material.ROOT] = GetLayerMat,
+}
+
+-- OnlyPlantMats is a matspec table to pass to GetTileMatSpec or GetTileTypeMat. This particular
+-- matspec table will return nil for any non-plant tile. Plant tiles return the plant material.
+OnlyPlantMats = {
+    [df.tiletype_material.GRASS_LIGHT] = GetGrassMat,
+    [df.tiletype_material.GRASS_DARK] = GetGrassMat,
+    [df.tiletype_material.GRASS_DRY] = GetGrassMat,
+    [df.tiletype_material.GRASS_DEAD] = GetGrassMat,
+    [df.tiletype_material.PLANT] = GetShrubMat,
+    [df.tiletype_material.TREE] = GetTreeMat,
+    [df.tiletype_material.MUSHROOM] = GetTreeMat,
+}
+
 -- GetTileMat will return the material of the specified tile as determined by its tile type and the
 -- world geology data, etc.
 -- The returned material should exactly match the material reported by DF except in cases where is

From a880a2b92d5cb8e7c3f15d7c80315cee736b24c6 Mon Sep 17 00:00:00 2001
From: Tachytaenius <henryfthomson@gmail.com>
Date: Tue, 21 Jun 2022 12:48:28 +0100
Subject: [PATCH 134/854] Move changelog entries to proper place

---
 docs/changelog.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/changelog.txt b/docs/changelog.txt
index e944b7799..a07335715 100644
--- a/docs/changelog.txt
+++ b/docs/changelog.txt
@@ -42,6 +42,8 @@ changelog.txt uses a syntax similar to RST, with a few special sequences:
 ## Misc Improvements
 
 ## Documentation
+- Added modding guide
+- Added anchor for DF data structure wrapper in Lua API
 
 ## API
 
@@ -72,8 +74,6 @@ changelog.txt uses a syntax similar to RST, with a few special sequences:
 - `quickfort`: `Dreamfort <quickfort-blueprint-guide>` blueprint set improvements: new design for the services level, including a werebeast-proof hospital recovery rooms and an appropriately-themed interrogation room next to the jail! Also fits better in a 1x1 embark for minimalist players.
 
 ## Documentation
-- Added modding guide
-- Added anchor for DF data structure wrapper in Lua API
 
 ## API
 - ``word_wrap``: argument ``bool collapse_whitespace`` converted to enum ``word_wrap_whitespace_mode mode``, with valid modes ``WSMODE_KEEP_ALL``, ``WSMODE_COLLAPSE_ALL``, and ``WSMODE_TRIM_LEADING``.

From ccee6ba48700c16af900e7ff0a5cec54e1cfa0c4 Mon Sep 17 00:00:00 2001
From: Tachytaenius <henryfthomson@gmail.com>
Date: Tue, 21 Jun 2022 12:53:59 +0100
Subject: [PATCH 135/854] Added link to modding guide from changelog

---
 docs/changelog.txt            | 2 +-
 docs/guides/modding-guide.rst | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/docs/changelog.txt b/docs/changelog.txt
index a07335715..2118a5380 100644
--- a/docs/changelog.txt
+++ b/docs/changelog.txt
@@ -42,7 +42,7 @@ changelog.txt uses a syntax similar to RST, with a few special sequences:
 ## Misc Improvements
 
 ## Documentation
-- Added modding guide
+- Added `modding guide <modding-guide>`
 - Added anchor for DF data structure wrapper in Lua API
 
 ## API
diff --git a/docs/guides/modding-guide.rst b/docs/guides/modding-guide.rst
index d2c453829..5d55ca44e 100644
--- a/docs/guides/modding-guide.rst
+++ b/docs/guides/modding-guide.rst
@@ -1,3 +1,5 @@
+.. _modding-guide:
+
 DFHack modding guide
 ====================
 

From 4c2a533de0960a8fc27d0105c56a550b6ffb0fdb Mon Sep 17 00:00:00 2001
From: Tachytaenius <henryfthomson@gmail.com>
Date: Tue, 21 Jun 2022 12:54:28 +0100
Subject: [PATCH 136/854] Remove "added anchor" from changelog

---
 docs/changelog.txt | 1 -
 1 file changed, 1 deletion(-)

diff --git a/docs/changelog.txt b/docs/changelog.txt
index 2118a5380..a54957796 100644
--- a/docs/changelog.txt
+++ b/docs/changelog.txt
@@ -43,7 +43,6 @@ changelog.txt uses a syntax similar to RST, with a few special sequences:
 
 ## Documentation
 - Added `modding guide <modding-guide>`
-- Added anchor for DF data structure wrapper in Lua API
 
 ## API
 

From 88a9755d785e2ecd751c7e0ee1711aadf188eb85 Mon Sep 17 00:00:00 2001
From: Tachytaenius <henryfthomson@gmail.com>
Date: Tue, 21 Jun 2022 12:54:45 +0100
Subject: [PATCH 137/854] Update docs/guides/modding-guide.rst

Co-authored-by: Myk <myk002@yahoo.com>
---
 docs/guides/modding-guide.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/guides/modding-guide.rst b/docs/guides/modding-guide.rst
index 5d55ca44e..58f32fa28 100644
--- a/docs/guides/modding-guide.rst
+++ b/docs/guides/modding-guide.rst
@@ -26,7 +26,7 @@ The structure of the game
 
 "The game" is in the global variable `df <lua-df>`. The game's memory can be found in ``df.global``, containing things like the list of all items, whether to reindex pathfinding, et cetera. Also relevant to us in ``df`` are the various types found in the game, e.g. ``df.pronoun_type`` which we will be using.
 
-A script that prints data from a unit
+Your first script
 -------------------------------------
 
 So! It's time to write your first script. We are going to make a script that will get the pronoun type of the currently selected unit (there are many contexts where the function that gets the currently selected unit works).

From 92ab6b10529509b804bae8a4d86397da1cade856 Mon Sep 17 00:00:00 2001
From: Tachytaenius <henryfthomson@gmail.com>
Date: Tue, 21 Jun 2022 12:58:29 +0100
Subject: [PATCH 138/854] Update docs/guides/modding-guide.rst

Co-authored-by: Myk <myk002@yahoo.com>
---
 docs/guides/modding-guide.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/guides/modding-guide.rst b/docs/guides/modding-guide.rst
index 58f32fa28..dfd143e08 100644
--- a/docs/guides/modding-guide.rst
+++ b/docs/guides/modding-guide.rst
@@ -14,7 +14,7 @@ What kind of things can we make?
 
 Lots of things, and the list grows as more and more hooks and tools are developed within DFHack. You can modify behaviours by cleverly watching and modifying certain areas of the game with functions that run on every tick or by using hooks. Familiarising yourself with the many structs oof the game will help with ideas immensely, and you can always ask for help in the right places (e.g. DFHack's Discord).
 
-You will need to know Lua for the scripting guides herein.
+DFHack scripts are written in Lua. If you don't already know Lua, there's a great primer at <link>.
 
 A script-maker's environment
 ----------------------------

From 52161df42863a14c18c43a95a90495eaf7a2811d Mon Sep 17 00:00:00 2001
From: Tachytaenius <henryfthomson@gmail.com>
Date: Tue, 21 Jun 2022 12:58:36 +0100
Subject: [PATCH 139/854] Update docs/guides/modding-guide.rst

Co-authored-by: Myk <myk002@yahoo.com>
---
 docs/guides/modding-guide.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/guides/modding-guide.rst b/docs/guides/modding-guide.rst
index dfd143e08..d4514156e 100644
--- a/docs/guides/modding-guide.rst
+++ b/docs/guides/modding-guide.rst
@@ -16,7 +16,7 @@ Lots of things, and the list grows as more and more hooks and tools are develope
 
 DFHack scripts are written in Lua. If you don't already know Lua, there's a great primer at <link>.
 
-A script-maker's environment
+A mod-maker's development environment
 ----------------------------
 
 A script is run by writing its path and name from a script path folder without the file extension. E.g. gui/gm-editor for hack/scripts/gui/gm-editor.lua. You can make all your scripts in hack/scripts/, but this is not recommended as it makes things much harder to maintain each update. It's recommended to make a folder with a name like "own-scripts" and add it to dfhack-config/script-paths.txt. You should also make a folder for external installed scripts from the internet that are not in hack/scripts/.

From 6f2998d7e5514f4a7bbd922f33dae4efdc33c901 Mon Sep 17 00:00:00 2001
From: Tachytaenius <henryfthomson@gmail.com>
Date: Tue, 21 Jun 2022 12:58:40 +0100
Subject: [PATCH 140/854] Update docs/guides/modding-guide.rst

Co-authored-by: Myk <myk002@yahoo.com>
---
 docs/guides/modding-guide.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/guides/modding-guide.rst b/docs/guides/modding-guide.rst
index d4514156e..c8f13baf7 100644
--- a/docs/guides/modding-guide.rst
+++ b/docs/guides/modding-guide.rst
@@ -10,7 +10,7 @@ Why not just use raw modding?
 
 It's much less hacky for many things, easier to maintain, and easier to extend. Of course if you're adding a new creature or whatever do use raw modding, but for things like adding syndromes when certain actions are performed, absolutely try out DFHack. Many things will require a mix of raw modding and DFHack.
 
-What kind of things can we make?
+What kind of mods can we make?
 
 Lots of things, and the list grows as more and more hooks and tools are developed within DFHack. You can modify behaviours by cleverly watching and modifying certain areas of the game with functions that run on every tick or by using hooks. Familiarising yourself with the many structs oof the game will help with ideas immensely, and you can always ask for help in the right places (e.g. DFHack's Discord).
 

From 41526f376d9bc9bcb68b6526eb4f31e72bb6003e Mon Sep 17 00:00:00 2001
From: Tachytaenius <henryfthomson@gmail.com>
Date: Tue, 21 Jun 2022 13:02:10 +0100
Subject: [PATCH 141/854] Fix wrong - length

---
 docs/guides/modding-guide.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/guides/modding-guide.rst b/docs/guides/modding-guide.rst
index c8f13baf7..e60bc2650 100644
--- a/docs/guides/modding-guide.rst
+++ b/docs/guides/modding-guide.rst
@@ -17,7 +17,7 @@ Lots of things, and the list grows as more and more hooks and tools are develope
 DFHack scripts are written in Lua. If you don't already know Lua, there's a great primer at <link>.
 
 A mod-maker's development environment
-----------------------------
+-------------------------------------
 
 A script is run by writing its path and name from a script path folder without the file extension. E.g. gui/gm-editor for hack/scripts/gui/gm-editor.lua. You can make all your scripts in hack/scripts/, but this is not recommended as it makes things much harder to maintain each update. It's recommended to make a folder with a name like "own-scripts" and add it to dfhack-config/script-paths.txt. You should also make a folder for external installed scripts from the internet that are not in hack/scripts/.
 
@@ -27,7 +27,7 @@ The structure of the game
 "The game" is in the global variable `df <lua-df>`. The game's memory can be found in ``df.global``, containing things like the list of all items, whether to reindex pathfinding, et cetera. Also relevant to us in ``df`` are the various types found in the game, e.g. ``df.pronoun_type`` which we will be using.
 
 Your first script
--------------------------------------
+-----------------
 
 So! It's time to write your first script. We are going to make a script that will get the pronoun type of the currently selected unit (there are many contexts where the function that gets the currently selected unit works).
 

From a9ab415ac7f5443a7129db461055125a7d808f6d Mon Sep 17 00:00:00 2001
From: Tachytaenius <henryfthomson@gmail.com>
Date: Tue, 21 Jun 2022 15:20:49 +0100
Subject: [PATCH 142/854] Clean merge heckery and clean up label reference

---
 docs/changelog.txt | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/docs/changelog.txt b/docs/changelog.txt
index a54957796..797a79f3a 100644
--- a/docs/changelog.txt
+++ b/docs/changelog.txt
@@ -42,7 +42,7 @@ changelog.txt uses a syntax similar to RST, with a few special sequences:
 ## Misc Improvements
 
 ## Documentation
-- Added `modding guide <modding-guide>`
+- Added `modding-guide`
 
 ## API
 
@@ -70,9 +70,6 @@ changelog.txt uses a syntax similar to RST, with a few special sequences:
 - `quickfort-alias-guide`: new aliases: ``forbidthread``, ``permitthread``, ``forbidadamantinethread``, ``permitadamantinethread``, ``forbidcloth``, ``permitcloth``, ``forbidadamantinecloth``, and ``permitadamantinecloth`` give you more control how adamantine-derived items are stored
 - `quickfort`: `Dreamfort <quickfort-blueprint-guide>` blueprint set improvements: automatically create tavern, library, and temple locations (restricted to residents only by default), automatically associate the rented rooms with the tavern
 - `quickfort`: `Dreamfort <quickfort-blueprint-guide>` blueprint set improvements: new design for the services level, including were-bitten hospital recovery rooms and an appropriately-themed interrogation room next to the jail! Also fits better in a 1x1 embark for minimalist players.
-- `quickfort`: `Dreamfort <quickfort-blueprint-guide>` blueprint set improvements: new design for the services level, including a werebeast-proof hospital recovery rooms and an appropriately-themed interrogation room next to the jail! Also fits better in a 1x1 embark for minimalist players.
-
-## Documentation
 
 ## API
 - ``word_wrap``: argument ``bool collapse_whitespace`` converted to enum ``word_wrap_whitespace_mode mode``, with valid modes ``WSMODE_KEEP_ALL``, ``WSMODE_COLLAPSE_ALL``, and ``WSMODE_TRIM_LEADING``.

From 9163728b99f40bd5b89577d29d735eaa20fe0def Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Tue, 21 Jun 2022 12:09:12 -0700
Subject: [PATCH 143/854] hide blueprints that should be hidden, update help

---
 data/blueprints/library/dreamfort.csv | 57 +++++++++++++--------------
 1 file changed, 28 insertions(+), 29 deletions(-)

diff --git a/data/blueprints/library/dreamfort.csv b/data/blueprints/library/dreamfort.csv
index 296e6c88b..a00a00e9e 100644
--- a/data/blueprints/library/dreamfort.csv
+++ b/data/blueprints/library/dreamfort.csv
@@ -74,12 +74,12 @@ quickfort run library/dreamfort.csv -n /farming3,# Run when furniture has been p
 quickfort run library/dreamfort.csv -n /industry2,# Run when the industry level has been dug out.
 prioritize ConstructBuilding,# To get those workshops up and running ASAP. You may have to run this several times as the materials for the building construction jobs become ready.
 quickfort run library/dreamfort.csv -n /surface4,"# Run after the walls and floors are built on the surface. Even if /surface3 is finished before you run /industry2, though, wait until after /industry2 to run this blueprint so that surface walls, floors, and roofing don't prevent your workshops from being built (due to lack of blocks)."
-"quickfort run,orders library/dreamfort.csv -n /services2",# Run when the services levels have been dug out. Feel free to remove the orders for the ropes if you already brought them with you.
+"quickfort orders,run library/dreamfort.csv -n /services2",# Run when the services levels have been dug out. Feel free to remove the orders for the ropes if you already brought them with you.
 orders import basic,"# Run after the first migration wave, so you have dorfs to do all the basic tasks. Note that this is the ""orders"" plugin, not the ""quickfort orders"" command."
-"quickfort run,orders library/dreamfort.csv -n /surface5","# Run when all marked trees on the surface are chopped down and walls and floors have been constructed, including the roof section over the future barracks."
+"quickfort orders,run library/dreamfort.csv -n /surface5","# Run when all marked trees on the surface are chopped down and walls and floors have been constructed, including the roof section over the future barracks."
 prioritize ConstructBuilding,# Run when you see the bridges ready to be built so the busy masons come and build them.
-"quickfort run,orders library/dreamfort.csv -n /surface6",# Run when at least the beehives and weapon rack are constructed and you have linked all levers to their respective bridges.
-"quickfort run,orders library/dreamfort.csv -n /surface7",# Run after the surface walls are completed and any marked trees are chopped down.
+"quickfort orders,run library/dreamfort.csv -n /surface6",# Run when at least the beehives and weapon rack are constructed and you have linked all levers to their respective bridges.
+"quickfort orders,run library/dreamfort.csv -n /surface7",# Run after the surface walls are completed and any marked trees are chopped down.
 ""
 -- Plumbing --
 "This is a good time to fill your well cisterns, either with a bucket brigade or by routing water from a freshwater stream or an aquifer (see the library/aquifer_tap.csv blueprint for help with this)."
@@ -87,23 +87,23 @@ prioritize ConstructBuilding,# Run when you see the bridges ready to be built so
 ""
 -- Mature fort (third migration wave onward) --
 orders import furnace,# Automated production of basic furnace-related items. Don't forget to create a sand collection zone (or remove the sand- and glass-related orders if you have no sand).
-"quickfort run,orders library/dreamfort.csv -n /suites2",# Run when the suites level has been dug out.
-"quickfort run,orders library/dreamfort.csv -n /surface8","# Run if/when you need longer trap corridors on the surface for larger sieges, anytime after you run /surface7."
-"quickfort run,orders library/dreamfort.csv -n /apartments2",# Run when the first apartment level has been dug out.
-"quickfort run,orders library/dreamfort.csv -n /services3","# Run after the dining table and chair, weapon rack, and archery targets have been constructed. Also wait until after you complete /surface7, though, because surface defenses are more important than a grand dining hall."
-"quickfort run,orders library/dreamfort.csv -n /guildhall2",# Run when the guildhall level has been dug out.
-"quickfort run,orders library/dreamfort.csv -n ""/guildhall3, /guildhall4""",# Optionally run after /guildhall2 to build default furnishings and declare a library and temple.
-"quickfort run,orders library/dreamfort.csv -n /apartments3",# Run when all beds have been constructed on the first apartments level.
-"quickfort run,orders library/dreamfort.csv -n /farming4",# Run once you have a cache of potash.
+"quickfort orders,run library/dreamfort.csv -n /suites2",# Run when the suites level has been dug out.
+"quickfort orders,run library/dreamfort.csv -n /surface8","# Run if/when you need longer trap corridors on the surface for larger sieges, anytime after you run /surface7."
+"quickfort orders,run library/dreamfort.csv -n /apartments2",# Run when the first apartment level has been dug out.
+"quickfort orders,run library/dreamfort.csv -n /services3","# Run after the dining table and chair, weapon rack, and archery targets have been constructed. Also wait until after you complete /surface7, though, because surface defenses are more important than a grand dining hall."
+"quickfort orders,run library/dreamfort.csv -n /guildhall2",# Run when the guildhall level has been dug out.
+"quickfort orders,run library/dreamfort.csv -n ""/guildhall3, /guildhall4""",# Optionally run after /guildhall2 to build default furnishings and declare a library and temple.
+"quickfort orders,run library/dreamfort.csv -n /apartments3",# Run when all beds have been constructed on the first apartments level.
+"quickfort orders,run library/dreamfort.csv -n /farming4",# Run once you have a cache of potash.
 orders import military,# Automated production of military equipment. Turn on automelt in the meltables piles on the industry level to automatically upgrade all metal military equipment to masterwork quality. These orders are optional if you are not using a military.
 orders import smelting,# Automated production of all types of metal bars.
-"quickfort run,orders library/dreamfort.csv -n /services4","# Run when you need a jail, anytime after the restraints are placed from /services3."
+"quickfort orders,run library/dreamfort.csv -n /services4","# Run when you need a jail, anytime after the restraints are placed from /services3."
 orders import rockstock,# Maintains a small stock of all types of rock furniture.
 orders import glassstock,# Maintains a small stock of all types of glass furniture and parts (only import if you have sand).
 ""
 -- Repeat for each remaining apartments level as needed --
-"quickfort run,orders library/dreamfort.csv -n /apartments2",# Run when the apartment level has been dug out.
-"quickfort run,orders library/dreamfort.csv -n /apartments3",# Run when all beds have been constructed.
+"quickfort orders,run library/dreamfort.csv -n /apartments2",# Run when the apartment level has been dug out.
+"quickfort orders,run library/dreamfort.csv -n /apartments3",# Run when all beds have been constructed.
 burial -pets,# Run once the coffins are placed to set them to allow for burial.
 
 See this checklist online at https://docs.google.com/spreadsheets/d/13PVZ2h3Mm3x_G1OXQvwKd7oIR2lK4A1Ahf6Om1kFigw/edit#gid=1459509569
@@ -232,6 +232,7 @@ https://drive.google.com/file/d/1Et42JTzeYK23iI5wrPMsFJ7lUXwVBQob/view?usp=shari
 [PET:2:BIRD_GOOSE:FEMALE:STANDARD]
 [PET:2:BIRD_GOOSE:MALE:STANDARD]
 #meta label(all_orders) hidden() references all blueprints that generate orders; for testing only
+/surface1
 /surface2
 /surface3
 /surface4
@@ -239,27 +240,25 @@ https://drive.google.com/file/d/1Et42JTzeYK23iI5wrPMsFJ7lUXwVBQob/view?usp=shari
 /surface6
 /surface7
 /surface8
+/farming1
 /farming2
 /farming3
 /farming4
+/industry1
 /industry2
+/services1
 /services2
 /services3
 /services4
+/guildhall1
 /guildhall2
+/guildhall3
+/guildhall4
+/suites1
 /suites2
-/apartments2
-/apartments2
-/apartments2
-/apartments2
-/apartments2
-/apartments2
-/apartments3
-/apartments3
-/apartments3
-/apartments3
-/apartments3
-/apartments3
+/apartments1 repeat(>5)
+/apartments2 repeat(>5)
+/apartments3 repeat(>5)
 #notes label(surface_help)
 Sets up a protected entrance to your fort in a flat area on the surface.
 Screenshot: https://drive.google.com/file/d/1YL_vQJLB2YnUEFrAg9y3HEdFq3Wpw9WP
@@ -2382,7 +2381,7 @@ query_jail/services_query_jail
 ,`,`,`,`,`,,`,`,`,`,`
 ,`,`,`,`,`,,`,`,`,`,`
 
-"#query label(services_query_dining) start(18; 18) message(The tavern is restricted to residents only by default. If you'd like your tavern to attract vistors, please go to the (l)ocation menu and change the restriction.) set up dining room/tavern and barracks"
+"#query label(services_query_dining) start(18; 18) hidden() message(The tavern is restricted to residents only by default. If you'd like your tavern to attract vistors, please go to the (l)ocation menu and change the restriction.) set up dining room/tavern and barracks"
 
 ,`,`,`,,`,`,`,,`,`,`,,`,`,`,,`,,`,`,`
 ,`,`,`,,`,`,`,,`,`,`,,`,`,`,`,`,`,`,`,`
@@ -2418,7 +2417,7 @@ query_jail/services_query_jail
 ,`,`,`,`,`,,`,`,`,`,`
 ,`,`,`,`,`,,`,`,`,`,`
 
-#query label(services_query_rented_rooms) start(18; 18) attach rented rooms to tavern
+#query label(services_query_rented_rooms) start(18; 18) hidden() attach rented rooms to tavern
 
 ,r&l-&,r&l-&,r&l-&,,r&l-&,r&l-&,r&l-&,,r&l-&,r&l-&,r&l-&,,`,`,`,,`,,`,`,`
 ,`,`,`,,`,`,`,,`,`,`,,`,`,`,`,`,`,`,`,`

From ac864204c2258151b05bbe019c006c26e2c14e6b Mon Sep 17 00:00:00 2001
From: Tachytaenius <henryfthomson@gmail.com>
Date: Tue, 21 Jun 2022 21:07:35 +0100
Subject: [PATCH 144/854] More work on guide, added to existing sections and
 revised sections list

---
 docs/guides/modding-guide.rst | 27 +++++++++++++++------------
 1 file changed, 15 insertions(+), 12 deletions(-)

diff --git a/docs/guides/modding-guide.rst b/docs/guides/modding-guide.rst
index e60bc2650..f124ba121 100644
--- a/docs/guides/modding-guide.rst
+++ b/docs/guides/modding-guide.rst
@@ -8,18 +8,24 @@ Preface
 
 Why not just use raw modding?
 
-It's much less hacky for many things, easier to maintain, and easier to extend. Of course if you're adding a new creature or whatever do use raw modding, but for things like adding syndromes when certain actions are performed, absolutely try out DFHack. Many things will require a mix of raw modding and DFHack.
+For many things it's either completely and only (sensibly) doable in raws or completely and only doable with DFHack. For mods where DFHack is an alternative and not the only option, it's much less hacky, easier to maintain, and easier to extend, and is not prone to side-effects. A great example is adding a syndrome when a reaction is performed requiring an exploding boulder in raws but having dedicated tools for it if you use DFHack. Many things will require a mix of raw modding and DFHack.
 
 What kind of mods can we make?
 
-Lots of things, and the list grows as more and more hooks and tools are developed within DFHack. You can modify behaviours by cleverly watching and modifying certain areas of the game with functions that run on every tick or by using hooks. Familiarising yourself with the many structs oof the game will help with ideas immensely, and you can always ask for help in the right places (e.g. DFHack's Discord).
+Lots of things, and the list grows as more and more hooks and tools are developed within DFHack. You can modify behaviours by cleverly watching and modifying certain areas of the game with functions that run on every tick or by using hooks. Familiarising yourself with the many structs of the game will help with ideas immensely, and you can always ask for help in the right places (e.g. DFHack's Discord).
 
-DFHack scripts are written in Lua. If you don't already know Lua, there's a great primer at <link>.
+Examples of things we have mod tools to allow are directly changing skills, spawning liquids, adding new powered buildings, creating items/trees/units based on various conditions (in reactions or similar), running code when certain projectiles hit or move, and much else besides.
+
+DFHack scripts are written in Lua. If you don't already know Lua, there's a great primer at https://www.lua.org/pil/1.html.
 
 A mod-maker's development environment
 -------------------------------------
 
-A script is run by writing its path and name from a script path folder without the file extension. E.g. gui/gm-editor for hack/scripts/gui/gm-editor.lua. You can make all your scripts in hack/scripts/, but this is not recommended as it makes things much harder to maintain each update. It's recommended to make a folder with a name like "own-scripts" and add it to dfhack-config/script-paths.txt. You should also make a folder for external installed scripts from the internet that are not in hack/scripts/.
+Scripts can be run from a world's ``raw/scripts/`` directory, and (configurably) are run by default from ``hack/scripts/``. Scripts in ``raw/init.d/`` are automatically run on world load. Scripts within the raws are a component for more advanced mods.
+
+A script is run by writing its path and name from a script path folder without the file extension into a DFHack command prompt (in-game or the external one). E.g. ``gui/gm-editor`` for ``hack/scripts/gui/gm-editor.lua``.
+
+You can make all your scripts in ``hack/scripts/``, but this is not recommended as it makes things much harder to maintain each update. It's recommended to make a folder with a name like "own-scripts" and add it to ``dfhack-config/script-paths.txt``. You should also make a folder for external installed scripts from the internet that are not in ``hack/scripts/``. You can prepend your script paths entries with a ``+`` so that they take precedence over other folders.
 
 The structure of the game
 -------------------------
@@ -48,20 +54,17 @@ Now, the field ``sex`` in a unit is an integer, but each integer corresponds to
     local pronounTypeString = df.pronoun_type[unit.sex]
     print(pronounTypeString)
 
-Simple.
+Simple. Save this as a Lua file in your own scripts directory and run it as shown before when focused on a unit one way or another.
 
 Getting used to gm-editor and DFStructs exploration
 ---------------------------------------------------
 
 So how could you have known about the field and type we just used?
 
-A script that prints more complex data from a unit
---------------------------------------------------
-
 s
 
-Something that uses eventful and/or repeat-util
------------------------------------------------
+Detecting triggers
+------------------
 
 s
 
@@ -70,7 +73,7 @@ Setting up an environment for a more advanced modular mod
 
 s
 
-A whole mod with multiple hooks and multiple functions that happen on tick
---------------------------------------------------------------------------
+Your first whole mod
+--------------------
 
 s

From f812e09ae1470b26d3375337bc98de90f27692b4 Mon Sep 17 00:00:00 2001
From: Tachytaenius <henryfthomson@gmail.com>
Date: Tue, 21 Jun 2022 21:35:07 +0100
Subject: [PATCH 145/854] Update modding guide with an extra paragraph and
 syntax fixes

---
 docs/guides/modding-guide.rst | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/docs/guides/modding-guide.rst b/docs/guides/modding-guide.rst
index f124ba121..d3bf384c8 100644
--- a/docs/guides/modding-guide.rst
+++ b/docs/guides/modding-guide.rst
@@ -27,6 +27,8 @@ A script is run by writing its path and name from a script path folder without t
 
 You can make all your scripts in ``hack/scripts/``, but this is not recommended as it makes things much harder to maintain each update. It's recommended to make a folder with a name like "own-scripts" and add it to ``dfhack-config/script-paths.txt``. You should also make a folder for external installed scripts from the internet that are not in ``hack/scripts/``. You can prepend your script paths entries with a ``+`` so that they take precedence over other folders.
 
+If your mod is installed into ``raw/scripts/`` be aware that the copies of the scripts in ``data/save/*/raw/`` are checked first and will run instead of any changes you make to an in-development copy outside of a raw folder.
+
 The structure of the game
 -------------------------
 
@@ -37,19 +39,19 @@ Your first script
 
 So! It's time to write your first script. We are going to make a script that will get the pronoun type of the currently selected unit (there are many contexts where the function that gets the currently selected unit works).
 
-First line, we get the unit.::
+First line, we get the unit. ::
 
     local unit = dfhack.gui.getSelectedUnit()
 
 If no unit is selected, an error message will be printed (which can be silenced by passing ``true`` to ``getSelectedUnit``) and ``unit`` will be ``nil``.
 
-If ``unit`` is ``nil``, we don't want the script to run anymore.::
+If ``unit`` is ``nil``, we don't want the script to run anymore. ::
 
     if not unit then
         return
     end
 
-Now, the field ``sex`` in a unit is an integer, but each integer corresponds to a string value (it, she, or he). We get this value by indexing the bidirectional map ``df.pronoun_type`` with an integer from the unit. Indexing the other way, with one of the strings, will yield its corresponding number. So:::
+Now, the field ``sex`` in a unit is an integer, but each integer corresponds to a string value (it, she, or he). We get this value by indexing the bidirectional map ``df.pronoun_type`` with an integer from the unit. Indexing the other way, with one of the strings, will yield its corresponding number. So: ::
 
     local pronounTypeString = df.pronoun_type[unit.sex]
     print(pronounTypeString)

From ba629b8e0a022e8891d7177ebc58f53cc923244b Mon Sep 17 00:00:00 2001
From: Myk <myk002@yahoo.com>
Date: Tue, 21 Jun 2022 16:38:04 -0700
Subject: [PATCH 146/854] manually handle DestroyBuilding jobs (#2209)

* don't delete general refs from jobs that we cancel

though we still disconnect the refs if we can

* get job remove working in all cases

we apparently need to manually handle DestroyBuilding jobs
everything else we should let cancel_job handle

* update changelog
---
 docs/changelog.txt      |  1 +
 library/modules/Job.cpp | 31 ++++++++++++++-----------------
 2 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/docs/changelog.txt b/docs/changelog.txt
index 35f344adb..6499a1fb5 100644
--- a/docs/changelog.txt
+++ b/docs/changelog.txt
@@ -38,6 +38,7 @@ changelog.txt uses a syntax similar to RST, with a few special sequences:
 ## New Tweaks
 
 ## Fixes
+- ``job.removeJob()``: ensure jobs are removed from the world list when they are canceled
 
 ## Misc Improvements
 
diff --git a/library/modules/Job.cpp b/library/modules/Job.cpp
index 749be199e..ff158caa0 100644
--- a/library/modules/Job.cpp
+++ b/library/modules/Job.cpp
@@ -360,27 +360,24 @@ bool DFHack::Job::removeJob(df::job* job) {
     using df::global::world;
     CHECK_NULL_POINTER(job);
 
-    // cancel_job below does not clean up refs, so we have to do that first
+    // cancel_job below does not clean up all refs, so we have to do some work
 
-    // clean up general refs
-    for (auto genRef : job->general_refs) {
-        if (!genRef) continue;
-
-        // disconnectJobGeneralRef only handles buildings and units
-        if (genRef->getType() != general_ref_type::BUILDING_HOLDER &&
-                genRef->getType() != general_ref_type::UNIT_WORKER)
-            return false;
-    }
+    // manually handle DESTROY_BUILDING jobs (cancel_job doesn't handle them)
+    if (job->job_type == df::job_type::DestroyBuilding) {
+        for (auto &genRef : job->general_refs) {
+            disconnectJobGeneralRef(job, genRef);
+            if (genRef) delete genRef;
+        }
+        job->general_refs.resize(0);
 
-    for (auto genRef : job->general_refs) {
-        // this should always succeed because of the check in the preceding loop
-        bool success = disconnectJobGeneralRef(job, genRef);
-        assert(success); (void)success;
-        if (genRef) delete genRef;
+        // remove the job from the world
+        job->list_link->prev->next = job->list_link->next;
+        delete job->list_link;
+        delete job;
+        return true;
     }
-    job->general_refs.resize(0);
 
-    // clean up item refs
+    // clean up item refs and delete them
     for (auto &item_ref : job->items) {
        disconnectJobItem(job, item_ref);
        if (item_ref) delete item_ref;

From 234fcb8fe32f84aadfefc13266020c276f9e70e0 Mon Sep 17 00:00:00 2001
From: DFHack-Urist via GitHub Actions
 <63161697+DFHack-Urist@users.noreply.github.com>
Date: Wed, 22 Jun 2022 07:17:32 +0000
Subject: [PATCH 147/854] Auto-update submodules

scripts: master
---
 scripts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts b/scripts
index 592f6bd41..90abe4a64 160000
--- a/scripts
+++ b/scripts
@@ -1 +1 @@
-Subproject commit 592f6bd41b4ad90655a09d1939da589e6c421be6
+Subproject commit 90abe4a64d1babea491a113b487df73aecc1e3ff

From 280737365687a810da7d4d465e2054ed472624ad Mon Sep 17 00:00:00 2001
From: DFHack-Urist via GitHub Actions
 <63161697+DFHack-Urist@users.noreply.github.com>
Date: Wed, 22 Jun 2022 19:02:58 +0000
Subject: [PATCH 148/854] Auto-update submodules

scripts: master
---
 scripts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts b/scripts
index 90abe4a64..dab8b2246 160000
--- a/scripts
+++ b/scripts
@@ -1 +1 @@
-Subproject commit 90abe4a64d1babea491a113b487df73aecc1e3ff
+Subproject commit dab8b22464cc81c7bc59e3e0f19ea3999676ffdf

From b0bff47f0377f8845425e92b9c42ddde056e712c Mon Sep 17 00:00:00 2001
From: Simon Lees <simon@simotek.net>
Date: Thu, 23 Jun 2022 22:19:05 +0930
Subject: [PATCH 149/854] Fix use after free's

This was detected by gcc and causing the build to fail on my
Linux machine
---
 plugins/orders.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/plugins/orders.cpp b/plugins/orders.cpp
index c984f5060..85ba62486 100644
--- a/plugins/orders.cpp
+++ b/plugins/orders.cpp
@@ -540,10 +540,10 @@ static command_result orders_import(color_ostream &out, Json::Value &orders)
             }
             else
             {
-                delete order;
-
                 out << COLOR_LIGHTRED << "Invalid item subtype for imported manager order: " << enum_item_key(order->item_type) << ":" << it["item_subtype"].asString() << std::endl;
 
+                delete order;
+
                 return CR_FAILURE;
             }
         }
@@ -716,10 +716,10 @@ static command_result orders_import(color_ostream &out, Json::Value &orders)
                     }
                     else
                     {
-                        delete condition;
-
                         out << COLOR_YELLOW << "Invalid item condition item subtype for imported manager order: " << enum_item_key(condition->item_type) << ":" << it2["item_subtype"].asString() << std::endl;
 
+                        delete condition;
+
                         continue;
                     }
                 }

From 9788a8a22a344e0b1c50cde410b7c57ebad44496 Mon Sep 17 00:00:00 2001
From: Timur Kelman <tymur.gubayev@gmail.com>
Date: Wed, 29 Jun 2022 01:27:18 +0200
Subject: [PATCH 150/854] Add default selection handler to
 `materials.ItemTraitsDialog` (#2211)

* add forward compatibility for future `job_item_flags`

* add default selection handler to `materials.ItemTraitsDialog`

* add a call to `error()` in 'unknown'-branch inside `setTrait`

* add `ItemTraitsDialog` improvement description to changelog.txt
---
 docs/changelog.txt            |  2 +
 library/lua/gui/materials.lua | 96 ++++++++++++++++++++++++++++++++++-
 2 files changed, 97 insertions(+), 1 deletion(-)

diff --git a/docs/changelog.txt b/docs/changelog.txt
index 6499a1fb5..2d5a5cf64 100644
--- a/docs/changelog.txt
+++ b/docs/changelog.txt
@@ -42,6 +42,8 @@ changelog.txt uses a syntax similar to RST, with a few special sequences:
 
 ## Misc Improvements
 
+- ``materials.ItemTraitsDialog``: added a default ``on_select``-handler which toggles the traits.
+
 ## Documentation
 
 ## API
diff --git a/library/lua/gui/materials.lua b/library/lua/gui/materials.lua
index c9eaaf38d..c81161bc5 100644
--- a/library/lua/gui/materials.lua
+++ b/library/lua/gui/materials.lua
@@ -345,7 +345,8 @@ end
 
 function ItemTraitsDialog(args)
     local job_item_flags_map = {}
-    for i = 1, 3 do
+    for i = 1, 5 do
+        if not df['job_item_flags'..i] then break end
         for _, f in ipairs(df['job_item_flags'..i]) do
             if f then
                 job_item_flags_map[f] = 'flags'..i
@@ -600,6 +601,99 @@ function ItemTraitsDialog(args)
         args.on_select = function(idx, obj)
             return cb(obj)
         end
+    else
+        local function toggleFlag(obj, ffield, flag)
+            local job_item = obj.job_item
+            job_item[ffield][flag] = not job_item[ffield][flag]
+        end
+
+        local function toggleToolUse(obj, tool_use)
+            local job_item = obj.job_item
+            tool_use = df.tool_uses[tool_use]
+            if job_item.has_tool_use == tool_use then
+                job_item.has_tool_use = df.tool_uses.NONE
+            else
+                job_item.has_tool_use = tool_use
+            end
+        end
+
+        local function toggleMetalOre(obj, ore_ix)
+            local job_item = obj.job_item
+            if job_item.metal_ore == ore_ix then
+                job_item.metal_ore = -1
+            else
+                job_item.metal_ore = ore_ix
+            end
+        end
+
+        function toggleReactionClass(obj, reaction_class)
+            local job_item = obj.job_item
+            if job_item.reaction_class == reaction_class then
+                job_item.reaction_class = ''
+            else
+                job_item.reaction_class = reaction_class
+            end
+        end
+
+        local function toggleProductMaterial(obj, product_materials)
+            local job_item = obj.job_item
+            if job_item.has_material_reaction_product == product_materials then
+                job_item.has_material_reaction_product = ''
+            else
+                job_item.has_material_reaction_product = product_materials
+            end
+        end
+
+        local function unsetFlags(obj)
+            local job_item = obj.job_item
+            for flag, ffield in pairs(job_item_flags_map) do
+                if job_item[ffield][flag] then
+                    toggleFlag(obj, ffield, flag)
+                end
+            end
+        end
+
+        local function setTrait(obj, sel)
+            if sel.ffield then
+                --print('toggle flag', sel.ffield, sel.flag)
+                toggleFlag(obj, sel.ffield, sel.flag)
+            elseif sel.reset_flags then
+                --print('reset every flag')
+                unsetFlags(obj)
+            elseif sel.tool_use then
+                --print('toggle tool_use', sel.tool_use)
+                toggleToolUse(obj, sel.tool_use)
+            elseif sel.ore_ix then
+                --print('toggle ore', sel.ore_ix)
+                toggleMetalOre(obj, sel.ore_ix)
+            elseif sel.reaction_class then
+                --print('toggle reaction class', sel.reaction_class)
+                toggleReactionClass(obj, sel.reaction_class)
+            elseif sel.product_materials then
+                --print('toggle product materials', sel.product_materials)
+                toggleProductMaterial(obj, sel.product_materials)
+            elseif sel.reset_all_traits then
+                --print('reset every trait')
+                -- flags
+                unsetFlags(obj)
+                -- tool use
+                toggleToolUse(obj, 'NONE')
+                -- metal ore
+                toggleMetalOre(obj, -1)
+                -- reaction class
+                toggleReactionClass(obj, '')
+                -- producing
+                toggleProductMaterial(obj, '')
+            else
+                print('unknown sel')
+                printall(sel)
+                error('Selected entry in ItemTraitsDialog was of unknown type')
+            end
+        end
+
+        args.on_select = function(idx, choice)
+            setTrait(args, choice)
+        end
     end
 
     return dlg.ListBox(args)

From 12958e15c6ae80e88191ccf40cc7e0c07e83f546 Mon Sep 17 00:00:00 2001
From: DFHack-Urist via GitHub Actions
 <63161697+DFHack-Urist@users.noreply.github.com>
Date: Wed, 29 Jun 2022 07:17:24 +0000
Subject: [PATCH 151/854] Auto-update submodules

plugins/stonesense: master
---
 plugins/stonesense | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/stonesense b/plugins/stonesense
index 841803ca6..8ddba1944 160000
--- a/plugins/stonesense
+++ b/plugins/stonesense
@@ -1 +1 @@
-Subproject commit 841803ca6f173f4d97eea376b4dcd512336e35e2
+Subproject commit 8ddba1944274d0f22fef4bc6cc52229818e580bb

From 8a605e190305f80603a99ae77860e080cb9e5626 Mon Sep 17 00:00:00 2001
From: Quietust <quietust@gmail.com>
Date: Wed, 29 Jun 2022 08:27:37 -0600
Subject: [PATCH 152/854] The great de-anon-ification

---
 library/xml                |  2 +-
 plugins/building-hacks.cpp | 12 ++++++------
 plugins/orders.cpp         |  8 ++++----
 scripts                    |  2 +-
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/library/xml b/library/xml
index ef5c180ff..e803099f5 160000
--- a/library/xml
+++ b/library/xml
@@ -1 +1 @@
-Subproject commit ef5c180ff220e53ec6b51e01ca3594a5780b8b4b
+Subproject commit e803099f5d983055e4b5b00a6baf4bcc91c6f25d
diff --git a/plugins/building-hacks.cpp b/plugins/building-hacks.cpp
index 2c75d4622..635d99261 100644
--- a/plugins/building-hacks.cpp
+++ b/plugins/building-hacks.cpp
@@ -88,8 +88,8 @@ struct work_hook : df::building_workshopst{
             df::general_ref_creaturest* ref = static_cast<df::general_ref_creaturest*>(DFHack::Buildings::getGeneralRef(this, general_ref_type::CREATURE));
             if (ref)
             {
-                info->produced = ref->anon_1;
-                info->consumed = ref->anon_2;
+                info->produced = ref->unk_1;
+                info->consumed = ref->unk_2;
                 return true;
             }
             else
@@ -118,14 +118,14 @@ struct work_hook : df::building_workshopst{
         df::general_ref_creaturest* ref = static_cast<df::general_ref_creaturest*>(DFHack::Buildings::getGeneralRef(this, general_ref_type::CREATURE));
         if (ref)
         {
-            ref->anon_1 = produced;
-            ref->anon_2 = consumed;
+            ref->unk_1 = produced;
+            ref->unk_2 = consumed;
         }
         else
         {
             ref = df::allocate<df::general_ref_creaturest>();
-            ref->anon_1 = produced;
-            ref->anon_2 = consumed;
+            ref->unk_1 = produced;
+            ref->unk_2 = consumed;
             general_refs.push_back(ref);
         }
     }
diff --git a/plugins/orders.cpp b/plugins/orders.cpp
index 85ba62486..fb678ca6d 100644
--- a/plugins/orders.cpp
+++ b/plugins/orders.cpp
@@ -467,7 +467,7 @@ static command_result orders_export_command(color_ostream & out, const std::stri
                     condition["order"] = it2->order_id;
                     condition["condition"] = enum_item_key(it2->condition);
 
-                    // TODO: anon_1
+                    // TODO: unk_1
 
                     conditions.append(condition);
                 }
@@ -475,7 +475,7 @@ static command_result orders_export_command(color_ostream & out, const std::stri
                 order["order_conditions"] = conditions;
             }
 
-            // TODO: anon_1
+            // TODO: items
 
             orders.append(order);
         }
@@ -873,13 +873,13 @@ static command_result orders_import(color_ostream &out, Json::Value &orders)
                     continue;
                 }
 
-                // TODO: anon_1
+                // TODO: unk_1
 
                 order->order_conditions.push_back(condition);
             }
         }
 
-        // TODO: anon_1
+        // TODO: items
 
         world->manager_orders.push_back(order);
     }
diff --git a/scripts b/scripts
index dab8b2246..274b81ded 160000
--- a/scripts
+++ b/scripts
@@ -1 +1 @@
-Subproject commit dab8b22464cc81c7bc59e3e0f19ea3999676ffdf
+Subproject commit 274b81ded9c72bff23eca4f0c2a78cb6cb900f8e

From 0aa7ec877e4201af76b429438037fb5fc8a501c2 Mon Sep 17 00:00:00 2001
From: DFHack-Urist via GitHub Actions
 <63161697+DFHack-Urist@users.noreply.github.com>
Date: Wed, 29 Jun 2022 15:17:13 +0000
Subject: [PATCH 153/854] Auto-update submodules

library/xml: master
scripts: master
---
 library/xml | 2 +-
 scripts     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/library/xml b/library/xml
index e803099f5..8d15b2d07 160000
--- a/library/xml
+++ b/library/xml
@@ -1 +1 @@
-Subproject commit e803099f5d983055e4b5b00a6baf4bcc91c6f25d
+Subproject commit 8d15b2d07c18cc9dfbd550b32ad43e46b2d4014d
diff --git a/scripts b/scripts
index 274b81ded..7b92cec52 160000
--- a/scripts
+++ b/scripts
@@ -1 +1 @@
-Subproject commit 274b81ded9c72bff23eca4f0c2a78cb6cb900f8e
+Subproject commit 7b92cec5246f97f278e4d608899278d2cafc0992

From 8bb047fcc6a67aa0c0faef880aa1d7dd2ed758a0 Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Sat, 28 May 2022 16:55:20 -0400
Subject: [PATCH 154/854] Remove Notes module

Only used in a devel plugin that prints notes, and can be easily replaced
with `ui.waypoints.points`
---
 docs/changelog.txt                |   2 +
 library/CMakeLists.txt            |   3 -
 library/Core.cpp                  |   6 -
 library/include/Core.h            |   9 -
 library/include/ModuleFactory.h   |   1 -
 library/include/modules/Notes.h   |  65 -------
 library/include/modules/Windows.h | 270 ------------------------------
 library/modules/Notes.cpp         |  53 ------
 library/modules/Windows.cpp       | 118 -------------
 plugins/devel/CMakeLists.txt      |   1 -
 plugins/devel/notes.cpp           |  72 --------
 11 files changed, 2 insertions(+), 598 deletions(-)
 delete mode 100644 library/include/modules/Notes.h
 delete mode 100644 library/include/modules/Windows.h
 delete mode 100644 library/modules/Notes.cpp
 delete mode 100644 library/modules/Windows.cpp
 delete mode 100644 plugins/devel/notes.cpp

diff --git a/docs/changelog.txt b/docs/changelog.txt
index 2d5a5cf64..290c4ec3b 100644
--- a/docs/changelog.txt
+++ b/docs/changelog.txt
@@ -47,6 +47,8 @@ changelog.txt uses a syntax similar to RST, with a few special sequences:
 ## Documentation
 
 ## API
+- Removed ``Notes`` module (C++-only). Access ``ui.waypoints.points`` directly instead.
+- Removed ``Windows`` module (C++-only) - unused.
 
 ## Lua
 - ``tile-material``: fix the order of declarations. The ``GetTileMat`` function now returns the material as intended (always returned nil before). Also changed the license info, with permission of the original author.
diff --git a/library/CMakeLists.txt b/library/CMakeLists.txt
index 9e7bf8590..440281cf7 100644
--- a/library/CMakeLists.txt
+++ b/library/CMakeLists.txt
@@ -138,7 +138,6 @@ set(MODULE_HEADERS
     include/modules/MapCache.h
     include/modules/Maps.h
     include/modules/Materials.h
-    include/modules/Notes.h
     include/modules/Once.h
     include/modules/Persistence.h
     include/modules/Random.h
@@ -165,7 +164,6 @@ set(MODULE_SOURCES
     modules/MapCache.cpp
     modules/Maps.cpp
     modules/Materials.cpp
-    modules/Notes.cpp
     modules/Once.cpp
     modules/Persistence.cpp
     modules/Random.cpp
@@ -173,7 +171,6 @@ set(MODULE_SOURCES
     modules/Screen.cpp
     modules/Translation.cpp
     modules/Units.cpp
-    modules/Windows.cpp
     modules/World.cpp
 )
 
diff --git a/library/Core.cpp b/library/Core.cpp
index 10f5057f3..55aa9dc55 100644
--- a/library/Core.cpp
+++ b/library/Core.cpp
@@ -54,7 +54,6 @@ using namespace std;
 #include "modules/Gui.h"
 #include "modules/World.h"
 #include "modules/Graphic.h"
-#include "modules/Windows.h"
 #include "modules/Persistence.h"
 #include "RemoteServer.h"
 #include "RemoteTools.h"
@@ -1564,7 +1563,6 @@ Core::Core() :
     last_local_map_ptr = NULL;
     last_pause_state = false;
     top_viewscreen = NULL;
-    screen_window = NULL;
 
     color_ostream::log_errors_to_stderr = true;
 
@@ -1835,8 +1833,6 @@ bool Core::Init()
     cerr << "Starting DF input capture thread.\n";
     // set up hotkey capture
     d->hotkeythread = std::thread(fHKthread, (void *) temp);
-    screen_window = new Windows::top_level_window();
-    screen_window->addChild(new Windows::dfhack_dummy(5,10));
     started = true;
     modstate = 0;
 
@@ -1984,7 +1980,6 @@ int Core::TileUpdate()
 {
     if(!started)
         return false;
-    screen_window->paint();
     return true;
 }
 
@@ -2922,5 +2917,4 @@ TYPE * Core::get##TYPE() \
 }
 
 MODULE_GETTER(Materials);
-MODULE_GETTER(Notes);
 MODULE_GETTER(Graphic);
diff --git a/library/include/Core.h b/library/include/Core.h
index 1648ae113..f6acd9425 100644
--- a/library/include/Core.h
+++ b/library/include/Core.h
@@ -58,7 +58,6 @@ namespace DFHack
     class Process;
     class Module;
     class Materials;
-    class Notes;
     struct VersionInfo;
     class VersionInfoFactory;
     class PluginManager;
@@ -69,10 +68,6 @@ namespace DFHack
     namespace Lua { namespace Core {
         DFHACK_EXPORT void Reset(color_ostream &out, const char *where);
     } }
-    namespace Windows
-    {
-        class df_window;
-    }
 
     namespace Screen
     {
@@ -146,8 +141,6 @@ namespace DFHack
 
         /// get the materials module
         Materials * getMaterials();
-        /// get the notes module
-        Notes * getNotes();
         /// get the graphic module
         Graphic * getGraphic();
         /// sets the current hotkey command
@@ -193,7 +186,6 @@ namespace DFHack
 
         std::unique_ptr<DFHack::Process> p;
         std::shared_ptr<DFHack::VersionInfo> vinfo;
-        DFHack::Windows::df_window * screen_window;
 
         static void print(const char *format, ...) Wformat(printf,1,2);
         static void printerr(const char *format, ...) Wformat(printf,1,2);
@@ -242,7 +234,6 @@ namespace DFHack
         struct
         {
             Materials * pMaterials;
-            Notes * pNotes;
             Graphic * pGraphic;
         } s_mods;
         std::vector<std::unique_ptr<Module>> allModules;
diff --git a/library/include/ModuleFactory.h b/library/include/ModuleFactory.h
index 5c3c149a2..c99e7b328 100644
--- a/library/include/ModuleFactory.h
+++ b/library/include/ModuleFactory.h
@@ -33,7 +33,6 @@ namespace DFHack
 {
     class Module;
     std::unique_ptr<Module> createMaterials();
-    std::unique_ptr<Module> createNotes();
     std::unique_ptr<Module> createGraphic();
 }
 #endif
diff --git a/library/include/modules/Notes.h b/library/include/modules/Notes.h
deleted file mode 100644
index 14bb9db84..000000000
--- a/library/include/modules/Notes.h
+++ /dev/null
@@ -1,65 +0,0 @@
-#pragma once
-#ifndef CL_MOD_NOTES
-#define CL_MOD_NOTES
-/**
- * \defgroup grp_notes In game notes (and routes)
- * @ingroup grp_notes
- */
-#include "Export.h"
-#include "Module.h"
-
-#include <vector>
-#include <string>
-
-#ifdef __cplusplus
-namespace DFHack
-{
-#endif
-    /**
-     * Game's structure for a note.
-     * \ingroup grp_notes
-     */
-    struct t_note
-    {
-        // First note created has id 0, second has id 1, etc.  Not affected
-        // by lower id notes being deleted.
-        uint32_t id; // 0
-        uint8_t  symbol; // 4
-        uint8_t  unk1; // alignment padding?
-        uint16_t foreground; // 6
-        uint16_t background; // 8
-        uint16_t unk2; // alignment padding?
-
-        std::string name; // C
-        std::string text; // 10
-
-        uint16_t x; // 14
-        uint16_t y; // 16
-        uint16_t z; // 18
-
-        // Is there more?
-    };
-
-#ifdef __cplusplus
-
-    /**
-     * The notes module - allows reading DF in-game notes
-     * \ingroup grp_modules
-     * \ingroup grp_notes
-     */
-    class DFHACK_EXPORT Notes : public Module
-    {
-        public:
-        Notes();
-        ~Notes(){};
-        bool Finish()
-        {
-            return true;
-        }
-        std::vector<t_note*>* notes;
-    };
-
-}
-#endif // __cplusplus
-
-#endif
diff --git a/library/include/modules/Windows.h b/library/include/modules/Windows.h
deleted file mode 100644
index f9b282cf3..000000000
--- a/library/include/modules/Windows.h
+++ /dev/null
@@ -1,270 +0,0 @@
-/*
-https://github.com/peterix/dfhack
-Copyright (c) 2009-2012 Petr Mrázek (peterix@gmail.com)
-
-This software is provided 'as-is', without any express or implied
-warranty. In no event will the authors be held liable for any
-damages arising from the use of this software.
-
-Permission is granted to anyone to use this software for any
-purpose, including commercial applications, and to alter it and
-redistribute it freely, subject to the following restrictions:
-
-1. The origin of this software must not be misrepresented; you must
-not claim that you wrote the original software. If you use this
-software in a product, an acknowledgment in the product documentation
-would be appreciated but is not required.
-
-2. Altered source versions must be plainly marked as such, and
-must not be misrepresented as being the original software.
-
-3. This notice may not be removed or altered from any source
-distribution.
-*/
-
-#pragma once
-#include "Export.h"
-#include <cstddef>
-
-namespace DFHack
-{
-namespace Windows
-{
-    /*
-     * DF window stuffs
-     */
-    enum df_color
-    {
-        black,
-        blue,
-        green,
-        cyan,
-        red,
-        magenta,
-        brown,
-        lgray,
-        dgray,
-        lblue,
-        lgreen,
-        lcyan,
-        lred,
-        lmagenta,
-        yellow,
-        white
-        // maybe add transparency?
-    };
-
-    // The tile format DF uses internally
-    struct df_screentile
-    {
-        uint8_t symbol;
-        uint8_t foreground; ///< df_color
-        uint8_t background; ///< df_color
-        uint8_t bright;
-    };
-
-
-    // our silly painter things and window things follow.
-    class df_window;
-    struct df_tilebuf
-    {
-        df_screentile * data;
-        unsigned int width;
-        unsigned int height;
-    };
-
-    DFHACK_EXPORT df_screentile *getScreenBuffer();
-
-    class DFHACK_EXPORT painter
-    {
-        friend class df_window;
-    public:
-        df_screentile* get(unsigned int x, unsigned int y)
-        {
-            if(x >= width || y >= height)
-                return 0;
-            return &buffer[x*height + y];
-        };
-        bool set(unsigned int x, unsigned int y, df_screentile tile )
-        {
-            if(x >= width || y >= height)
-                return false;
-            buffer[x*height + y] = tile;
-            return true;
-        }
-        df_color foreground (df_color change = (df_color) -1)
-        {
-            if(change != -1)
-                current_foreground = change;
-            return current_foreground;
-        }
-        df_color background (df_color change = (df_color) -1)
-        {
-            if(change != -1)
-                current_background = change;
-            return current_background;
-        }
-        void bright (bool change)
-        {
-            current_bright = change;
-        }
-        bool bright ()
-        {
-            return current_bright;
-        }
-        void printStr(std::string & str, bool wrap = false)
-        {
-            for ( auto iter = str.begin(); iter != str.end(); iter++)
-            {
-                auto elem = *iter;
-                if(cursor_y >= (int)height)
-                    break;
-                if(wrap)
-                {
-                    if(cursor_x >= (int)width)
-                        cursor_x = wrap_column;
-                }
-                df_screentile & tile = buffer[cursor_x * height + cursor_y];
-                tile.symbol = elem;
-                tile.foreground = current_foreground;
-                tile.background = current_background;
-                tile.bright = current_bright;
-                cursor_x++;
-            }
-        }
-        void set_wrap (int new_column)
-        {
-            wrap_column = new_column;
-        }
-        void gotoxy(unsigned int x, unsigned int y)
-        {
-            cursor_x = x;
-            cursor_y = y;
-        }
-        void reset()
-        {
-            cursor_x = 0;
-            cursor_y = 0;
-            current_background = black;
-            current_foreground = white;
-            current_bright = false;
-            wrap_column = 0;
-        }
-    private:
-        painter (df_window * orig, df_screentile * buf, unsigned int width, unsigned int height)
-        {
-            origin = orig;
-            this->width = width;
-            this->height = height;
-            this->buffer = buf;
-            reset();
-        }
-        df_window* origin;
-        unsigned int width;
-        unsigned int height;
-        df_screentile* buffer;
-        // current paint cursor position
-        int cursor_x;
-        int cursor_y;
-        int wrap_column;
-        // current foreground color
-        df_color current_foreground;
-        // current background color
-        df_color current_background;
-        // make bright?
-        bool current_bright;
-    };
-
-    class DFHACK_EXPORT df_window
-    {
-        friend class painter;
-    public:
-        df_window(int x, int y, unsigned int width, unsigned int height);
-        virtual ~df_window();
-        virtual bool move (int left_, int top_, unsigned int width_, unsigned int height_) = 0;
-        virtual void paint () = 0;
-        virtual painter * lock();
-        bool unlock (painter * painter);
-        virtual bool addChild(df_window *);
-        virtual df_tilebuf getBuffer() = 0;
-    public:
-        df_screentile* buffer;
-        unsigned int width;
-        unsigned int height;
-    protected:
-        df_window * parent;
-        std::vector <df_window *> children;
-        int left;
-        int top;
-        // FIXME: FAKE
-        bool locked;
-        painter * current_painter;
-    };
-
-    class DFHACK_EXPORT top_level_window : public df_window
-    {
-    public:
-        top_level_window();
-        virtual bool move (int left_, int top_, unsigned int width_, unsigned int height_);
-        virtual void paint ();
-        virtual painter * lock();
-        virtual df_tilebuf getBuffer();
-    };
-    class DFHACK_EXPORT buffered_window : public df_window
-    {
-    public:
-        buffered_window(int x, int y, unsigned int width, unsigned int height):df_window(x,y,width, height)
-        {
-            buffer = new df_screentile[width*height];
-        };
-        virtual ~buffered_window()
-        {
-            delete buffer;
-        }
-        virtual void blit_to_parent ()
-        {
-            df_tilebuf par = parent->getBuffer();
-            for(unsigned xi = 0; xi < width; xi++)
-            {
-                for(unsigned yi = 0; yi < height; yi++)
-                {
-                    unsigned parx = left + xi;
-                    unsigned pary = top + yi;
-                    if(pary >= par.height) continue;
-                    if(parx >= par.width) continue;
-                    par.data[parx * par.height + pary] = buffer[xi * height + yi];
-                }
-            }
-        }
-        virtual df_tilebuf getBuffer()
-        {
-            df_tilebuf buf;
-            buf.data = buffer;
-            buf.width = width;
-            buf.height = height;
-            return buf;
-        };
-    };
-    class DFHACK_EXPORT dfhack_dummy : public buffered_window
-    {
-    public:
-        dfhack_dummy(int x, int y):buffered_window(x,y,6,1){};
-        virtual bool move (int left_, int top_, unsigned int width_, unsigned int height_)
-        {
-            top = top_;
-            left = left_;
-            return true;
-        }
-        virtual void paint ()
-        {
-            painter * p = lock();
-            p->bright(true);
-            p->background(black);
-            p->foreground(white);
-            std::string dfhack = "DFHack";
-            p->printStr(dfhack);
-            blit_to_parent();
-        }
-    };
-}
-}
diff --git a/library/modules/Notes.cpp b/library/modules/Notes.cpp
deleted file mode 100644
index 04fb59e4d..000000000
--- a/library/modules/Notes.cpp
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
-www.sourceforge.net/projects/dfhack
-Copyright (c) 2009 Petr Mrázek (peterix), Kenneth Ferland (Impaler[WrG]), dorf
-
-This software is provided 'as-is', without any express or implied
-warranty. In no event will the authors be held liable for any
-damages arising from the use of this software.
-
-Permission is granted to anyone to use this software for any
-purpose, including commercial applications, and to alter it and
-redistribute it freely, subject to the following restrictions:
-
-1. The origin of this software must not be misrepresented; you must
-not claim that you wrote the original software. If you use this
-software in a product, an acknowledgment in the product documentation
-would be appreciated but is not required.
-
-2. Altered source versions must be plainly marked as such, and
-must not be misrepresented as being the original software.
-
-3. This notice may not be removed or altered from any source
-distribution.
-*/
-
-#include "Internal.h"
-
-#include <string>
-#include <vector>
-#include <map>
-using namespace std;
-
-#include "VersionInfo.h"
-#include "Types.h"
-#include "Error.h"
-#include "MemAccess.h"
-#include "MiscUtils.h"
-#include "ModuleFactory.h"
-#include "Core.h"
-#include "modules/Notes.h"
-#include <DataDefs.h>
-#include "df/ui.h"
-using namespace DFHack;
-
-std::unique_ptr<Module> DFHack::createNotes()
-{
-    return dts::make_unique<Notes>();
-}
-
-// FIXME: not even a wrapper now
-Notes::Notes()
-{
-    notes = (std::vector<t_note*>*) &df::global::ui->waypoints.points;
-}
diff --git a/library/modules/Windows.cpp b/library/modules/Windows.cpp
deleted file mode 100644
index af5368e50..000000000
--- a/library/modules/Windows.cpp
+++ /dev/null
@@ -1,118 +0,0 @@
-/*
-https://github.com/peterix/dfhack
-Copyright (c) 2009-2012 Petr Mrázek (peterix@gmail.com)
-
-This software is provided 'as-is', without any express or implied
-warranty. In no event will the authors be held liable for any
-damages arising from the use of this software.
-
-Permission is granted to anyone to use this software for any
-purpose, including commercial applications, and to alter it and
-redistribute it freely, subject to the following restrictions:
-
-1. The origin of this software must not be misrepresented; you must
-not claim that you wrote the original software. If you use this
-software in a product, an acknowledgment in the product documentation
-would be appreciated but is not required.
-
-2. Altered source versions must be plainly marked as such, and
-must not be misrepresented as being the original software.
-
-3. This notice may not be removed or altered from any source
-distribution.
-*/
-
-#include "Export.h"
-#include "Module.h"
-#include "BitArray.h"
-#include <string>
-
-#include "DataDefs.h"
-#include "df/init.h"
-#include "df/ui.h"
-#include <df/graphic.h>
-#include "modules/Windows.h"
-
-using namespace DFHack;
-using df::global::gps;
-
-Windows::df_screentile *Windows::getScreenBuffer()
-{
-    if (!gps) return NULL;
-    return (df_screentile *) gps->screen;
-}
-
-Windows::df_window::df_window(int x, int y, unsigned int width, unsigned int height)
-:buffer(0), width(width), height(height), parent(0), left(x), top(y), current_painter(NULL)
-{
-    buffer = 0;
-};
-Windows::df_window::~df_window()
-{
-    for(auto iter = children.begin();iter != children.end();iter++)
-    {
-        delete *iter;
-    }
-    children.clear();
-};
-Windows::painter * Windows::df_window::lock()
-{
-    locked = true;
-    current_painter = new Windows::painter(this,buffer,width, height);
-    return current_painter;
-};
-
-bool Windows::df_window::addChild( df_window * child)
-{
-    children.push_back(child);
-    child->parent = this;
-    return true;
-}
-
-bool Windows::df_window::unlock (painter * painter)
-{
-    if(current_painter == painter)
-    {
-        delete current_painter;
-        current_painter = 0;
-        locked = false;
-        return true;
-    }
-    return false;
-}
-
-Windows::top_level_window::top_level_window() : df_window(0,0,gps ? gps->dimx : 80,gps ? gps->dimy : 25)
-{
-    buffer = 0;
-}
-
-bool Windows::top_level_window::move (int left_, int top_, unsigned int width_, unsigned int height_)
-{
-    width = width_;
-    height = height_;
-    // what if we are painting already? Is that possible?
-    return true;
-};
-
-Windows::painter * Windows::top_level_window::lock()
-{
-    buffer = getScreenBuffer();
-    return df_window::lock();
-}
-
-void Windows::top_level_window::paint ()
-{
-    for(auto iter = children.begin();iter != children.end();iter++)
-    {
-        (*iter)->paint();
-    }
-};
-
-Windows::df_tilebuf Windows::top_level_window::getBuffer()
-{
-    df_tilebuf buf;
-    buf.data = getScreenBuffer();
-    buf.height = df::global::gps->dimy;
-    buf.width = df::global::gps->dimx;
-    return buf;
-}
diff --git a/plugins/devel/CMakeLists.txt b/plugins/devel/CMakeLists.txt
index 6d15f09dd..d1b84614f 100644
--- a/plugins/devel/CMakeLists.txt
+++ b/plugins/devel/CMakeLists.txt
@@ -13,7 +13,6 @@ dfhack_plugin(eventExample eventExample.cpp)
 dfhack_plugin(frozen frozen.cpp)
 dfhack_plugin(kittens kittens.cpp LINK_LIBRARIES ${CMAKE_THREAD_LIBS_INIT})
 dfhack_plugin(memview memview.cpp memutils.cpp LINK_LIBRARIES lua)
-dfhack_plugin(notes notes.cpp)
 dfhack_plugin(onceExample onceExample.cpp)
 dfhack_plugin(renderer-msg renderer-msg.cpp)
 dfhack_plugin(rprobe rprobe.cpp)
diff --git a/plugins/devel/notes.cpp b/plugins/devel/notes.cpp
deleted file mode 100644
index 33b768af7..000000000
--- a/plugins/devel/notes.cpp
+++ /dev/null
@@ -1,72 +0,0 @@
-#include "Core.h"
-#include <Console.h>
-#include <Export.h>
-#include <PluginManager.h>
-#include <vector>
-#include <string>
-#include <modules/Notes.h>
-
-using std::vector;
-using std::string;
-using namespace DFHack;
-
-command_result df_notes (color_ostream &out, vector <string> & parameters);
-
-DFHACK_PLUGIN("notes");
-
-DFhackCExport command_result plugin_init ( color_ostream &out, std::vector <PluginCommand> &commands)
-{
-    commands.push_back(PluginCommand("dumpnotes",
-               "Dumps in-game notes",
-               df_notes));
-    return CR_OK;
-}
-
-DFhackCExport command_result plugin_shutdown ( color_ostream &out )
-{
-    return CR_OK;
-}
-
-command_result df_notes (color_ostream &con, vector <string> & parameters)
-{
-    CoreSuspender suspend;
-
-    DFHack::Notes * note_mod = Core::getInstance().getNotes();
-    std::vector<t_note*>* note_list = note_mod->notes;
-
-    if (note_list == NULL)
-    {
-        con.printerr("Notes are not supported under this version of DF.\n");
-        return CR_OK;
-    }
-
-    if (note_list->empty())
-    {
-        con << "There are no notes." << std::endl;
-        return CR_OK;
-    }
-
-
-    for (size_t i = 0; i < note_list->size(); i++)
-    {
-        t_note* note = (*note_list)[i];
-
-        con.print("Note %p at: %d/%d/%d\n",note, note->x, note->y, note->z);
-        con.print("Note id: %d\n", note->id);
-        con.print("Note symbol: '%c'\n", note->symbol);
-
-        if (note->name.length() > 0)
-            con << "Note name: " << (note->name) << std::endl;
-        if (note->text.length() > 0)
-            con << "Note text: " << (note->text) << std::endl;
-
-        if (note->unk1 != 0)
-            con.print("unk1: %x\n", note->unk1);
-        if (note->unk2 != 0)
-            con.print("unk2: %x\n", note->unk2);
-
-        con << std::endl;
-    }
-
-    return CR_OK;
-}

From 4c7caa2658a29c77841bb7fa401ce58e6b000ae8 Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Sat, 4 Jun 2022 12:57:18 -0400
Subject: [PATCH 155/854] Remove unneeded dependencies on modules/Graphic.h

---
 docs/changelog.txt                   |  1 +
 library/CMakeLists.txt               |  2 -
 library/Core.cpp                     |  1 -
 library/PlugLoad-windows.cpp         |  1 -
 library/include/DFHack.h             |  1 -
 library/include/Hooks.h              |  1 -
 library/include/modules/Engravings.h | 63 ----------------------
 library/modules/Engravings.cpp       | 78 ----------------------------
 8 files changed, 1 insertion(+), 147 deletions(-)
 delete mode 100644 library/include/modules/Engravings.h
 delete mode 100644 library/modules/Engravings.cpp

diff --git a/docs/changelog.txt b/docs/changelog.txt
index 290c4ec3b..8f663d9bc 100644
--- a/docs/changelog.txt
+++ b/docs/changelog.txt
@@ -47,6 +47,7 @@ changelog.txt uses a syntax similar to RST, with a few special sequences:
 ## Documentation
 
 ## API
+- Removed ``Engravings`` module (C++-only). Access ``world.engravings`` directly instead.
 - Removed ``Notes`` module (C++-only). Access ``ui.waypoints.points`` directly instead.
 - Removed ``Windows`` module (C++-only) - unused.
 
diff --git a/library/CMakeLists.txt b/library/CMakeLists.txt
index 440281cf7..c9e9cd844 100644
--- a/library/CMakeLists.txt
+++ b/library/CMakeLists.txt
@@ -126,7 +126,6 @@ set(MODULE_HEADERS
     include/modules/Burrows.h
     include/modules/Constructions.h
     include/modules/Designations.h
-    include/modules/Engravings.h
     include/modules/EventManager.h
     include/modules/Filesystem.h
     include/modules/Graphic.h
@@ -153,7 +152,6 @@ set(MODULE_SOURCES
     modules/Burrows.cpp
     modules/Constructions.cpp
     modules/Designations.cpp
-    modules/Engravings.cpp
     modules/EventManager.cpp
     modules/Filesystem.cpp
     modules/Graphic.cpp
diff --git a/library/Core.cpp b/library/Core.cpp
index 55aa9dc55..cfb029d57 100644
--- a/library/Core.cpp
+++ b/library/Core.cpp
@@ -53,7 +53,6 @@ using namespace std;
 #include "modules/Filesystem.h"
 #include "modules/Gui.h"
 #include "modules/World.h"
-#include "modules/Graphic.h"
 #include "modules/Persistence.h"
 #include "RemoteServer.h"
 #include "RemoteTools.h"
diff --git a/library/PlugLoad-windows.cpp b/library/PlugLoad-windows.cpp
index 96c2e900a..848d25f50 100644
--- a/library/PlugLoad-windows.cpp
+++ b/library/PlugLoad-windows.cpp
@@ -35,7 +35,6 @@ distribution.
 #include <stdio.h>
 
 #include "tinythread.h"
-#include "modules/Graphic.h"
 #include "../plugins/uicommon.h"
 
 /*
diff --git a/library/include/DFHack.h b/library/include/DFHack.h
index 8a094cf86..0a5183adc 100644
--- a/library/include/DFHack.h
+++ b/library/include/DFHack.h
@@ -54,7 +54,6 @@ distribution.
 
 // DFHack modules
 #include "modules/Buildings.h"
-#include "modules/Engravings.h"
 #include "modules/Materials.h"
 #include "modules/Constructions.h"
 #include "modules/Units.h"
diff --git a/library/include/Hooks.h b/library/include/Hooks.h
index f5ef7079c..7a266e92c 100644
--- a/library/include/Hooks.h
+++ b/library/include/Hooks.h
@@ -47,7 +47,6 @@ namespace SDL
 // these functions are here because they call into DFHack::Core and therefore need to
 // be declared as friend functions/known
 #ifdef _DARWIN
-#include "modules/Graphic.h"
 DFhackCExport int DFH_SDL_NumJoysticks(void);
 DFhackCExport void DFH_SDL_Quit(void);
 DFhackCExport int DFH_SDL_PollEvent(SDL::Event* event);
diff --git a/library/include/modules/Engravings.h b/library/include/modules/Engravings.h
deleted file mode 100644
index bf30c62a8..000000000
--- a/library/include/modules/Engravings.h
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
-https://github.com/peterix/dfhack
-Copyright (c) 2009-2012 Petr Mrázek (peterix@gmail.com)
-
-This software is provided 'as-is', without any express or implied
-warranty. In no event will the authors be held liable for any
-damages arising from the use of this software.
-
-Permission is granted to anyone to use this software for any
-purpose, including commercial applications, and to alter it and
-redistribute it freely, subject to the following restrictions:
-
-1. The origin of this software must not be misrepresented; you must
-not claim that you wrote the original software. If you use this
-software in a product, an acknowledgment in the product documentation
-would be appreciated but is not required.
-
-2. Altered source versions must be plainly marked as such, and
-must not be misrepresented as being the original software.
-
-3. This notice may not be removed or altered from any source
-distribution.
-*/
-
-#pragma once
-#ifndef CL_MOD_ENGRAVINGS
-#define CL_MOD_ENGRAVINGS
-/*
-* DF engravings
-*/
-#include "Export.h"
-#include "DataDefs.h"
-#include "df/engraving.h"
-/**
- * \defgroup grp_engraving Engraving module parts
- * @ingroup grp_modules
- */
-namespace DFHack
-{
-namespace Engravings
-{
-// "Simplified" copy of engraving
-struct t_engraving {
-    int32_t artist;
-    int32_t masterpiece_event;
-    int32_t skill_rating;
-    df::coord pos;
-    df::engraving_flags flags;
-    int8_t tile;
-    int32_t art_id;
-    int16_t art_subid;
-    df::item_quality quality;
-    // Pointer to original object, in case you want to modify it
-    df::engraving *origin;
-};
-
-DFHACK_EXPORT bool isValid();
-DFHACK_EXPORT uint32_t getCount();
-DFHACK_EXPORT bool copyEngraving (const int32_t index, t_engraving &out);
-DFHACK_EXPORT df::engraving * getEngraving (const int32_t index);
-}
-}
-#endif
diff --git a/library/modules/Engravings.cpp b/library/modules/Engravings.cpp
deleted file mode 100644
index c2e0e6fce..000000000
--- a/library/modules/Engravings.cpp
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
-https://github.com/peterix/dfhack
-Copyright (c) 2009-2012 Petr Mrázek (peterix@gmail.com)
-
-This software is provided 'as-is', without any express or implied
-warranty. In no event will the authors be held liable for any
-damages arising from the use of this software.
-
-Permission is granted to anyone to use this software for any
-purpose, including commercial applications, and to alter it and
-redistribute it freely, subject to the following restrictions:
-
-1. The origin of this software must not be misrepresented; you must
-not claim that you wrote the original software. If you use this
-software in a product, an acknowledgment in the product documentation
-would be appreciated but is not required.
-
-2. Altered source versions must be plainly marked as such, and
-must not be misrepresented as being the original software.
-
-3. This notice may not be removed or altered from any source
-distribution.
-*/
-
-
-#include "Internal.h"
-
-#include <string>
-#include <vector>
-#include <map>
-using namespace std;
-
-#include "VersionInfo.h"
-#include "MemAccess.h"
-#include "Types.h"
-#include "Core.h"
-
-#include "modules/Engravings.h"
-#include "df/world.h"
-
-using namespace DFHack;
-using df::global::world;
-
-bool Engravings::isValid()
-{
-    return (world != NULL);
-}
-
-uint32_t Engravings::getCount()
-{
-    return world->engravings.size();
-}
-
-df::engraving * Engravings::getEngraving(int index)
-{
-    if (uint32_t(index) >= getCount())
-        return NULL;
-    return world->engravings[index];
-}
-
-bool Engravings::copyEngraving(const int32_t index, t_engraving &out)
-{
-    if (uint32_t(index) >= getCount())
-        return false;
-
-    out.origin = world->engravings[index];
-
-    out.artist = out.origin->artist;
-    out.masterpiece_event = out.origin->masterpiece_event;
-    out.skill_rating = out.origin->skill_rating;
-    out.pos = out.origin->pos;
-    out.flags = out.origin->flags;
-    out.tile = out.origin->tile;
-    out.art_id = out.origin->art_id;
-    out.art_subid = out.origin->art_subid;
-    out.quality = out.origin->quality;
-    return true;
-}

From 1147add5207c730c2b162020347518144b451ddf Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Tue, 28 Jun 2022 23:44:34 -0400
Subject: [PATCH 156/854] Constructions module: remove some old/unused
 functions/types

---
 docs/changelog.txt                      |  1 +
 library/include/modules/Constructions.h | 16 ------------
 library/modules/Constructions.cpp       | 33 -------------------------
 3 files changed, 1 insertion(+), 49 deletions(-)

diff --git a/docs/changelog.txt b/docs/changelog.txt
index 8f663d9bc..a06629f62 100644
--- a/docs/changelog.txt
+++ b/docs/changelog.txt
@@ -50,6 +50,7 @@ changelog.txt uses a syntax similar to RST, with a few special sequences:
 - Removed ``Engravings`` module (C++-only). Access ``world.engravings`` directly instead.
 - Removed ``Notes`` module (C++-only). Access ``ui.waypoints.points`` directly instead.
 - Removed ``Windows`` module (C++-only) - unused.
+- ``Constructions`` module (C++-only): removed ``t_construction``, ``isValid()``, ``getCount()``, ``getConstruction()``, and ``copyConstruction()``. Access ``world.constructions`` directly instead.
 
 ## Lua
 - ``tile-material``: fix the order of declarations. The ``GetTileMat`` function now returns the material as intended (always returned nil before). Also changed the license info, with permission of the original author.
diff --git a/library/include/modules/Constructions.h b/library/include/modules/Constructions.h
index 3831d4bb1..c7a1c048b 100644
--- a/library/include/modules/Constructions.h
+++ b/library/include/modules/Constructions.h
@@ -42,23 +42,7 @@ namespace DFHack
 {
 namespace Constructions
 {
-// "Simplified" copy of construction
-struct t_construction {
-    df::coord pos;
-    df::item_type item_type;
-    int16_t item_subtype;
-    int16_t mat_type;
-    int32_t mat_index;
-    df::construction_flags flags;
-    int16_t original_tile;
-    // Pointer to original object, in case you want to modify it
-    df::construction *origin;
-};
 
-DFHACK_EXPORT bool isValid();
-DFHACK_EXPORT uint32_t getCount();
-DFHACK_EXPORT bool copyConstruction (const int32_t index, t_construction &out);
-DFHACK_EXPORT df::construction * getConstruction (const int32_t index);
 DFHACK_EXPORT df::construction * findAtTile(df::coord pos);
 
 DFHACK_EXPORT bool designateNew(df::coord pos, df::construction_type type,
diff --git a/library/modules/Constructions.cpp b/library/modules/Constructions.cpp
index 9cec2eab9..5fc632500 100644
--- a/library/modules/Constructions.cpp
+++ b/library/modules/Constructions.cpp
@@ -51,22 +51,6 @@ using namespace DFHack;
 using namespace df::enums;
 using df::global::world;
 
-bool Constructions::isValid()
-{
-    return (world != NULL);
-}
-
-uint32_t Constructions::getCount()
-{
-    return world->constructions.size();
-}
-
-df::construction * Constructions::getConstruction(const int32_t index)
-{
-    if (uint32_t(index) >= getCount())
-        return NULL;
-    return world->constructions[index];
-}
 
 df::construction * Constructions::findAtTile(df::coord pos)
 {
@@ -77,23 +61,6 @@ df::construction * Constructions::findAtTile(df::coord pos)
     return NULL;
 }
 
-bool Constructions::copyConstruction(const int32_t index, t_construction &out)
-{
-    if (uint32_t(index) >= getCount())
-        return false;
-
-    out.origin = world->constructions[index];
-
-    out.pos = out.origin->pos;
-    out.item_type = out.origin->item_type;
-    out.item_subtype = out.origin->item_subtype;
-    out.mat_type = out.origin->mat_type;
-    out.mat_index = out.origin->mat_index;
-    out.flags = out.origin->flags;
-    out.original_tile = out.origin->original_tile;
-    return true;
-}
-
 bool Constructions::designateNew(df::coord pos, df::construction_type type,
                                  df::item_type item, int mat_index)
 {

From 739871bc0fafe1a80f498c88447ae5c9b912b5e0 Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Wed, 29 Jun 2022 00:03:49 -0400
Subject: [PATCH 157/854] Remove Hooks-egg.cpp and related code and
 configuration options

---
 CMakeLists.txt          |  2 -
 docs/changelog.txt      |  1 +
 library/CMakeLists.txt  | 42 ++++---------------
 library/Core.cpp        |  7 ----
 library/Hooks-egg.cpp   | 92 -----------------------------------------
 library/include/Core.h  |  7 ----
 library/include/Hooks.h | 18 --------
 7 files changed, 10 insertions(+), 159 deletions(-)
 delete mode 100644 library/Hooks-egg.cpp

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8271840e6..d01d105c5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -206,11 +206,9 @@ set(DFHACK_BUILD_ID "" CACHE STRING "Build ID (should be specified on command li
 if(UNIX)
     # put the lib into DF/hack
     set(DFHACK_LIBRARY_DESTINATION hack)
-    set(DFHACK_EGGY_DESTINATION libs)
 else()
     # windows is crap, therefore we can't do nice things with it. leave the libs on a nasty pile...
     set(DFHACK_LIBRARY_DESTINATION .)
-    set(DFHACK_EGGY_DESTINATION .)
 endif()
 
 # external tools will be installed here:
diff --git a/docs/changelog.txt b/docs/changelog.txt
index a06629f62..9ff01740f 100644
--- a/docs/changelog.txt
+++ b/docs/changelog.txt
@@ -47,6 +47,7 @@ changelog.txt uses a syntax similar to RST, with a few special sequences:
 ## Documentation
 
 ## API
+- Removed "egg" ("eggy") hook support (Linux only). The only remaining method of hooking into DF is by interposing SDL calls, which has been the method used by all binary releases of DFHack.
 - Removed ``Engravings`` module (C++-only). Access ``world.engravings`` directly instead.
 - Removed ``Notes`` module (C++-only). Access ``ui.waypoints.points`` directly instead.
 - Removed ``Windows`` module (C++-only) - unused.
diff --git a/library/CMakeLists.txt b/library/CMakeLists.txt
index c9e9cd844..95a8e610a 100644
--- a/library/CMakeLists.txt
+++ b/library/CMakeLists.txt
@@ -114,13 +114,6 @@ set(MAIN_SOURCES_DARWIN
     Process-darwin.cpp
 )
 
-set(MAIN_SOURCES_LINUX_EGGY
-    ${CONSOLE_SOURCES}
-    Hooks-egg.cpp
-    PlugLoad-linux.cpp
-    Process-linux.cpp
-)
-
 set(MODULE_HEADERS
     include/modules/Buildings.h
     include/modules/Burrows.h
@@ -206,10 +199,7 @@ list(APPEND PROJECT_SOURCES ${MAIN_SOURCES})
 list(APPEND PROJECT_SOURCES ${MODULE_SOURCES})
 
 if(UNIX)
-    option(BUILD_EGGY "Make DFHack strangely egg-shaped." OFF)
-    if(BUILD_EGGY)
-        list(APPEND PROJECT_SOURCES ${MAIN_SOURCES_LINUX_EGGY})
-    elseif(APPLE)
+    if(APPLE)
         list(APPEND PROJECT_SOURCES ${MAIN_SOURCES_DARWIN})
     else()
         list(APPEND PROJECT_SOURCES ${MAIN_SOURCES_LINUX})
@@ -371,15 +361,9 @@ add_executable(dfhack-run dfhack-run.cpp)
 add_executable(binpatch binpatch.cpp)
 target_link_libraries(binpatch dfhack-md5)
 
-if(BUILD_EGGY)
-    set_target_properties(dfhack PROPERTIES OUTPUT_NAME "egg" )
-else()
-    if(WIN32)
-        set_target_properties(dfhack PROPERTIES OUTPUT_NAME "SDL" )
-    endif()
-endif()
-
 if(WIN32)
+    # name the resulting library SDL.dll on Windows
+    set_target_properties(dfhack PROPERTIES OUTPUT_NAME "SDL" )
     set_target_properties(dfhack PROPERTIES COMPILE_FLAGS "/FI\"Export.h\"" )
     set_target_properties(dfhack-client PROPERTIES COMPILE_FLAGS "/FI\"Export.h\"" )
 else()
@@ -434,23 +418,15 @@ if(UNIX)
             DESTINATION .)
     endif()
 else()
-    if(NOT BUILD_EGGY)
-        # On windows, copy the renamed SDL so DF can still run.
-        install(PROGRAMS ${dfhack_SOURCE_DIR}/package/windows/win${DFHACK_BUILD_ARCH}/SDLreal.dll
-            DESTINATION ${DFHACK_LIBRARY_DESTINATION})
-    endif()
+    # On windows, copy the renamed SDL so DF can still run.
+    install(PROGRAMS ${dfhack_SOURCE_DIR}/package/windows/win${DFHACK_BUILD_ARCH}/SDLreal.dll
+        DESTINATION ${DFHACK_LIBRARY_DESTINATION})
 endif()
 
 # install the main lib
-if(NOT BUILD_EGGY)
-    install(TARGETS dfhack
-        LIBRARY DESTINATION ${DFHACK_LIBRARY_DESTINATION}
-        RUNTIME DESTINATION ${DFHACK_LIBRARY_DESTINATION})
-else()
-    install(TARGETS dfhack
-        LIBRARY DESTINATION ${DFHACK_EGGY_DESTINATION}
-        RUNTIME DESTINATION ${DFHACK_EGGY_DESTINATION})
-endif()
+install(TARGETS dfhack
+    LIBRARY DESTINATION ${DFHACK_LIBRARY_DESTINATION}
+    RUNTIME DESTINATION ${DFHACK_LIBRARY_DESTINATION})
 
 # install the offset file
 install(FILES xml/symbols.xml
diff --git a/library/Core.cpp b/library/Core.cpp
index cfb029d57..941d1bebf 100644
--- a/library/Core.cpp
+++ b/library/Core.cpp
@@ -1975,13 +1975,6 @@ bool Core::isSuspended(void)
     return ownerThread.load() == std::this_thread::get_id();
 }
 
-int Core::TileUpdate()
-{
-    if(!started)
-        return false;
-    return true;
-}
-
 void Core::doUpdate(color_ostream &out, bool first_update)
 {
     Lua::Core::Reset(out, "DF code execution");
diff --git a/library/Hooks-egg.cpp b/library/Hooks-egg.cpp
deleted file mode 100644
index c98cf5da2..000000000
--- a/library/Hooks-egg.cpp
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
-https://github.com/peterix/dfhack
-Copyright (c) 2009-2012 Petr Mrázek (peterix@gmail.com)
-
-This software is provided 'as-is', without any express or implied
-warranty. In no event will the authors be held liable for any
-damages arising from the use of this software.
-
-Permission is granted to anyone to use this software for any
-purpose, including commercial applications, and to alter it and
-redistribute it freely, subject to the following restrictions:
-
-1. The origin of this software must not be misrepresented; you must
-not claim that you wrote the original software. If you use this
-software in a product, an acknowledgment in the product documentation
-would be appreciated but is not required.
-
-2. Altered source versions must be plainly marked as such, and
-must not be misrepresented as being the original software.
-
-3. This notice may not be removed or altered from any source
-distribution.
-*/
-#include <stdio.h>
-#include <stdint.h>
-#include <stdlib.h>
-#include <string.h>
-#include <vector>
-#include <string>
-#include <map>
-
-#include "Core.h"
-#include "Hooks.h"
-#include <iostream>
-
-// hook - called before rendering
-DFhackCExport int egg_init(void)
-{
-    // reroute stderr
-    freopen("stderr.log", "w", stderr);
-    // we don't reroute stdout until  we figure out if this should be done at all
-    // See: Console-linux.cpp
-    fprintf(stderr,"dfhack: hooking successful\n");
-    return true;
-}
-
-// hook - called before rendering
-DFhackCExport int egg_shutdown(void)
-{
-    DFHack::Core & c = DFHack::Core::getInstance();
-    return c.Shutdown();
-}
-
-// hook - called for each game tick (or more often)
-DFhackCExport int egg_tick(void)
-{
-    DFHack::Core & c = DFHack::Core::getInstance();
-    return c.Update();
-}
-// hook - called before rendering
-DFhackCExport int egg_prerender(void)
-{
-    DFHack::Core & c = DFHack::Core::getInstance();
-    return c.TileUpdate();
-}
-
-// hook - called for each SDL event, returns 0 when the event has been consumed. 1 otherwise
-DFhackCExport int egg_sdl_event(SDL::Event* event)
-{
-    // if the event is valid, intercept
-    if( event != 0 )
-    {
-        DFHack::Core & c = DFHack::Core::getInstance();
-        return c.DFH_SDL_Event(event);
-    }
-    return true;
-}
-
-// return this if you want to kill the event.
-const int curses_error = -1;
-// hook - ncurses event, -1 signifies error.
-DFhackCExport int egg_curses_event(int orig_return)
-{
-    /*
-    if(orig_return != -1)
-    {
-        DFHack::Core & c = DFHack::Core::getInstance();
-        int out;
-        return c.ncurses_wgetch(orig_return,);
-    }*/
-    return orig_return;
-}
diff --git a/library/include/Core.h b/library/include/Core.h
index f6acd9425..531d1b581 100644
--- a/library/include/Core.h
+++ b/library/include/Core.h
@@ -121,12 +121,6 @@ namespace DFHack
         friend int  ::SDL_Init(uint32_t flags);
         friend int  ::wgetch(WINDOW * w);
 #endif
-        friend int  ::egg_init(void);
-        friend int  ::egg_shutdown(void);
-        friend int  ::egg_tick(void);
-        friend int  ::egg_prerender(void);
-        friend int  ::egg_sdl_event(SDL::Event* event);
-        friend int  ::egg_curses_event(int orig_return);
     public:
         /// Get the single Core instance or make one.
         static Core& getInstance()
@@ -205,7 +199,6 @@ namespace DFHack
 
         bool Init();
         int Update (void);
-        int TileUpdate (void);
         int Shutdown (void);
         int DFH_SDL_Event(SDL::Event* event);
         bool ncurses_wgetch(int in, int & out);
diff --git a/library/include/Hooks.h b/library/include/Hooks.h
index 7a266e92c..d17b96acf 100644
--- a/library/include/Hooks.h
+++ b/library/include/Hooks.h
@@ -74,21 +74,3 @@ DFhackCExport void * SDL_GetVideoSurface(void);
 
 DFhackCExport int SDL_SemWait(vPtr sem);
 DFhackCExport int SDL_SemPost(vPtr sem);
-
-// hook - called early from DF's main()
-DFhackCExport int egg_init(void);
-
-// hook - called before rendering
-DFhackCExport int egg_shutdown(void);
-
-// hook - called for each game tick (or more often)
-DFhackCExport int egg_tick(void);
-
-// hook - called before rendering
-DFhackCExport int egg_prerender(void);
-
-// hook - called for each SDL event, can filter both the event and the return value
-DFhackCExport int egg_sdl_event(SDL::Event* event);
-
-// hook - ncurses event. return -1 to consume
-DFhackCExport int egg_curses_event(int orig_return);

From c026bd6dcb659cef31e2481bb38a1d01aaec22c5 Mon Sep 17 00:00:00 2001
From: Tachytaenius <henryfthomson@gmail.com>
Date: Fri, 1 Jul 2022 12:04:18 +0100
Subject: [PATCH 158/854] Split sections a bit

---
 docs/guides/modding-guide.rst | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/docs/guides/modding-guide.rst b/docs/guides/modding-guide.rst
index d3bf384c8..cb37de575 100644
--- a/docs/guides/modding-guide.rst
+++ b/docs/guides/modding-guide.rst
@@ -3,20 +3,17 @@
 DFHack modding guide
 ====================
 
-Preface
--------
+What is a mod/script?
+---------------------
 
-Why not just use raw modding?
-
-For many things it's either completely and only (sensibly) doable in raws or completely and only doable with DFHack. For mods where DFHack is an alternative and not the only option, it's much less hacky, easier to maintain, and easier to extend, and is not prone to side-effects. A great example is adding a syndrome when a reaction is performed requiring an exploding boulder in raws but having dedicated tools for it if you use DFHack. Many things will require a mix of raw modding and DFHack.
-
-What kind of mods can we make?
+A script is a single file that can be run as a command in DFHack, like something that modifies or displays game data on request. A mod is something you install to get persistent behavioural changes in the game and/or add new content. DFHack mods contain and use scripts as well as often having a raw mod component.
 
-Lots of things, and the list grows as more and more hooks and tools are developed within DFHack. You can modify behaviours by cleverly watching and modifying certain areas of the game with functions that run on every tick or by using hooks. Familiarising yourself with the many structs of the game will help with ideas immensely, and you can always ask for help in the right places (e.g. DFHack's Discord).
+DFHack scripts are written in Lua. If you don't already know Lua, there's a great primer at https://www.lua.org/pil/1.html.
 
-Examples of things we have mod tools to allow are directly changing skills, spawning liquids, adding new powered buildings, creating items/trees/units based on various conditions (in reactions or similar), running code when certain projectiles hit or move, and much else besides.
+Why not just use raw modding?
+-----------------------------
 
-DFHack scripts are written in Lua. If you don't already know Lua, there's a great primer at https://www.lua.org/pil/1.html.
+For many things it's either completely and only (sensibly) doable in raws or completely and only doable with DFHack. For mods where DFHack is an alternative and not the only option, it's much less hacky, easier to maintain, and easier to extend, and is not prone to side-effects. A great example is adding a syndrome when a reaction is performed requiring an exploding boulder in raws but having dedicated tools for it if you use DFHack. Many things will require a mix of raw modding and DFHack.
 
 A mod-maker's development environment
 -------------------------------------

From 112d2938dfa2e47ac0ddec4ac6582f73866854fc Mon Sep 17 00:00:00 2001
From: DFHack-Urist via GitHub Actions
 <63161697+DFHack-Urist@users.noreply.github.com>
Date: Fri, 1 Jul 2022 15:58:24 +0000
Subject: [PATCH 159/854] Auto-update submodules

scripts: master
---
 scripts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts b/scripts
index 7b92cec52..9480cad97 160000
--- a/scripts
+++ b/scripts
@@ -1 +1 @@
-Subproject commit 7b92cec5246f97f278e4d608899278d2cafc0992
+Subproject commit 9480cad97c3c0e71f8cb76004c74e2912702af95

From 04e0b600a520ba5cd0e9af47f58f95d7d3c27689 Mon Sep 17 00:00:00 2001
From: Timur Kelman <tymur.gubayev@gmail.com>
Date: Wed, 22 Jun 2022 12:33:54 +0200
Subject: [PATCH 160/854] add keybinding for `gui/workorder-details` to
 dfhack.init-example

---
 dfhack.init-example | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/dfhack.init-example b/dfhack.init-example
index bcc5615d6..88528f650 100644
--- a/dfhack.init-example
+++ b/dfhack.init-example
@@ -68,6 +68,9 @@ keybinding add Ctrl-Shift-R view-unit-reports
 # view extra unit information
 keybinding add Alt-I@dwarfmode/ViewUnits|unitlist gui/unit-info-viewer
 
+# set workorder item details (on workorder details screen press D again)
+keybinding add D@workquota_details gui/workorder-details
+
 ##############################
 # Generic adv mode bindings  #
 ##############################

From 46d0f36d412eedf2bd02bbd7ac901cb29536f095 Mon Sep 17 00:00:00 2001
From: Tachytaenius <henryfthomson@gmail.com>
Date: Fri, 1 Jul 2022 19:10:26 +0100
Subject: [PATCH 161/854] Pad out Getting used to gm-editor and DFStructs
 exploration a bit

---
 docs/guides/modding-guide.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/guides/modding-guide.rst b/docs/guides/modding-guide.rst
index cb37de575..c35e2a41a 100644
--- a/docs/guides/modding-guide.rst
+++ b/docs/guides/modding-guide.rst
@@ -58,9 +58,9 @@ Simple. Save this as a Lua file in your own scripts directory and run it as show
 Getting used to gm-editor and DFStructs exploration
 ---------------------------------------------------
 
-So how could you have known about the field and type we just used?
+So how could you have known about the field and type we just used? Well, there are two main tools for discovering the various fields in the game's data structures. The first is the ``df-structures`` repository (at https://github.com/DFHack/df-structures) that contains XML files denoting the contents of the game's structures. The second is the script ``gui/gm-editor`` which is an interactive data explorer. You can run the script while objects like units are selected to view the data within them. You can also pass ``scr`` as an argument to the script to view the data for the current screen. Press ? while the script is active to view help.
 
-s
+Familiarising yourself with the many structs of the game will help with ideas immensely, and you can always ask for help in the right places (e.g. DFHack's Discord).
 
 Detecting triggers
 ------------------

From b86d16d64ceb76745179936771eea724c2476b12 Mon Sep 17 00:00:00 2001
From: Tachytaenius <henryfthomson@gmail.com>
Date: Sun, 3 Jul 2022 15:59:01 +0100
Subject: [PATCH 162/854] Some of Detecting Triggers

---
 docs/guides/modding-guide.rst | 25 ++++++++++++++++++++++++-
 1 file changed, 24 insertions(+), 1 deletion(-)

diff --git a/docs/guides/modding-guide.rst b/docs/guides/modding-guide.rst
index c35e2a41a..9bbdc9bfd 100644
--- a/docs/guides/modding-guide.rst
+++ b/docs/guides/modding-guide.rst
@@ -65,7 +65,30 @@ Familiarising yourself with the many structs of the game will help with ideas im
 Detecting triggers
 ------------------
 
-s
+One main method for getting new behaviour into the game is callback functions. There are two main libraries for this, ``repeat-util`` and ``eventful``. ``repeat-util`` is used to run a function once per configurable number of frames (paused or unpaused), ticks (unpaused), in-game days, months, or years. For adding behaviour you will most often want something to run once a tick. ``eventful`` is used to get code to run (with special parameters!) when something happens in the game, like a reaction or job being completed or a projectile moving.
+
+To get something to run once per tick, we would want to call ``repeat-util``'s ``scheduleEvery`` function.
+
+First, we load the module: ::
+
+    local repeatUtil = require("repeat-util")
+
+Both ``repeat-util`` and ``eventful`` require keys for registered callbacks. It's recommended to use something like a mod id. ::
+
+    local modId = "my-test-mod"
+
+Then, we pass the key, amount of time units between function calls, what the time units are, and finally the callback function itself:
+
+    repeatUtil.scheduleEvery(modId, 1, "ticks", function()
+        -- Do something like iterating over all units
+        for _, unit in ipairs(df.global.world.units.all) do
+            print(unit.id)
+        end
+    end)
+
+``eventful`` is slightly more involved:
+
+TODO
 
 Setting up an environment for a more advanced modular mod
 ---------------------------------------------------------

From f8a8bf6e2993a2ac5a548e2406223a9757b154e6 Mon Sep 17 00:00:00 2001
From: Tachytaenius <henryfthomson@gmail.com>
Date: Sun, 3 Jul 2022 17:33:36 +0100
Subject: [PATCH 163/854] Some more

---
 docs/guides/modding-guide.rst | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/docs/guides/modding-guide.rst b/docs/guides/modding-guide.rst
index 9bbdc9bfd..c6ae8ae15 100644
--- a/docs/guides/modding-guide.rst
+++ b/docs/guides/modding-guide.rst
@@ -77,7 +77,7 @@ Both ``repeat-util`` and ``eventful`` require keys for registered callbacks. It'
 
     local modId = "my-test-mod"
 
-Then, we pass the key, amount of time units between function calls, what the time units are, and finally the callback function itself:
+Then, we pass the key, amount of time units between function calls, what the time units are, and finally the callback function itself: ::
 
     repeatUtil.scheduleEvery(modId, 1, "ticks", function()
         -- Do something like iterating over all units
@@ -86,9 +86,12 @@ Then, we pass the key, amount of time units between function calls, what the tim
         end
     end)
 
-``eventful`` is slightly more involved:
+``eventful`` is slightly more involved. ::
 
-TODO
+    local eventful = require("plugins.eventful")
+    -- blah
+
+Check the full list of Eventful events at https://docs.dfhack.org/en/stable/docs/Lua%20API.html#list-of-events.
 
 Setting up an environment for a more advanced modular mod
 ---------------------------------------------------------

From 0237567c183f7a50305b2db47a2c0902a8eb3189 Mon Sep 17 00:00:00 2001
From: Tachytaenius <henryfthomson@gmail.com>
Date: Mon, 4 Jul 2022 17:11:21 +0100
Subject: [PATCH 164/854] More modding guide

---
 docs/guides/modding-guide.rst | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/docs/guides/modding-guide.rst b/docs/guides/modding-guide.rst
index c6ae8ae15..b3b5c515b 100644
--- a/docs/guides/modding-guide.rst
+++ b/docs/guides/modding-guide.rst
@@ -86,17 +86,24 @@ Then, we pass the key, amount of time units between function calls, what the tim
         end
     end)
 
-``eventful`` is slightly more involved. ::
+``eventful`` is slightly more involved. First get the module: ::
 
     local eventful = require("plugins.eventful")
-    -- blah
 
-Check the full list of Eventful events at https://docs.dfhack.org/en/stable/docs/Lua%20API.html#list-of-events.
+``eventful`` contains a table for each event which you populate with functions. Each function in the table is then called with the appropriate arguments when the event occurs. So, for example, to print the position of a moving (item) projectile: ::
+
+    eventful.onProjItemCheckMovement[modId] = function(projectile)
+        print(projectile.cur_pos.x, projectile.cur_pos.y, projectile.cur_pos.z)
+    end
+
+Check the full list of events at https://docs.dfhack.org/en/stable/docs/Lua%20API.html#list-of-events.
 
 Setting up an environment for a more advanced modular mod
 ---------------------------------------------------------
 
-s
+Now, you may have noticed that you won't be able to run multiple functions on tick/as event callbacks with that ``modId`` idea alone. To solve that we can just define all the functions we want and call them from a single function.
+
+TODO
 
 Your first whole mod
 --------------------

From 69b6de20456d986c778dd88ba0d86031937633c8 Mon Sep 17 00:00:00 2001
From: "pre-commit-ci[bot]"
 <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Date: Tue, 5 Jul 2022 01:19:30 -0400
Subject: [PATCH 165/854] [pre-commit.ci] pre-commit autoupdate (#2235)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

updates:
- [github.com/python-jsonschema/check-jsonschema: 0.16.0 → 0.16.2](https://github.com/python-jsonschema/check-jsonschema/compare/0.16.0...0.16.2)

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
---
 .pre-commit-config.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 774c42a95..4e7a4f48b 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -20,7 +20,7 @@ repos:
       args: ['--fix=lf']
     - id: trailing-whitespace
 - repo: https://github.com/python-jsonschema/check-jsonschema
-  rev: 0.16.0
+  rev: 0.16.2
   hooks:
     - id: check-github-workflows
 - repo: https://github.com/Lucas-C/pre-commit-hooks

From aec56848976ce5334aa0dedb5b3219ec4d7a70c0 Mon Sep 17 00:00:00 2001
From: DFHack-Urist via GitHub Actions
 <63161697+DFHack-Urist@users.noreply.github.com>
Date: Tue, 5 Jul 2022 07:17:21 +0000
Subject: [PATCH 166/854] Auto-update submodules

library/xml: master
scripts: master
---
 library/xml | 2 +-
 scripts     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/library/xml b/library/xml
index 8d15b2d07..219676497 160000
--- a/library/xml
+++ b/library/xml
@@ -1 +1 @@
-Subproject commit 8d15b2d07c18cc9dfbd550b32ad43e46b2d4014d
+Subproject commit 2196764977011991127244b28ff13b90cef19af3
diff --git a/scripts b/scripts
index 9480cad97..f08794136 160000
--- a/scripts
+++ b/scripts
@@ -1 +1 @@
-Subproject commit 9480cad97c3c0e71f8cb76004c74e2912702af95
+Subproject commit f08794136e20705b87cfaf509b182f07ec394238

From fabcf7c9795f3583acbf77f634256a59fb54e44c Mon Sep 17 00:00:00 2001
From: DFHack-Urist via GitHub Actions
 <63161697+DFHack-Urist@users.noreply.github.com>
Date: Wed, 6 Jul 2022 07:16:58 +0000
Subject: [PATCH 167/854] Auto-update submodules

scripts: master
---
 scripts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts b/scripts
index f08794136..6bc683d2c 160000
--- a/scripts
+++ b/scripts
@@ -1 +1 @@
-Subproject commit f08794136e20705b87cfaf509b182f07ec394238
+Subproject commit 6bc683d2ca42ef467465b0905513ad590a7dc4c2

From 091068c7102c8f5ddb7133cfe1b07133f5e818cb Mon Sep 17 00:00:00 2001
From: Myk <myk002@yahoo.com>
Date: Wed, 6 Jul 2022 06:57:13 -0700
Subject: [PATCH 168/854] [prospect] give player control over which information
 is output (#2231)

* give player control over prospect output

* suspend the core *before* we call to Lua
---
 docs/Plugins.rst           |  58 +++++--
 docs/changelog.txt         |   2 +-
 plugins/CMakeLists.txt     |   2 +-
 plugins/lua/prospector.lua |  45 ++++++
 plugins/prospector.cpp     | 322 ++++++++++++++++++++++++-------------
 5 files changed, 299 insertions(+), 130 deletions(-)
 create mode 100644 plugins/lua/prospector.lua

diff --git a/docs/Plugins.rst b/docs/Plugins.rst
index 3b42bc16a..e5c662ffa 100644
--- a/docs/Plugins.rst
+++ b/docs/Plugins.rst
@@ -373,29 +373,55 @@ selected objects.
 
 prospect
 ========
-Prints a big list of all the present minerals and plants. By default, only
-the visible part of the map is scanned.
 
-Options:
+**Usage:**
 
-:all:   Scan the whole map, as if it were revealed.
-:value: Show material value in the output. Most useful for gems.
-:hell:  Show the Z range of HFS tubes. Implies 'all'.
+    ``prospect [all|hell] [<options>]``
 
-If prospect is called during the embark selection screen, it displays an estimate of
-layer stone availability.
+Shows a summary of resources that exist on the map. By default, only the visible
+part of the map is scanned. Include the ``all`` keyword if you want ``prospect``
+to scan the whole map as if it were revealed. Use ``hell`` instead of ``all`` if
+you also want to see the Z range of HFS tubes in the 'features' report section.
 
-.. note::
+**Options:**
 
-    The results of pre-embark prospect are an *estimate*, and can at best be expected
-    to be somewhere within +/- 30% of the true amount; sometimes it does a lot worse.
-    Especially, it is not clear how to precisely compute how many soil layers there
-    will be in a given embark tile, so it can report a whole extra layer, or omit one
-    that is actually present.
+:``-h``, ``--help``:
+    Shows this help text.
+:``-s``, ``--show <sections>``:
+    Shows only the named comma-separated list of report sections. Report section
+    names are: summary, liquids, layers, features, ores, gems, veins, shrubs,
+    and trees. If run during pre-embark, only the layers, ores, gems, and veins
+    report sections are available.
+:``-v``, ``--values``:
+    Includes material value in the output. Most useful for the 'gems' report
+    section.
 
-Options:
+**Examples:**
+
+``prospect all``
+    Shows the entire report for the entire map.
+
+``prospect hell --show layers,ores,veins``
+    Shows only the layers, ores, and other vein stone report sections, and
+    includes information on HFS tubes when a fort is loaded.
+
+``prospect all -sores``
+    Show only information about ores for the pre-embark or fortress map report.
+
+**Pre-embark estimate:**
+
+If prospect is called during the embark selection screen, it displays an
+estimate of layer stone availability. If the ``all`` keyword is specified, it
+also estimates ores, gems, and vein material. The estimate covers all tiles of
+the embark rectangle.
+
+.. note::
 
-:all:    Also estimate vein mineral amounts.
+    The results of pre-embark prospect are an *estimate*, and can at best be
+    expected to be somewhere within +/- 30% of the true amount; sometimes it
+    does a lot worse. Especially, it is not clear how to precisely compute how
+    many soil layers there will be in a given embark tile, so it can report a
+    whole extra layer, or omit one that is actually present.
 
 .. _remotefortressreader:
 
diff --git a/docs/changelog.txt b/docs/changelog.txt
index 2d5a5cf64..0c1422306 100644
--- a/docs/changelog.txt
+++ b/docs/changelog.txt
@@ -41,8 +41,8 @@ changelog.txt uses a syntax similar to RST, with a few special sequences:
 - ``job.removeJob()``: ensure jobs are removed from the world list when they are canceled
 
 ## Misc Improvements
-
 - ``materials.ItemTraitsDialog``: added a default ``on_select``-handler which toggles the traits.
+- `prospect`: add new ``--show`` option to give the player control over which report sections are shown. e.g. ``prospect all --show ores`` will just show information on ores.
 
 ## Documentation
 
diff --git a/plugins/CMakeLists.txt b/plugins/CMakeLists.txt
index ed9404b8e..4a4b74eaa 100644
--- a/plugins/CMakeLists.txt
+++ b/plugins/CMakeLists.txt
@@ -148,7 +148,7 @@ if(BUILD_SUPPORTED)
     dfhack_plugin(petcapRemover petcapRemover.cpp)
     dfhack_plugin(plants plants.cpp)
     dfhack_plugin(probe probe.cpp)
-    dfhack_plugin(prospector prospector.cpp)
+    dfhack_plugin(prospector prospector.cpp LINK_LIBRARIES lua)
     dfhack_plugin(power-meter power-meter.cpp LINK_LIBRARIES lua)
     dfhack_plugin(regrass regrass.cpp)
     add_subdirectory(remotefortressreader)
diff --git a/plugins/lua/prospector.lua b/plugins/lua/prospector.lua
new file mode 100644
index 000000000..403a1f43f
--- /dev/null
+++ b/plugins/lua/prospector.lua
@@ -0,0 +1,45 @@
+local _ENV = mkmodule('plugins.prospector')
+
+local argparse = require('argparse')
+local utils = require('utils')
+
+local VALID_SHOW_VALUES = utils.invert{
+    'summary', 'liquids', 'layers', 'features', 'ores',
+    'gems',    'veins',   'shrubs', 'trees'
+}
+
+function parse_commandline(opts, ...)
+    local show = {}
+    local positionals = argparse.processArgsGetopt({...}, {
+            {'h', 'help', handler=function() opts.help = true end},
+            {'s', 'show', hasArg=true, handler=function(optarg)
+                    show = argparse.stringList(optarg) end},
+            {'v', 'values', handler=function() opts.value = true end},
+        })
+
+    for _,p in ipairs(positionals) do
+        if p == 'all' then opts.hidden = true
+        elseif p == 'hell' then
+            opts.hidden = true
+            opts.tube = true
+        else
+            qerror(('unknown keyword: "%s"'):format(p))
+        end
+    end
+
+    if #show > 0 then
+        for s in pairs(VALID_SHOW_VALUES) do
+            opts[s] = false
+        end
+    end
+
+    for _,s in ipairs(show) do
+        if VALID_SHOW_VALUES[s] then
+            opts[s] = true
+        else
+            qerror(('unknown report section: "%s"'):format(s))
+        end
+    end
+end
+
+return _ENV
diff --git a/plugins/prospector.cpp b/plugins/prospector.cpp
index 6b2079cf0..0516dd552 100644
--- a/plugins/prospector.cpp
+++ b/plugins/prospector.cpp
@@ -17,6 +17,7 @@ using namespace std;
 #include "Core.h"
 #include "Console.h"
 #include "Export.h"
+#include "LuaTools.h"
 #include "PluginManager.h"
 #include "modules/Gui.h"
 #include "modules/MapCache.h"
@@ -44,6 +45,50 @@ using df::coord2d;
 DFHACK_PLUGIN("prospector");
 REQUIRE_GLOBAL(world);
 
+struct prospect_options {
+    // whether to display help
+    bool help = false;
+
+    // whether to scan the whole map or just the unhidden tiles
+    bool hidden = false;
+
+    // whether to also show material values
+    bool value  = false;
+
+    // whether to show adamantine tube z-levels
+    bool tube   = false;
+
+    // which report sections to show
+    bool summary = true;
+    bool liquids = true;
+    bool layers = true;
+    bool features = true;
+    bool ores  = true;
+    bool gems = true;
+    bool veins = true;
+    bool shrubs = true;
+    bool trees = true;
+
+    static struct_identity _identity;
+};
+static const struct_field_info prospect_options_fields[] = {
+    { struct_field_info::PRIMITIVE, "help",     offsetof(prospect_options, help),     &df::identity_traits<bool>::identity, 0, 0 },
+    { struct_field_info::PRIMITIVE, "hidden",   offsetof(prospect_options, hidden),   &df::identity_traits<bool>::identity, 0, 0 },
+    { struct_field_info::PRIMITIVE, "value",    offsetof(prospect_options, value),    &df::identity_traits<bool>::identity, 0, 0 },
+    { struct_field_info::PRIMITIVE, "tube",     offsetof(prospect_options, tube),     &df::identity_traits<bool>::identity, 0, 0 },
+    { struct_field_info::PRIMITIVE, "summary",  offsetof(prospect_options, summary),  &df::identity_traits<bool>::identity, 0, 0 },
+    { struct_field_info::PRIMITIVE, "liquids",  offsetof(prospect_options, liquids),  &df::identity_traits<bool>::identity, 0, 0 },
+    { struct_field_info::PRIMITIVE, "layers",   offsetof(prospect_options, layers),   &df::identity_traits<bool>::identity, 0, 0 },
+    { struct_field_info::PRIMITIVE, "features", offsetof(prospect_options, features), &df::identity_traits<bool>::identity, 0, 0 },
+    { struct_field_info::PRIMITIVE, "ores",     offsetof(prospect_options, ores),     &df::identity_traits<bool>::identity, 0, 0 },
+    { struct_field_info::PRIMITIVE, "gems",     offsetof(prospect_options, gems),     &df::identity_traits<bool>::identity, 0, 0 },
+    { struct_field_info::PRIMITIVE, "veins",    offsetof(prospect_options, veins),    &df::identity_traits<bool>::identity, 0, 0 },
+    { struct_field_info::PRIMITIVE, "shrubs",   offsetof(prospect_options, shrubs),   &df::identity_traits<bool>::identity, 0, 0 },
+    { struct_field_info::PRIMITIVE, "trees",    offsetof(prospect_options, trees),    &df::identity_traits<bool>::identity, 0, 0 },
+    { struct_field_info::END }
+};
+struct_identity prospect_options::_identity(sizeof(prospect_options), &df::allocator_fn<prospect_options>, NULL, "prospect_options", NULL, prospect_options_fields);
+
 struct matdata
 {
     const static int invalid_z = -30000;
@@ -123,9 +168,9 @@ static void printMatdata(color_ostream &con, const matdata &data, bool only_z =
         con << std::setw(9) << int(data.count);
 
     if(data.lower_z != data.upper_z)
-        con <<" Z:" << std::setw(4) << data.lower_z << ".." <<  data.upper_z << std::endl;
+        con <<"   Z:" << std::setw(4) << data.lower_z << ".." <<  data.upper_z << std::endl;
     else
-        con <<" Z:" << std::setw(4) << data.lower_z << std::endl;
+        con <<"   Z:" << std::setw(4) << data.lower_z << std::endl;
 }
 
 static int getValue(const df::inorganic_raw &info)
@@ -139,7 +184,7 @@ static int getValue(const df::plant_raw &info)
 }
 
 template <typename T, template <typename> class P>
-void printMats(color_ostream &con, MatMap &mat, std::vector<T*> &materials, bool show_value)
+void printMats(color_ostream &con, MatMap &mat, std::vector<T*> &materials, const prospect_options &options)
 {
     unsigned int total = 0;
     MatSorter sorting_vector;
@@ -161,7 +206,7 @@ void printMats(color_ostream &con, MatMap &mat, std::vector<T*> &materials, bool
         T* mat = materials[it->first];
         // Somewhat of a hack, but it works because df::inorganic_raw and df::plant_raw both have a field named "id"
         con << std::setw(25) << mat->id << " : ";
-        if (show_value)
+        if (options.value)
             con << std::setw(3) << getValue(*mat) << " : ";
         printMatdata(con, it->second);
         total += it->second.count;
@@ -171,7 +216,7 @@ void printMats(color_ostream &con, MatMap &mat, std::vector<T*> &materials, bool
 }
 
 void printVeins(color_ostream &con, MatMap &mat_map,
-                DFHack::Materials* mats, bool show_value)
+                const prospect_options &options)
 {
     MatMap ores;
     MatMap gems;
@@ -194,14 +239,20 @@ void printVeins(color_ostream &con, MatMap &mat_map,
             rest[kv.first] = kv.second;
     }
 
-    con << "Ores:" << std::endl;
-    printMats<df::inorganic_raw, std::greater>(con, ores, world->raws.inorganics, show_value);
+    if (options.ores) {
+        con << "Ores:" << std::endl;
+        printMats<df::inorganic_raw, std::greater>(con, ores, world->raws.inorganics, options);
+    }
 
-    con << "Gems:" << std::endl;
-    printMats<df::inorganic_raw, std::greater>(con, gems, world->raws.inorganics, show_value);
+    if (options.gems) {
+        con << "Gems:" << std::endl;
+        printMats<df::inorganic_raw, std::greater>(con, gems, world->raws.inorganics, options);
+    }
 
-    con << "Other vein stone:" << std::endl;
-    printMats<df::inorganic_raw, std::greater>(con, rest, world->raws.inorganics, show_value);
+    if (options.veins) {
+        con << "Other vein stone:" << std::endl;
+        printMats<df::inorganic_raw, std::greater>(con, rest, world->raws.inorganics, options);
+    }
 }
 
 command_result prospector (color_ostream &out, vector <string> & parameters);
@@ -211,18 +262,43 @@ DFhackCExport command_result plugin_init ( color_ostream &out, std::vector <Plug
     commands.push_back(PluginCommand(
         "prospect", "Show stats of available raw resources.",
         prospector, false,
-        "  Prints a big list of all the present minerals.\n"
-        "  By default, only the visible part of the map is scanned.\n"
-        "Options:\n"
-        "  all   - Scan the whole map, as if it was revealed.\n"
-        "  value - Show material value in the output. Most useful for gems.\n"
-        "  hell  - Show the Z range of HFS tubes. Implies 'all'.\n"
-        "Pre-embark estimate:\n"
-        "  If called during the embark selection screen, displays\n"
-        "  an estimate of layer stone availability. If the 'all'\n"
-        "  option is specified, also estimates veins.\n"
-        "  The estimate is computed either for 1 embark tile of the\n"
-        "  blinking biome, or for all tiles of the embark rectangle.\n"
+    "  prospect [all|hell] [<options>]\n"
+    "\n"
+    "  Shows a summary of resources that exist on the map. By default,\n"
+    "  only the visible part of the map is scanned. Include the 'all' keyword\n"
+    "  if you want prospect to scan the whole map as if it were revealed.\n"
+    "  Use 'hell' instead of 'all' if you also want to see the Z range of HFS\n"
+    "  tubes in the 'features' report section.\n"
+    "\n"
+    "Options:\n"
+    "  -h,--help\n"
+    "    Shows this help text.\n"
+    "  -s,--show <sections>\n"
+    "    Shows only the named comma-separated list of report sections.\n"
+    "    Report section names are: summary, liquids, layers, features, ores,\n"
+    "    gems, veins, shrubs, and trees. If run during pre-embark, only the\n"
+    "    layers, ores, gems, and veins report sections are available.\n"
+    "  -v,--values\n"
+    "    Includes material value in the output. Most useful for the 'gems'\n"
+    "    report section.\n"
+    "\n"
+    "Examples:\n"
+    "  prospect all\n"
+    "    Shows the entire report for the entire map.\n"
+    "\n"
+    "  prospect hell --show layers,ores,veins\n"
+    "    Shows only the layers, ores, and other vein stone report sections,\n"
+    "    and includes information on HFS tubes when a fort is loaded.\n"
+    "\n"
+    "  prospect all -sores\n"
+    "    Show only information about ores for the pre-embark or fortress map\n"
+    "    report.\n"
+    "\n"
+    "Pre-embark estimate:\n"
+    "  If called during the embark selection screen, displays a rough\n"
+    "  estimate of layer stone availability. If the 'all' keyword is\n"
+    "  specified, also estimates ores, gems, and other vein material. The\n"
+    "  estimate covers all tiles of the embark rectangle.\n"
     ));
     return CR_OK;
 }
@@ -522,8 +598,9 @@ bool estimate_materials(color_ostream &out, EmbarkTileLayout &tile, MatMap &laye
     return true;
 }
 
-static command_result embark_prospector(color_ostream &out, df::viewscreen_choose_start_sitest *screen,
-                                        bool showHidden, bool showValue)
+static command_result embark_prospector(color_ostream &out,
+                                        df::viewscreen_choose_start_sitest *screen,
+                                        const prospect_options &options)
 {
     if (!world || !world->world_data)
     {
@@ -549,12 +626,6 @@ static command_result embark_prospector(color_ostream &out, df::viewscreen_choos
     // Compute biomes
     std::map<coord2d, int> biomes;
 
-    /*if (screen->biome_highlighted)
-    {
-        out.print("Processing one embark tile of biome F%d.\n\n", screen->biome_idx+1);
-        biomes[screen->biome_rgn[screen->biome_idx]]++;
-    }*/
-
     for (int x = screen->location.embark_pos_min.x; x <= 15 && x <= screen->location.embark_pos_max.x; x++)
     {
         for (int y = screen->location.embark_pos_min.y; y <= 15 && y <= screen->location.embark_pos_max.y; y++)
@@ -570,12 +641,14 @@ static command_result embark_prospector(color_ostream &out, df::viewscreen_choos
     }
 
     // Print the report
-    out << "Layer materials:" << std::endl;
-    printMats<df::inorganic_raw, shallower>(out, layerMats, world->raws.inorganics, showValue);
+    if (options.layers) {
+        out << "Layer materials:" << std::endl;
+        printMats<df::inorganic_raw, shallower>(out, layerMats, world->raws.inorganics, options);
+    }
 
-    if (showHidden) {
+    if (options.hidden) {
         DFHack::Materials *mats = Core::getInstance().getMaterials();
-        printVeins(out, veinMats, mats, showValue);
+        printVeins(out, veinMats, options);
         mats->Finish();
     }
 
@@ -587,40 +660,8 @@ static command_result embark_prospector(color_ostream &out, df::viewscreen_choos
     return CR_OK;
 }
 
-command_result prospector (color_ostream &con, vector <string> & parameters)
-{
-    bool showHidden = false;
-    bool showPlants = true;
-    bool showSlade = true;
-    bool showTemple = true;
-    bool showValue = false;
-    bool showTube = false;
-
-    for(size_t i = 0; i < parameters.size();i++)
-    {
-        if (parameters[i] == "all")
-        {
-            showHidden = true;
-        }
-        else if (parameters[i] == "value")
-        {
-            showValue = true;
-        }
-        else if (parameters[i] == "hell")
-        {
-            showHidden = showTube = true;
-        }
-        else
-            return CR_WRONG_USAGE;
-    }
-
-    CoreSuspender suspend;
-
-    // Embark screen active: estimate using world geology data
-    auto screen = Gui::getViewscreenByType<df::viewscreen_choose_start_sitest>(0);
-    if (screen)
-        return embark_prospector(con, screen, showHidden, showValue);
-
+static command_result map_prospector(color_ostream &con,
+                                     const prospect_options &options) {
     if (!Maps::IsValid())
     {
         con.printerr("Map is not available!\n");
@@ -636,7 +677,6 @@ command_result prospector (color_ostream &con, vector <string> & parameters)
     DFHack::t_feature blockFeatureGlobal;
     DFHack::t_feature blockFeatureLocal;
 
-    bool hasAquifer = false;
     bool hasDemonTemple = false;
     bool hasLair = false;
     MatMap baseMats;
@@ -680,7 +720,7 @@ command_result prospector (color_ostream &con, vector <string> & parameters)
                         df::tile_occupancy occ = b->OccupancyAt(coord);
 
                         // Skip hidden tiles
-                        if (!showHidden && des.bits.hidden)
+                        if (!options.hidden && des.bits.hidden)
                         {
                             continue;
                         }
@@ -688,7 +728,6 @@ command_result prospector (color_ostream &con, vector <string> & parameters)
                         // Check for aquifer
                         if (des.bits.water_table)
                         {
-                            hasAquifer = true;
                             aquiferTiles.add(global_z);
                         }
 
@@ -752,14 +791,13 @@ command_result prospector (color_ostream &con, vector <string> & parameters)
                                 {
                                     veinMats[blockFeatureLocal.sub_material].add(global_z);
                                 }
-                                else if (showTemple
-                                         && blockFeatureLocal.type == feature_type::deep_surface_portal)
+                                else if (blockFeatureLocal.type == feature_type::deep_surface_portal)
                                 {
                                     hasDemonTemple = true;
                                 }
                             }
 
-                            if (showSlade && blockFeatureGlobal.type != -1 && des.bits.feature_global
+                            if (blockFeatureGlobal.type != -1 && des.bits.feature_global
                                     && blockFeatureGlobal.type == feature_type::underworld_from_layer
                                     && blockFeatureGlobal.main_material == 0) // stone
                             {
@@ -777,7 +815,7 @@ command_result prospector (color_ostream &con, vector <string> & parameters)
 
                 // Check plants this way, as the other way wasn't getting them all
                 // and we can check visibility more easily here
-                if (showPlants)
+                if (options.shrubs)
                 {
                     auto block = Maps::getBlockColumn(b_x,b_y);
                     vector<df::plant *> *plants = block ? &block->plants : NULL;
@@ -790,7 +828,7 @@ command_result prospector (color_ostream &con, vector <string> & parameters)
                                 continue;
                             df::coord2d loc(plant.pos.x, plant.pos.y);
                             loc = loc % 16;
-                            if (showHidden || !b->DesignationAt(loc).bits.hidden)
+                            if (options.hidden || !b->DesignationAt(loc).bits.hidden)
                             {
                                 if(plant.flags.bits.is_shrub)
                                     plantMats[plant.material].add(global_z);
@@ -810,15 +848,18 @@ command_result prospector (color_ostream &con, vector <string> & parameters)
 
     MatMap::const_iterator it;
 
-    con << "Base materials:" << std::endl;
-    for (it = baseMats.begin(); it != baseMats.end(); ++it)
-    {
-        con << std::setw(25) << ENUM_KEY_STR(tiletype_material,(df::tiletype_material)it->first) << " : " << it->second.count << std::endl;
+    if (options.summary) {
+        con << "Base materials:" << std::endl;
+        for (it = baseMats.begin(); it != baseMats.end(); ++it)
+        {
+            con << std::setw(25) << ENUM_KEY_STR(tiletype_material,(df::tiletype_material)it->first) << " : " << it->second.count << std::endl;
+        }
+        con << std::endl;
     }
 
-    if (liquidWater.count || liquidMagma.count)
+    if (options.liquids && (liquidWater.count || liquidMagma.count))
     {
-        con << std::endl << "Liquids:" << std::endl;
+        con << "Liquids:" << std::endl;
         if (liquidWater.count)
         {
             con << std::setw(25) << "WATER" << " : ";
@@ -829,51 +870,108 @@ command_result prospector (color_ostream &con, vector <string> & parameters)
             con << std::setw(25) << "MAGMA" << " : ";
             printMatdata(con, liquidMagma);
         }
+        con << std::endl;
     }
 
-    con << std::endl << "Layer materials:" << std::endl;
-    printMats<df::inorganic_raw, shallower>(con, layerMats, world->raws.inorganics, showValue);
-
-    printVeins(con, veinMats, mats, showValue);
-
-    if (showPlants)
-    {
-        con << "Shrubs:" << std::endl;
-        printMats<df::plant_raw, std::greater>(con, plantMats, world->raws.plants.all, showValue);
-        con << "Wood in trees:" << std::endl;
-        printMats<df::plant_raw, std::greater>(con, treeMats, world->raws.plants.all, showValue);
+    if (options.layers) {
+        con << "Layer materials:" << std::endl;
+        printMats<df::inorganic_raw, shallower>(con, layerMats, world->raws.inorganics, options);
     }
 
-    if (hasAquifer)
-    {
-        con << "Has aquifer";
+    if (options.features) {
+        con << "Features:" << std::endl;
+
+        bool hasFeature = false;
         if (aquiferTiles.count)
         {
-            con << "               : ";
+            con << std::setw(25) << "Has aquifer" << " : ";
+            if (options.value)
+                con << "      ";
             printMatdata(con, aquiferTiles);
+            hasFeature = true;
         }
-        else
-            con << std::endl;
-    }
 
-    if (showTube && tubeTiles.count)
-    {
-        con << "Has HFS tubes             : ";
-        printMatdata(con, tubeTiles);
+        if (options.tube && tubeTiles.count)
+        {
+            con << std::setw(25) << "Has HFS tubes" << " :          ";
+            if (options.value)
+                con << "      ";
+            printMatdata(con, tubeTiles, true);
+            hasFeature = true;
+        }
+
+        if (hasDemonTemple)
+        {
+            con << std::setw(25) << "Has demon temple" << std::endl;
+            hasFeature = true;
+        }
+
+        if (hasLair)
+        {
+            con << std::setw(25) << "Has lair" << std::endl;
+            hasFeature = true;
+        }
+
+        if (!hasFeature)
+            con << std::setw(25) << "None" << std::endl;
+
+        con << std::endl;
     }
 
-    if (hasDemonTemple)
-    {
-        con << "Has demon temple" << std::endl;
+    printVeins(con, veinMats, options);
+
+    if (options.shrubs) {
+        con << "Shrubs:" << std::endl;
+        printMats<df::plant_raw, std::greater>(con, plantMats, world->raws.plants.all, options);
     }
 
-    if (hasLair)
-    {
-        con << "Has lair" << std::endl;
+    if (options.trees) {
+        con << "Wood in trees:" << std::endl;
+        printMats<df::plant_raw, std::greater>(con, treeMats, world->raws.plants.all, options);
     }
 
     // Cleanup
     mats->Finish();
-    con << std::endl;
+
     return CR_OK;
 }
+
+static bool get_options(color_ostream &out,
+                        prospect_options &opts,
+                        const vector<string> &parameters)
+{
+    auto L = Lua::Core::State;
+    Lua::StackUnwinder top(L);
+
+    if (!lua_checkstack(L, parameters.size() + 2) ||
+        !Lua::PushModulePublic(
+            out, L, "plugins.prospector", "parse_commandline")) {
+        out.printerr("Failed to load prospector Lua code\n");
+        return false;
+    }
+
+    Lua::Push(L, &opts);
+
+    for (const string &param : parameters)
+        Lua::Push(L, param);
+
+    if (!Lua::SafeCall(out, L, parameters.size() + 1, 0))
+        return false;
+
+    return true;
+}
+
+command_result prospector(color_ostream &con, vector <string> & parameters)
+{
+    CoreSuspender suspend;
+
+    prospect_options options;
+    if (!get_options(con, options, parameters) || options.help)
+        return CR_WRONG_USAGE;
+
+    // Embark screen active: estimate using world geology data
+    auto screen = Gui::getViewscreenByType<df::viewscreen_choose_start_sitest>(0);
+    return screen ?
+            embark_prospector(con, screen, options) :
+            map_prospector(con, options);
+}

From e0d37a31ae9fab5bec8fb06d977d45f99785f70a Mon Sep 17 00:00:00 2001
From: Myk <myk002@yahoo.com>
Date: Wed, 6 Jul 2022 07:03:29 -0700
Subject: [PATCH 169/854] Make the manager orders library available by default
 (#2233)

* move orders out of examples directory

* install orders into library dir

* read orders from new library dir

* update documentation

* update dreamfort references to orders import

* update changelog

* ignore json files in pre-commit
---
 .pre-commit-config.yaml                    |  2 +-
 data/CMakeLists.txt                        |  3 +
 data/blueprints/library/dreamfort.csv      | 22 +++--
 data/{examples => }/orders/basic.json      |  0
 data/{examples => }/orders/furnace.json    |  0
 data/{examples => }/orders/glassstock.json |  0
 data/{examples => }/orders/military.json   |  0
 data/{examples => }/orders/rockstock.json  |  0
 data/{examples => }/orders/smelting.json   |  0
 docs/Plugins.rst                           | 98 +++++++++++++++++++++
 docs/changelog.txt                         |  2 +
 docs/guides/examples-guide.rst             | 99 ----------------------
 library/modules/Filesystem.cpp             |  9 +-
 plugins/orders.cpp                         | 41 ++++++++-
 14 files changed, 160 insertions(+), 116 deletions(-)
 rename data/{examples => }/orders/basic.json (100%)
 rename data/{examples => }/orders/furnace.json (100%)
 rename data/{examples => }/orders/glassstock.json (100%)
 rename data/{examples => }/orders/military.json (100%)
 rename data/{examples => }/orders/rockstock.json (100%)
 rename data/{examples => }/orders/smelting.json (100%)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 4e7a4f48b..25601d8b8 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -41,4 +41,4 @@ repos:
       entry: python3 ci/authors-rst.py
       files: docs/Authors\.rst
       pass_filenames: false
-exclude: '^(depends/|data/examples/.*\.json$|.*\.diff$)'
+exclude: '^(depends/|data/.*\.json$|.*\.diff$)'
diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt
index 53e88fed9..72df7272a 100644
--- a/data/CMakeLists.txt
+++ b/data/CMakeLists.txt
@@ -1,6 +1,9 @@
 install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/quickfort/
         DESTINATION "${DFHACK_DATA_DESTINATION}/data/quickfort")
 
+install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/orders/
+        DESTINATION dfhack-config/orders/library)
+
 install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/examples/
         DESTINATION "${DFHACK_DATA_DESTINATION}/examples")
 
diff --git a/data/blueprints/library/dreamfort.csv b/data/blueprints/library/dreamfort.csv
index a00a00e9e..ec1a05c51 100644
--- a/data/blueprints/library/dreamfort.csv
+++ b/data/blueprints/library/dreamfort.csv
@@ -31,7 +31,7 @@
 "Other DFHack commands also work very well with Dreamfort, such as autofarm, autonestbox, prioritize, seedwatch, tailor, and, of course, buildingplan. An init file that gets everything configured for you is distributed with DFHack as hack/examples/init/onMapLoad_dreamfort.init."
 Put that file in your Dwarf Fortress directory -- the same directory that has dfhack.init.
 ""
-"Also copy the files in hack/examples/orders/ to dfhack-config/orders/ and the files in hack/examples/professions/ to professions/. We'll be using these files later. See https://docs.dfhack.org/en/stable/docs/guides/examples-guide.html for more information, including suggestions on how many dwarves of each profession you are likely to need at each stage of fort maturity."
+"Also copy the files in hack/examples/professions/ to professions/. We'll be using these files later. See https://docs.dfhack.org/en/stable/docs/guides/examples-guide.html for more information, including suggestions on how many dwarves of each profession you are likely to need at each stage of fort maturity."
 ""
 "Once you have your starting surface workshops up and running, you might want to configure buildingplan (in its global settings, accessible from any building placement screen, e.g.: b-a-G) to only use blocks for constructions so it won't use your precious wood, boulders, and bars to build floors and walls. If you bring at least 7 blocks with you on embark, you can even set this in your onMapLoad.init file like this:"
 on-new-fortress buildingplan set boulders false; buildingplan set logs false
@@ -50,7 +50,6 @@ interactively."
 ""
 -- Preparation (before you embark!) --
 Copy hack/examples/init/onMapLoad_dreamfort.init to your DF directory
-Copy the fort automation orders from hack/examples/orders/*.json to the dfhack-config/orders/ directory
 Optionally copy the premade profession definitions from hack/examples/professions/ to the professions/ directory
 Optionally copy the premade Dreamfort embark profile from the online spreadsheets to the data/init/embark_profiles.txt file
 ""
@@ -75,7 +74,7 @@ quickfort run library/dreamfort.csv -n /industry2,# Run when the industry level
 prioritize ConstructBuilding,# To get those workshops up and running ASAP. You may have to run this several times as the materials for the building construction jobs become ready.
 quickfort run library/dreamfort.csv -n /surface4,"# Run after the walls and floors are built on the surface. Even if /surface3 is finished before you run /industry2, though, wait until after /industry2 to run this blueprint so that surface walls, floors, and roofing don't prevent your workshops from being built (due to lack of blocks)."
 "quickfort orders,run library/dreamfort.csv -n /services2",# Run when the services levels have been dug out. Feel free to remove the orders for the ropes if you already brought them with you.
-orders import basic,"# Run after the first migration wave, so you have dorfs to do all the basic tasks. Note that this is the ""orders"" plugin, not the ""quickfort orders"" command."
+orders import library/basic,"# Run after the first migration wave, so you have dorfs to do all the basic tasks. Note that this is the ""orders"" plugin, not the ""quickfort orders"" command."
 "quickfort orders,run library/dreamfort.csv -n /surface5","# Run when all marked trees on the surface are chopped down and walls and floors have been constructed, including the roof section over the future barracks."
 prioritize ConstructBuilding,# Run when you see the bridges ready to be built so the busy masons come and build them.
 "quickfort orders,run library/dreamfort.csv -n /surface6",# Run when at least the beehives and weapon rack are constructed and you have linked all levers to their respective bridges.
@@ -86,7 +85,7 @@ prioritize ConstructBuilding,# Run when you see the bridges ready to be built so
 "Also consider bringing magma up to your services level so you can replace the forge and furnaces on your industry level with more powerful magma versions. This is especially important if your embark has insufficient trees to convert into charcoal. Keep in mind that moving magma is a tricky process and can take a long time. Don't forget to continue making progress through the checklist! If you choose to use magma, I suggest getting it in place before importing the military and smelting automation orders since they make heavy use of furnaces and forges."
 ""
 -- Mature fort (third migration wave onward) --
-orders import furnace,# Automated production of basic furnace-related items. Don't forget to create a sand collection zone (or remove the sand- and glass-related orders if you have no sand).
+orders import library/furnace,# Automated production of basic furnace-related items. Don't forget to create a sand collection zone (or remove the sand- and glass-related orders if you have no sand).
 "quickfort orders,run library/dreamfort.csv -n /suites2",# Run when the suites level has been dug out.
 "quickfort orders,run library/dreamfort.csv -n /surface8","# Run if/when you need longer trap corridors on the surface for larger sieges, anytime after you run /surface7."
 "quickfort orders,run library/dreamfort.csv -n /apartments2",# Run when the first apartment level has been dug out.
@@ -95,11 +94,11 @@ orders import furnace,# Automated production of basic furnace-related items. Don
 "quickfort orders,run library/dreamfort.csv -n ""/guildhall3, /guildhall4""",# Optionally run after /guildhall2 to build default furnishings and declare a library and temple.
 "quickfort orders,run library/dreamfort.csv -n /apartments3",# Run when all beds have been constructed on the first apartments level.
 "quickfort orders,run library/dreamfort.csv -n /farming4",# Run once you have a cache of potash.
-orders import military,# Automated production of military equipment. Turn on automelt in the meltables piles on the industry level to automatically upgrade all metal military equipment to masterwork quality. These orders are optional if you are not using a military.
-orders import smelting,# Automated production of all types of metal bars.
+orders import library/military,# Automated production of military equipment. Turn on automelt in the meltables piles on the industry level to automatically upgrade all metal military equipment to masterwork quality. These orders are optional if you are not using a military.
+orders import library/smelting,# Automated production of all types of metal bars.
 "quickfort orders,run library/dreamfort.csv -n /services4","# Run when you need a jail, anytime after the restraints are placed from /services3."
-orders import rockstock,# Maintains a small stock of all types of rock furniture.
-orders import glassstock,# Maintains a small stock of all types of glass furniture and parts (only import if you have sand).
+orders import library/rockstock,# Maintains a small stock of all types of rock furniture.
+orders import library/glassstock,# Maintains a small stock of all types of glass furniture and parts (only import if you have sand).
 ""
 -- Repeat for each remaining apartments level as needed --
 "quickfort orders,run library/dreamfort.csv -n /apartments2",# Run when the apartment level has been dug out.
@@ -1830,7 +1829,6 @@ Workshops:
 Manual steps you have to take:
 - Assign minecarts to your quantum stockpile hauling routes
 "- Give from the ""Goods"" quantum stockpile to the jugs, pots, and bags stockpiles on the farming level"
-- Copy the fort automation manager orders (the .json files) from hack/examples/orders/ and put them in your dfhack-config/orders/ directory.
 ""
 Optional manual steps you can take:
 - Restrict the Mechanic's workshop to only allow skilled workers so unskilled trap-resetters won't be tasked to build mechanisms.
@@ -1846,11 +1844,11 @@ Industry Walkthrough:
 ""
 "3) Once the area is dug out, run /industry2. Remember to assign minecarts to to your quantum stockpile hauling routes, and if the farming level is already built, give from the ""Goods"" quantum stockpile (the one on the left) to the jugs, pots, and bags stockpiles on the farming level."
 ""
-"4) Once you have enough dwarves to do maintenance tasks (that is, after the first or second migration wave), run ""orders import basic"" to use the provided basic.json to take care of your fort's basic needs, such as food, booze, and raw material processing."
+"4) Once you have enough dwarves to do maintenance tasks (that is, after the first or second migration wave), run ""orders import library/basic"" to use the provided basic.json to take care of your fort's basic needs, such as food, booze, and raw material processing."
 ""
 "5) If you want to automatically melt goblinite and other low-quality weapons and armor, mark the south-east stockpiles for auto-melt. If you don't have a high density of trees to make into charcoal, though, be sure to route magma to the level beneath this one and replace the forge and furnaces with magma equivalents."
 ""
-"6) Once you have magma furnaces (or abundant fuel) and more dwarves, run ""orders import furnace"", ""orders import military"", and ""orders import smelting"" to import the remaining fort automation orders. The military orders are optional if you are not planning to have a military, of course."
+"6) Once you have magma furnaces (or abundant fuel) and more dwarves, run ""orders import library/furnace"", ""orders import library/military"", and ""orders import library/smelting"" to import the remaining fort automation orders. The military orders are optional if you are not planning to have a military, of course."
 ""
 "7) At any time, feel free to build extra workshops or designate custom stockpiles in the unused space in the top and bottom right. The space is there for you to use!"
 "#dig label(industry1) start(18; 18; central stairs) message(Once the area is dug out, continue with /industry2.)"
@@ -1969,7 +1967,7 @@ query/industry_query
 - assign minecarts to to your quantum stockpile hauling routes (use ""assign-minecarts all"")
 - if the farming level is already built, give from the ""Goods"" quantum stockpile to the jugs, pots, and bags stockpiles on the farming level
 - if you want to automatically melt goblinite and other low-quality weapons and armor, mark the south-east stockpiles for auto-melt
-- once you have enough dwarves, run ""orders import basic"" to automate your fort's basic needs (see /industry_help for more info on this file)
+- once you have enough dwarves, run ""orders import library/basic"" to automate your fort's basic needs (see /industry_help for more info on this file)
 - optionally, restrict the labors for your Craftsdwarf's and Mechanic's workshops as per the guidance in /industry_help)"
 
 
diff --git a/data/examples/orders/basic.json b/data/orders/basic.json
similarity index 100%
rename from data/examples/orders/basic.json
rename to data/orders/basic.json
diff --git a/data/examples/orders/furnace.json b/data/orders/furnace.json
similarity index 100%
rename from data/examples/orders/furnace.json
rename to data/orders/furnace.json
diff --git a/data/examples/orders/glassstock.json b/data/orders/glassstock.json
similarity index 100%
rename from data/examples/orders/glassstock.json
rename to data/orders/glassstock.json
diff --git a/data/examples/orders/military.json b/data/orders/military.json
similarity index 100%
rename from data/examples/orders/military.json
rename to data/orders/military.json
diff --git a/data/examples/orders/rockstock.json b/data/orders/rockstock.json
similarity index 100%
rename from data/examples/orders/rockstock.json
rename to data/orders/rockstock.json
diff --git a/data/examples/orders/smelting.json b/data/orders/smelting.json
similarity index 100%
rename from data/examples/orders/smelting.json
rename to data/orders/smelting.json
diff --git a/docs/Plugins.rst b/docs/Plugins.rst
index e5c662ffa..c73bfab3a 100644
--- a/docs/Plugins.rst
+++ b/docs/Plugins.rst
@@ -1129,6 +1129,7 @@ A plugin for manipulating manager orders.
 
 Subcommands:
 
+:list: Shows the list of previously exported orders, including the orders library.
 :export NAME: Exports the current list of manager orders to a file named ``dfhack-config/orders/NAME.json``.
 :import NAME: Imports manager orders from a file named ``dfhack-config/orders/NAME.json``.
 :clear: Deletes all manager orders in the current embark.
@@ -1141,6 +1142,103 @@ your ``onMapLoad.init`` file::
 
     repeat -name orders-sort -time 1 -timeUnits days -command [ orders sort ]
 
+
+The orders library
+------------------
+
+DFHack comes with a library of useful manager orders that are ready for import:
+
+:source:`basic.json <data/orders/basic.json>`
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+This collection of orders handles basic fort necessities:
+
+- prepared meals and food products (and by-products like oil)
+- booze/mead
+- thread/cloth/dye
+- pots/jugs/buckets/mugs
+- bags of leather, cloth, silk, and yarn
+- crafts and totems from otherwise unusable by-products
+- mechanisms/cages
+- splints/crutches
+- lye/soap
+- ash/potash
+- beds/wheelbarrows/minecarts
+- scrolls
+
+You should import it as soon as you have enough dwarves to perform the tasks.
+Right after the first migration wave is usually a good time.
+
+:source:`furnace.json <data/orders/furnace.json>`
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+This collection creates basic items that require heat. It is separated out from
+``basic.json`` to give players the opportunity to set up magma furnaces first in
+order to save resources. It handles:
+
+- charcoal (including smelting of bituminous coal and lignite)
+- pearlash
+- sand
+- green/clear/crystal glass
+- adamantine processing
+- item melting
+
+Orders are missing for plaster powder until DF :bug:`11803` is fixed.
+
+:source:`military.json <data/orders/military.json>`
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+This collection adds high-volume smelting jobs for military-grade metal ores and
+produces weapons and armor:
+
+- leather backpacks/waterskins/cloaks/quivers/armor
+- bone/wooden bolts
+- smelting for platinum, silver, steel, bronze, bismuth bronze, and copper (and
+  their dependencies)
+- bronze/bismuth bronze/copper bolts
+- platinum/silver/steel/iron/bismuth bronze/bronze/copper weapons and armor,
+  with checks to ensure only the best available materials are being used
+
+If you set a stockpile to take weapons and armor of less than masterwork quality
+and turn on `automelt` (like what `dreamfort` provides on its industry level),
+these orders will automatically upgrade your military equipment to masterwork.
+Make sure you have a lot of fuel (or magma forges and furnaces) before you turn
+``automelt`` on, though!
+
+This file should only be imported, of course, if you need to equip a military.
+
+:source:`smelting.json <data/orders/smelting.json>`
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+This collection adds smelting jobs for all ores. It includes handling the ores
+already managed by ``military.json``, but has lower limits. This ensures all
+ores will be covered if a player imports ``smelting`` but not ``military``, but
+the higher-volume ``military`` orders will take priority if both are imported.
+
+:source:`rockstock.json <data/orders/rockstock.json>`
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+This collection of orders keeps a small stock of all types of rock furniture.
+This allows you to do ad-hoc furnishings of guildhalls, libraries, temples, or
+other rooms with `buildingplan` and your masons will make sure there is always
+stock on hand to fulfill the plans.
+
+:source:`glassstock.json <data/orders/glassstock.json>`
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Similar to ``rockstock`` above, this collection keeps a small stock of all types
+of glass furniture. If you have a functioning glass industry, this is more
+sustainable than ``rockstock`` since you can never run out of sand. If you have
+plenty of rock and just want the variety, you can import both ``rockstock`` and
+``glassstock`` to get a mixture of rock and glass furnishings in your fort.
+
+There are a few items that ``glassstock`` produces that ``rockstock`` does not,
+since there are some items that can not be made out of rock, for example:
+
+- tubes and corkscrews for building magma-safe screw pumps
+- windows
+- terrariums (as an alternative to wooden cages)
+
 .. _seedwatch:
 
 seedwatch
diff --git a/docs/changelog.txt b/docs/changelog.txt
index 0c1422306..ccc94701c 100644
--- a/docs/changelog.txt
+++ b/docs/changelog.txt
@@ -42,6 +42,8 @@ changelog.txt uses a syntax similar to RST, with a few special sequences:
 
 ## Misc Improvements
 - ``materials.ItemTraitsDialog``: added a default ``on_select``-handler which toggles the traits.
+
+- `orders`: added useful library of manager orders. see them with ``orders list`` and import them with, for example, ``orders import library/basic``
 - `prospect`: add new ``--show`` option to give the player control over which report sections are shown. e.g. ``prospect all --show ores`` will just show information on ores.
 
 ## Documentation
diff --git a/docs/guides/examples-guide.rst b/docs/guides/examples-guide.rst
index 8ea463d8c..58446506e 100644
--- a/docs/guides/examples-guide.rst
+++ b/docs/guides/examples-guide.rst
@@ -48,105 +48,6 @@ it is useful (and customizable) for any fort. It includes the following config:
   settings won't be overridden.
 - Enables `automelt`, `tailor`, `zone`, `nestboxes`, and `autonestbox`.
 
-The ``orders/`` subfolder
--------------------------
-
-The :source:`orders/ <data/examples/orders>` subfolder contains manager orders
-that, along with the ``onMapLoad_dreamfort.init`` file above, allow a fort to be
-self-sustaining. Copy them to your ``dfhack-config/orders/`` folder and import
-as required with the `orders` DFHack plugin.
-
-:source:`basic.json <data/examples/orders/basic.json>`
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-This collection of orders handles basic fort necessities:
-
-- prepared meals and food products (and by-products like oil)
-- booze/mead
-- thread/cloth/dye
-- pots/jugs/buckets/mugs
-- bags of leather, cloth, silk, and yarn
-- crafts and totems from otherwise unusable by-products
-- mechanisms/cages
-- splints/crutches
-- lye/soap
-- ash/potash
-- beds/wheelbarrows/minecarts
-- scrolls
-
-You should import it as soon as you have enough dwarves to perform the tasks.
-Right after the first migration wave is usually a good time.
-
-:source:`furnace.json <data/examples/orders/furnace.json>`
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-This collection creates basic items that require heat. It is separated out from
-``basic.json`` to give players the opportunity to set up magma furnaces first in
-order to save resources. It handles:
-
-- charcoal (including smelting of bituminous coal and lignite)
-- pearlash
-- sand
-- green/clear/crystal glass
-- adamantine processing
-- item melting
-
-Orders are missing for plaster powder until DF :bug:`11803` is fixed.
-
-:source:`military.json <data/examples/orders/military.json>`
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-This collection adds high-volume smelting jobs for military-grade metal ores and
-produces weapons and armor:
-
-- leather backpacks/waterskins/cloaks/quivers/armor
-- bone/wooden bolts
-- smelting for platinum, silver, steel, bronze, bismuth bronze, and copper (and
-  their dependencies)
-- bronze/bismuth bronze/copper bolts
-- platinum/silver/steel/iron/bismuth bronze/bronze/copper weapons and armor,
-  with checks to ensure only the best available materials are being used
-
-If you set a stockpile to take weapons and armor of less than masterwork quality
-and turn on `automelt` (like what `dreamfort` provides on its industry level),
-these orders will automatically upgrade your military equipment to masterwork.
-Make sure you have a lot of fuel (or magma forges and furnaces) before you turn
-``automelt`` on, though!
-
-This file should only be imported, of course, if you need to equip a military.
-
-:source:`smelting.json <data/examples/orders/smelting.json>`
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-This collection adds smelting jobs for all ores. It includes handling the ores
-already managed by ``military.json``, but has lower limits. This ensures all
-ores will be covered if a player imports ``smelting`` but not ``military``, but
-the higher-volume ``military`` orders will take priority if both are imported.
-
-:source:`rockstock.json <data/examples/orders/rockstock.json>`
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-This collection of orders keeps a small stock of all types of rock furniture.
-This allows you to do ad-hoc furnishings of guildhalls, libraries, temples, or
-other rooms with `buildingplan` and your masons will make sure there is always
-stock on hand to fulfill the plans.
-
-:source:`glassstock.json <data/examples/orders/glassstock.json>`
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-Similar to ``rockstock`` above, this collection keeps a small stock of all types
-of glass furniture. If you have a functioning glass industry, this is more
-sustainable than ``rockstock`` since you can never run out of sand. If you have
-plenty of rock and just want the variety, you can import both ``rockstock`` and
-``glassstock`` to get a mixture of rock and glass furnishings in your fort.
-
-There are a few items that ``glassstock`` produces that ``rockstock`` does not,
-since there are some items that can not be made out of rock, for example:
-
-- tubes and corkscrews for building magma-safe screw pumps
-- windows
-- terrariums (as an alternative to wooden cages)
-
 The ``professions/`` subfolder
 ------------------------------
 
diff --git a/library/modules/Filesystem.cpp b/library/modules/Filesystem.cpp
index e0d0bc8c2..a182ac062 100644
--- a/library/modules/Filesystem.cpp
+++ b/library/modules/Filesystem.cpp
@@ -246,6 +246,7 @@ static int listdir_recursive_impl (std::string prefix, std::string path,
     int err = Filesystem::listdir(prefixed_path, curdir_files);
     if (err)
         return err;
+    bool out_of_depth = false;
     for (auto file = curdir_files.begin(); file != curdir_files.end(); ++file)
     {
         if (*file == "." || *file == "..")
@@ -254,6 +255,12 @@ static int listdir_recursive_impl (std::string prefix, std::string path,
         std::string path_file = path + *file;
         if (Filesystem::isdir(prefixed_file))
         {
+            if (depth == 0)
+            {
+                out_of_depth = true;
+                continue;
+            }
+
             files.insert(std::pair<std::string, bool>(include_prefix ? prefixed_file : path_file, true));
             err = listdir_recursive_impl(prefix, path_file + "/", files, depth - 1, include_prefix);
             if (err)
@@ -264,7 +271,7 @@ static int listdir_recursive_impl (std::string prefix, std::string path,
             files.insert(std::pair<std::string, bool>(include_prefix ? prefixed_file : path_file, false));
         }
     }
-    return 0;
+    return out_of_depth ? -1 : 0;
 }
 
 int Filesystem::listdir_recursive (std::string dir, std::map<std::string, bool> &files,
diff --git a/plugins/orders.cpp b/plugins/orders.cpp
index fb678ca6d..9e1bf3e1a 100644
--- a/plugins/orders.cpp
+++ b/plugins/orders.cpp
@@ -41,6 +41,7 @@ DFHACK_PLUGIN("orders");
 REQUIRE_GLOBAL(world);
 
 static const std::string ORDERS_DIR = "dfhack-config/orders";
+static const std::string ORDERS_LIBRARY_DIR = "dfhack-config/orders/library";
 
 static command_result orders_command(color_ostream & out, std::vector<std::string> & parameters);
 
@@ -53,7 +54,7 @@ DFhackCExport command_result plugin_init(color_ostream & out, std::vector<Plugin
         false,
         "orders - Manipulate manager orders\n"
         "  orders list\n"
-        "    Shows the list of previously exported orders."
+        "    Shows the list of previously exported orders.\n"
         "  orders export [name]\n"
         "    Exports the current list of manager orders to a file named dfhack-config/orders/[name].json.\n"
         "  orders import [name]\n"
@@ -121,6 +122,30 @@ static command_result orders_command(color_ostream & out, std::vector<std::strin
     return CR_WRONG_USAGE;
 }
 
+static void list_library(color_ostream &out) {
+    std::map<std::string, bool> files;
+    if (0 < Filesystem::listdir_recursive(ORDERS_LIBRARY_DIR, files, 0, false)) {
+        // if the library directory doesn't exist, just skip it
+        return;
+    }
+
+    if (files.empty()) {
+        // if no files in the library directory, just skip it
+        return;
+    }
+
+    for (auto it : files)
+    {
+        if (it.second)
+            continue; // skip directories
+        std::string name = it.first;
+        if (name.length() <= 5 || name.rfind(".json") != name.length() - 5)
+            continue; // skip non-.json files
+        name.resize(name.length() - 5);
+        out << "library/" << name << std::endl;
+    }
+}
+
 static command_result orders_list_command(color_ostream & out)
 {
     // use listdir_recursive instead of listdir even though orders doesn't
@@ -150,6 +175,8 @@ static command_result orders_list_command(color_ostream & out)
         out << name << std::endl;
     }
 
+    list_library(out);
+
     return CR_OK;
 }
 
@@ -889,12 +916,20 @@ static command_result orders_import(color_ostream &out, Json::Value &orders)
 
 static command_result orders_import_command(color_ostream & out, const std::string & name)
 {
-    if (!is_safe_filename(out, name))
+    std::string fname = name;
+    bool is_library = false;
+    if (0 == name.find("library/")) {
+        is_library = true;
+        fname = name.substr(8);
+    }
+
+    if (!is_safe_filename(out, fname))
     {
         return CR_WRONG_USAGE;
     }
 
-    const std::string filename(ORDERS_DIR + "/" + name + ".json");
+    const std::string filename((is_library ? ORDERS_LIBRARY_DIR : ORDERS_DIR) +
+                                    "/" + fname + ".json");
     Json::Value orders;
 
     {

From 9f44fd3f723e887587ebe3c54a20a51dbe0de059 Mon Sep 17 00:00:00 2001
From: Myk <myk002@yahoo.com>
Date: Wed, 6 Jul 2022 07:21:26 -0700
Subject: [PATCH 170/854] [manipulator] add the professions library (#2234)

* move professions out of the examples folder

* install professions into professions/library

* guard unguarded header from multiple inclusion

* load and display library professions

* update changelog

* move example professions docs from examples guide

* update dreamfort documentation

* note that professions folder has changed

* Fix bad merge
---
 data/CMakeLists.txt                           |   3 +
 data/blueprints/library/dreamfort.csv         |   8 +-
 data/{examples => }/professions/Chef          |   2 +-
 data/{examples => }/professions/Craftsdwarf   |   2 +-
 data/{examples => }/professions/Doctor        |   2 +-
 data/{examples => }/professions/Farmer        |   2 +-
 data/{examples => }/professions/Fisherdwarf   |   2 +-
 data/{examples => }/professions/Hauler        |   2 +-
 data/{examples => }/professions/Laborer       |   2 +-
 data/{examples => }/professions/Marksdwarf    |   2 +-
 data/{examples => }/professions/Mason         |   2 +-
 data/{examples => }/professions/Meleedwarf    |   2 +-
 data/{examples => }/professions/Migrant       |   2 +-
 data/{examples => }/professions/Miner         |   2 +-
 data/{examples => }/professions/Outdoorsdwarf |   2 +-
 data/{examples => }/professions/Smith         |   2 +-
 data/{examples => }/professions/StartManager  |   2 +-
 data/{examples => }/professions/Tailor        |   2 +-
 docs/Plugins.rst                              | 117 ++++++++++++++++-
 docs/changelog.txt                            |   4 +-
 docs/guides/examples-guide.rst                | 122 ------------------
 plugins/listcolumn.h                          |   2 +
 plugins/manipulator.cpp                       |  59 ++++++---
 23 files changed, 183 insertions(+), 164 deletions(-)
 rename data/{examples => }/professions/Chef (92%)
 rename data/{examples => }/professions/Craftsdwarf (92%)
 rename data/{examples => }/professions/Doctor (93%)
 rename data/{examples => }/professions/Farmer (83%)
 rename data/{examples => }/professions/Fisherdwarf (90%)
 rename data/{examples => }/professions/Hauler (92%)
 rename data/{examples => }/professions/Laborer (92%)
 rename data/{examples => }/professions/Marksdwarf (89%)
 rename data/{examples => }/professions/Mason (92%)
 rename data/{examples => }/professions/Meleedwarf (90%)
 rename data/{examples => }/professions/Migrant (92%)
 rename data/{examples => }/professions/Miner (66%)
 rename data/{examples => }/professions/Outdoorsdwarf (92%)
 rename data/{examples => }/professions/Smith (92%)
 rename data/{examples => }/professions/StartManager (96%)
 rename data/{examples => }/professions/Tailor (91%)

diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt
index 72df7272a..26befdb34 100644
--- a/data/CMakeLists.txt
+++ b/data/CMakeLists.txt
@@ -7,6 +7,9 @@ install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/orders/
 install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/examples/
         DESTINATION "${DFHACK_DATA_DESTINATION}/examples")
 
+install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/professions/
+        DESTINATION dfhack-config/professions/library)
+
 install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/blueprints/
         DESTINATION blueprints
         FILES_MATCHING PATTERN "*"
diff --git a/data/blueprints/library/dreamfort.csv b/data/blueprints/library/dreamfort.csv
index ec1a05c51..ff0b8b4fc 100644
--- a/data/blueprints/library/dreamfort.csv
+++ b/data/blueprints/library/dreamfort.csv
@@ -29,9 +29,9 @@
 "Dreamfort works best at an embark site that is flat and has at least one soil layer. New players should avoid embarks with aquifers if they are not prepared to deal with them. Bring picks for mining, an axe for woodcutting, and an anvil for a forge. Bring a few blocks to speed up initial workshop construction as well. That's all you really need, but see the example embark profile in the online spreadsheets for a more complete setup."
 ""
 "Other DFHack commands also work very well with Dreamfort, such as autofarm, autonestbox, prioritize, seedwatch, tailor, and, of course, buildingplan. An init file that gets everything configured for you is distributed with DFHack as hack/examples/init/onMapLoad_dreamfort.init."
-Put that file in your Dwarf Fortress directory -- the same directory that has dfhack.init.
+Put that file in your dfhack-config/init/ directory -- the same directory that has dfhack.init.
 ""
-"Also copy the files in hack/examples/professions/ to professions/. We'll be using these files later. See https://docs.dfhack.org/en/stable/docs/guides/examples-guide.html for more information, including suggestions on how many dwarves of each profession you are likely to need at each stage of fort maturity."
+"Also check out https://docs.dfhack.org/en/stable/docs/Plugins.html#professions for more information on the default labor professions that are distributed with DFHack, including suggestions on how many dwarves of each profession you are likely to need at each stage of fort maturity."
 ""
 "Once you have your starting surface workshops up and running, you might want to configure buildingplan (in its global settings, accessible from any building placement screen, e.g.: b-a-G) to only use blocks for constructions so it won't use your precious wood, boulders, and bars to build floors and walls. If you bring at least 7 blocks with you on embark, you can even set this in your onMapLoad.init file like this:"
 on-new-fortress buildingplan set boulders false; buildingplan set logs false
@@ -49,9 +49,7 @@ interactively."
 "Here is the recommended order for Dreamfort commands. You can copy/paste the command lines directly into the DFHack terminal, or, if you prefer, you can run the blueprints in the UI with gui/quickfort. See the walkthroughs (the ""help"" blueprints) for context and details. Also remember to read the messages the blueprints print out after you run them so you don't miss any important manual steps."
 ""
 -- Preparation (before you embark!) --
-Copy hack/examples/init/onMapLoad_dreamfort.init to your DF directory
-Optionally copy the premade profession definitions from hack/examples/professions/ to the professions/ directory
-Optionally copy the premade Dreamfort embark profile from the online spreadsheets to the data/init/embark_profiles.txt file
+Copy hack/examples/init/onMapLoad_dreamfort.init to your dfhack-config/init directory inside your DF installation
 ""
 -- Set settings and preload initial orders --
 quickfort run library/dreamfort.csv -n /setup,# Run before making any manual adjustments to settings! Run the /setup_help blueprint for details on what this blueprint does.
diff --git a/data/examples/professions/Chef b/data/professions/Chef
similarity index 92%
rename from data/examples/professions/Chef
rename to data/professions/Chef
index 1f777c81a..218e08301 100644
--- a/data/examples/professions/Chef
+++ b/data/professions/Chef
@@ -1,4 +1,4 @@
-NAME Chef
+NAME library/Chef
 BUTCHER
 TANNER
 COOK
diff --git a/data/examples/professions/Craftsdwarf b/data/professions/Craftsdwarf
similarity index 92%
rename from data/examples/professions/Craftsdwarf
rename to data/professions/Craftsdwarf
index 29ed1ad0d..8c9707f17 100644
--- a/data/examples/professions/Craftsdwarf
+++ b/data/professions/Craftsdwarf
@@ -1,4 +1,4 @@
-NAME Craftsdwarf
+NAME library/Craftsdwarf
 WOOD_CRAFT
 STONE_CRAFT
 BONE_CARVE
diff --git a/data/examples/professions/Doctor b/data/professions/Doctor
similarity index 93%
rename from data/examples/professions/Doctor
rename to data/professions/Doctor
index 893708947..14959f599 100644
--- a/data/examples/professions/Doctor
+++ b/data/professions/Doctor
@@ -1,4 +1,4 @@
-NAME Doctor
+NAME library/Doctor
 ANIMALCARE
 DIAGNOSE
 SURGERY
diff --git a/data/examples/professions/Farmer b/data/professions/Farmer
similarity index 83%
rename from data/examples/professions/Farmer
rename to data/professions/Farmer
index 149b3c368..0b2801f4c 100644
--- a/data/examples/professions/Farmer
+++ b/data/professions/Farmer
@@ -1,4 +1,4 @@
-NAME Farmer
+NAME library/Farmer
 PLANT
 MILLER
 BREWER
diff --git a/data/examples/professions/Fisherdwarf b/data/professions/Fisherdwarf
similarity index 90%
rename from data/examples/professions/Fisherdwarf
rename to data/professions/Fisherdwarf
index 3c369e61d..1b5d7a1a8 100644
--- a/data/examples/professions/Fisherdwarf
+++ b/data/professions/Fisherdwarf
@@ -1,4 +1,4 @@
-NAME Fisherdwarf
+NAME library/Fisherdwarf
 FISH
 CLEAN_FISH
 DISSECT_FISH
diff --git a/data/examples/professions/Hauler b/data/professions/Hauler
similarity index 92%
rename from data/examples/professions/Hauler
rename to data/professions/Hauler
index a108b1bfd..4fd8b89f8 100644
--- a/data/examples/professions/Hauler
+++ b/data/professions/Hauler
@@ -1,4 +1,4 @@
-NAME Hauler
+NAME library/Hauler
 FEED_WATER_CIVILIANS
 SIEGEOPERATE
 MECHANIC
diff --git a/data/examples/professions/Laborer b/data/professions/Laborer
similarity index 92%
rename from data/examples/professions/Laborer
rename to data/professions/Laborer
index bca22a302..ccd688428 100644
--- a/data/examples/professions/Laborer
+++ b/data/professions/Laborer
@@ -1,4 +1,4 @@
-NAME Laborer
+NAME library/Laborer
 SOAP_MAKER
 BURN_WOOD
 POTASH_MAKING
diff --git a/data/examples/professions/Marksdwarf b/data/professions/Marksdwarf
similarity index 89%
rename from data/examples/professions/Marksdwarf
rename to data/professions/Marksdwarf
index 583afd08e..f34d67cd2 100644
--- a/data/examples/professions/Marksdwarf
+++ b/data/professions/Marksdwarf
@@ -1,4 +1,4 @@
-NAME Marksdwarf
+NAME library/Marksdwarf
 MECHANIC
 HAUL_STONE
 HAUL_WOOD
diff --git a/data/examples/professions/Mason b/data/professions/Mason
similarity index 92%
rename from data/examples/professions/Mason
rename to data/professions/Mason
index 5f996f448..1977d2df5 100644
--- a/data/examples/professions/Mason
+++ b/data/professions/Mason
@@ -1,4 +1,4 @@
-NAME Mason
+NAME library/Mason
 MASON
 CUT_GEM
 ENCRUST_GEM
diff --git a/data/examples/professions/Meleedwarf b/data/professions/Meleedwarf
similarity index 90%
rename from data/examples/professions/Meleedwarf
rename to data/professions/Meleedwarf
index 8eac5ffd6..6a8338fea 100644
--- a/data/examples/professions/Meleedwarf
+++ b/data/professions/Meleedwarf
@@ -1,4 +1,4 @@
-NAME Meleedwarf
+NAME library/Meleedwarf
 RECOVER_WOUNDED
 MECHANIC
 HAUL_STONE
diff --git a/data/examples/professions/Migrant b/data/professions/Migrant
similarity index 92%
rename from data/examples/professions/Migrant
rename to data/professions/Migrant
index 59fd70405..23a3eeddb 100644
--- a/data/examples/professions/Migrant
+++ b/data/professions/Migrant
@@ -1,4 +1,4 @@
-NAME Migrant
+NAME library/Migrant
 FEED_WATER_CIVILIANS
 SIEGEOPERATE
 MECHANIC
diff --git a/data/examples/professions/Miner b/data/professions/Miner
similarity index 66%
rename from data/examples/professions/Miner
rename to data/professions/Miner
index 7be84512d..3170969d9 100644
--- a/data/examples/professions/Miner
+++ b/data/professions/Miner
@@ -1,4 +1,4 @@
-NAME Miner
+NAME library/Miner
 MINE
 DETAIL
 RECOVER_WOUNDED
diff --git a/data/examples/professions/Outdoorsdwarf b/data/professions/Outdoorsdwarf
similarity index 92%
rename from data/examples/professions/Outdoorsdwarf
rename to data/professions/Outdoorsdwarf
index a3f696419..31dbd2ad8 100644
--- a/data/examples/professions/Outdoorsdwarf
+++ b/data/professions/Outdoorsdwarf
@@ -1,4 +1,4 @@
-NAME Outdoorsdwarf
+NAME library/Outdoorsdwarf
 CARPENTER
 BOWYER
 CUTWOOD
diff --git a/data/examples/professions/Smith b/data/professions/Smith
similarity index 92%
rename from data/examples/professions/Smith
rename to data/professions/Smith
index f5fe0f982..7809d80e1 100644
--- a/data/examples/professions/Smith
+++ b/data/professions/Smith
@@ -1,4 +1,4 @@
-NAME Smith
+NAME library/Smith
 FORGE_WEAPON
 FORGE_ARMOR
 FORGE_FURNITURE
diff --git a/data/examples/professions/StartManager b/data/professions/StartManager
similarity index 96%
rename from data/examples/professions/StartManager
rename to data/professions/StartManager
index 751d75cc9..a70c705bf 100644
--- a/data/examples/professions/StartManager
+++ b/data/professions/StartManager
@@ -1,4 +1,4 @@
-NAME StartManager
+NAME library/StartManager
 CUTWOOD
 ANIMALCARE
 DIAGNOSE
diff --git a/data/examples/professions/Tailor b/data/professions/Tailor
similarity index 91%
rename from data/examples/professions/Tailor
rename to data/professions/Tailor
index 74ac03a93..f7986553a 100644
--- a/data/examples/professions/Tailor
+++ b/data/professions/Tailor
@@ -1,4 +1,4 @@
-NAME Tailor
+NAME library/Tailor
 DYER
 LEATHER
 WEAVER
diff --git a/docs/Plugins.rst b/docs/Plugins.rst
index c73bfab3a..8acddfc6d 100644
--- a/docs/Plugins.rst
+++ b/docs/Plugins.rst
@@ -3096,8 +3096,121 @@ To apply a profession, either highlight a single dwarf or select multiple with
 :kbd:`x`, and press :kbd:`p` to select the profession to apply. All labors for
 the selected dwarves will be reset to the labors of the chosen profession.
 
-Professions are saved as human-readable text files in the "professions" folder
-within the DF folder, and can be edited or deleted there.
+Professions are saved as human-readable text files in the
+``dfhack-config/professions`` folder within the DF folder, and can be edited or
+deleted there.
+
+The professions library
+~~~~~~~~~~~~~~~~~~~~~~~
+
+The manipulator plugin comes with a library of professions that you can assign
+to your dwarves.
+
+If you'd rather use Dwarf Therapist to manage your labors, it is easy to import
+these professions to DT and use them there. Simply assign the professions you
+want to import to a dwarf. Once you have assigned a profession to at least one
+dwarf, you can select "Import Professions from DF" in the DT "File" menu. The
+professions will then be available for use in DT.
+
+In the charts below, the "At Start" and "Max" columns indicate the approximate
+number of dwarves of each profession that you are likely to need at the start of
+the game and how many you are likely to need in a mature fort. These are just
+approximations. Your playstyle may demand more or fewer of each profession.
+
+=============  ========  ===== =================================================
+Profession     At Start  Max   Description
+=============  ========  ===== =================================================
+Chef           0         3     Buchery, Tanning, and Cooking. It is important to
+                               focus just a few dwarves on cooking since
+                               well-crafted meals make dwarves very happy. They
+                               are also an excellent trade good.
+Craftsdwarf    0         4-6   All labors used at Craftsdwarf's workshops,
+                               Glassmaker's workshops, and kilns.
+Doctor         0         2-4   The full suite of medical labors, plus Animal
+                               Caretaking for those using the dwarfvet plugin.
+Farmer         1         4     Food- and animal product-related labors. This
+                               profession also has the ``Alchemist`` labor
+                               enabled since they need to focus on food-related
+                               jobs, though you might want to disable
+                               ``Alchemist`` for your first farmer until there
+                               are actual farming duties to perform.
+Fisherdwarf    0         0-1   Fishing and fish cleaning. If you assign this
+                               profession to any dwarf, be prepared to be
+                               inundated with fish. Fisherdwarves *never stop
+                               fishing*. Be sure to also run ``prioritize -a
+                               PrepareRawFish ExtractFromRawFish`` or else
+                               caught fish will just be left to rot.
+Hauler         0         >20   All hauling labors plus Siege Operating, Mechanic
+                               (so haulers can assist in reloading traps) and
+                               Architecture (so haulers can help build massive
+                               windmill farms and pump stacks). As you
+                               accumulate enough Haulers, you can turn off
+                               hauling labors for other dwarves so they can
+                               focus on their skilled tasks. You may also want
+                               to restrict your Mechanic's workshops to only
+                               skilled mechanics so your haulers don't make
+                               low-quality mechanisms.
+Laborer        0         10-12 All labors that don't improve quality with skill,
+                               such as Soapmaking and furnace labors.
+Marksdwarf     0         10-30 Similar to Hauler. See the description for
+                               Meleedwarf below for more details.
+Mason          2         2-4   Masonry and Gem Cutting/Encrusting. In the early
+                               game, you may need to run "`prioritize`
+                               ConstructBuilding" to get your masons to build
+                               wells and bridges if they are too busy crafting
+                               stone furniture.
+Meleedwarf     0         20-50 Similar to Hauler, but without most civilian
+                               labors. This profession is separate from Hauler
+                               so you can find your military dwarves easily.
+                               Meleedwarves and Marksdwarves have Mechanics and
+                               hauling labors enabled so you can temporarily
+                               deactivate your military after sieges and allow
+                               your military dwarves to help clean up.
+Migrant        0         0     You can assign this profession to new migrants
+                               temporarily while you sort them into professions.
+                               Like Marksdwarf and Meleedwarf, the purpose of
+                               this profession is so you can find your new
+                               dwarves more easily.
+Miner          2         2-10  Mining and Engraving. This profession also has
+                               the ``Alchemist`` labor enabled, which disables
+                               hauling for those using the `autohauler` plugin.
+                               Once the need for Miners tapers off in the late
+                               game, dwarves with this profession make good
+                               military dwarves, wielding their picks as
+                               weapons.
+Outdoorsdwarf  1         2-4   Carpentry, Bowyery, Woodcutting, Animal Training,
+                               Trapping, Plant Gathering, Beekeeping, and Siege
+                               Engineering.
+Smith          0         2-4   Smithing labors. You may want to specialize your
+                               Smiths to focus on a single smithing skill to
+                               maximize equipment quality.
+StartManager   1         0     All skills not covered by the other starting
+                               professions (Miner, Mason, Outdoorsdwarf, and
+                               Farmer), plus a few overlapping skills to
+                               assist in critical tasks at the beginning of the
+                               game. Individual labors should be turned off as
+                               migrants are assigned more specialized
+                               professions that cover them, and the StartManager
+                               dwarf can eventually convert to some other
+                               profession.
+Tailor         0         2     Textile industry labors: Dying, Leatherworking,
+                               Weaving, and Clothesmaking.
+=============  ========  ===== =================================================
+
+A note on autohauler
+~~~~~~~~~~~~~~~~~~~~
+
+These profession definitions are designed to work well with or without the
+`autohauler` plugin (which helps to keep your dwarves focused on skilled labors
+instead of constantly being distracted by hauling). If you do want to use
+autohauler, adding the following lines to your ``onMapLoad.init`` file will
+configure it to let the professions manage the "Feed water to civilians" and
+"Recover wounded" labors instead of enabling those labors for all hauling
+dwarves::
+
+    on-new-fortress enable autohauler
+    on-new-fortress autohauler FEED_WATER_CIVILIANS allow
+    on-new-fortress autohauler RECOVER_WOUNDED allow
 
 .. _mousequery:
 
diff --git a/docs/changelog.txt b/docs/changelog.txt
index ccc94701c..29e0d8e22 100644
--- a/docs/changelog.txt
+++ b/docs/changelog.txt
@@ -41,8 +41,10 @@ changelog.txt uses a syntax similar to RST, with a few special sequences:
 - ``job.removeJob()``: ensure jobs are removed from the world list when they are canceled
 
 ## Misc Improvements
-- ``materials.ItemTraitsDialog``: added a default ``on_select``-handler which toggles the traits.
 
+- `manipulator`: add a library of useful default professions
+- `manipulator`: move professions configuration from ``professions/`` to ``dfhack-config/professions/`` to keep it together with other dfhack configuration. If you have saved professions that you would like to keep, please manually move them to the new folder.
+- ``materials.ItemTraitsDialog``: added a default ``on_select``-handler which toggles the traits.
 - `orders`: added useful library of manager orders. see them with ``orders list`` and import them with, for example, ``orders import library/basic``
 - `prospect`: add new ``--show`` option to give the player control over which report sections are shown. e.g. ``prospect all --show ores`` will just show information on ores.
 
diff --git a/docs/guides/examples-guide.rst b/docs/guides/examples-guide.rst
index 58446506e..b699b8204 100644
--- a/docs/guides/examples-guide.rst
+++ b/docs/guides/examples-guide.rst
@@ -47,125 +47,3 @@ it is useful (and customizable) for any fort. It includes the following config:
   fortress is first started, so any later changes you make to autobutcher
   settings won't be overridden.
 - Enables `automelt`, `tailor`, `zone`, `nestboxes`, and `autonestbox`.
-
-The ``professions/`` subfolder
-------------------------------
-
-The :source:`professions/ <data/examples/professions>` subfolder contains
-professions, or sets of related labors, that you can assign to your dwarves with
-the DFHack `manipulator` plugin. Copy them into the ``professions/``
-subdirectory under the main Dwarf Fortress folder (you may have to create this
-subdirectory) and assign them to your dwarves in the manipulator UI, accessible
-from the ``units`` screen via the :kbd:`l` hotkey. Make sure that the
-``manipulator`` plugin is enabled in your ``dfhack.init`` file! You can assign a
-profession to a dwarf by selecting the dwarf in the ``manipulator`` UI and
-hitting :kbd:`p`. The list of professions that you copied into the
-``professions/`` folder will show up for you to choose from. This is very useful
-for assigning roles to new migrants to ensure that all the tasks in your fort
-have adequate numbers of dwarves attending to them.
-
-If you'd rather use Dwarf Therapist to manage your labors, it is easy to import
-these professions to DT and use them there. Simply assign the professions you
-want to import to a dwarf. Once you have assigned a profession to at least one
-dwarf, you can select "Import Professions from DF" in the DT "File" menu. The
-professions will then be available for use in DT.
-
-In the charts below, the "At Start" and "Max" columns indicate the approximate
-number of dwarves of each profession that you are likely to need at the start of
-the game and how many you are likely to need in a mature fort.
-
-=============  ========  ===== =================================================
-Profession     At Start  Max   Description
-=============  ========  ===== =================================================
-Chef           0         3     Buchery, Tanning, and Cooking. It is important to
-                               focus just a few dwarves on cooking since
-                               well-crafted meals make dwarves very happy. They
-                               are also an excellent trade good.
-Craftsdwarf    0         4-6   All labors used at Craftsdwarf's workshops,
-                               Glassmaker's workshops, and kilns.
-Doctor         0         2-4   The full suite of medical labors, plus Animal
-                               Caretaking for those using the dwarfvet plugin.
-Farmer         1         4     Food- and animal product-related labors. This
-                               profession also has the ``Alchemist`` labor
-                               enabled since they need to focus on food-related
-                               jobs, though you might want to disable
-                               ``Alchemist`` for your first farmer until there
-                               are actual farming duties to perform.
-Fisherdwarf    0         0-1   Fishing and fish cleaning. If you assign this
-                               profession to any dwarf, be prepared to be
-                               inundated with fish. Fisherdwarves *never stop
-                               fishing*. Be sure to also run ``prioritize -a
-                               PrepareRawFish ExtractFromRawFish`` (or use the
-                               ``onMapLoad_dreamfort.init`` file above) or else
-                               caught fish will just be left to rot.
-Hauler         0         >20   All hauling labors plus Siege Operating, Mechanic
-                               (so haulers can assist in reloading traps) and
-                               Architecture (so haulers can help build massive
-                               windmill farms and pump stacks). As you
-                               accumulate enough Haulers, you can turn off
-                               hauling labors for other dwarves so they can
-                               focus on their skilled tasks. You may also want
-                               to restrict your Mechanic's workshops to only
-                               skilled mechanics so your haulers don't make
-                               low-quality mechanisms.
-Laborer        0         10-12 All labors that don't improve quality with skill,
-                               such as Soapmaking and furnace labors.
-Marksdwarf     0         10-30 Similar to Hauler. See the description for
-                               Meleedwarf below for more details.
-Mason          2         2-4   Masonry, Gem Cutting/Encrusting, and
-                               Architecture. In the early game, you may need to
-                               run "`prioritize` ConstructBuilding" to get your
-                               masons to build wells and bridges if they are too
-                               busy crafting stone furniture.
-Meleedwarf     0         20-50 Similar to Hauler, but without most civilian
-                               labors. This profession is separate from Hauler
-                               so you can find your military dwarves easily.
-                               Meleedwarves and Marksdwarves have Mechanics and
-                               hauling labors enabled so you can temporarily
-                               deactivate your military after sieges and allow
-                               your military dwarves to help clean up.
-Migrant        0         0     You can assign this profession to new migrants
-                               temporarily while you sort them into professions.
-                               Like Marksdwarf and Meleedwarf, the purpose of
-                               this profession is so you can find your new
-                               dwarves more easily.
-Miner          2         2-10  Mining and Engraving. This profession also has
-                               the ``Alchemist`` labor enabled, which disables
-                               hauling for those using the `autohauler` plugin.
-                               Once the need for Miners tapers off in the late
-                               game, dwarves with this profession make good
-                               military dwarves, wielding their picks as
-                               weapons.
-Outdoorsdwarf  1         2-4   Carpentry, Bowyery, Woodcutting, Animal Training,
-                               Trapping, Plant Gathering, Beekeeping, and Siege
-                               Engineering.
-Smith          0         2-4   Smithing labors. You may want to specialize your
-                               Smiths to focus on a single smithing skill to
-                               maximize equipment quality.
-StartManager   1         0     All skills not covered by the other starting
-                               professions (Miner, Mason, Outdoorsdwarf, and
-                               Farmer), plus a few overlapping skills to
-                               assist in critical tasks at the beginning of the
-                               game. Individual labors should be turned off as
-                               migrants are assigned more specialized
-                               professions that cover them, and the StartManager
-                               dwarf can eventually convert to some other
-                               profession.
-Tailor         0         2     Textile industry labors: Dying, Leatherworking,
-                               Weaving, and Clothesmaking.
-=============  ========  ===== =================================================
-
-A note on autohauler
-~~~~~~~~~~~~~~~~~~~~
-
-These profession definitions are designed to work well with or without the
-`autohauler` plugin (which helps to keep your dwarves focused on skilled labors
-instead of constantly being distracted by hauling). If you do want to use
-autohauler, adding the following lines to your ``onMapLoad.init`` file will
-configure it to let the professions manage the "Feed water to civilians" and
-"Recover wounded" labors instead of enabling those labors for all hauling
-dwarves::
-
-    on-new-fortress enable autohauler
-    on-new-fortress autohauler FEED_WATER_CIVILIANS allow
-    on-new-fortress autohauler RECOVER_WOUNDED allow
diff --git a/plugins/listcolumn.h b/plugins/listcolumn.h
index 08d48bd58..a9a7dc23c 100644
--- a/plugins/listcolumn.h
+++ b/plugins/listcolumn.h
@@ -1,3 +1,5 @@
+#pragma once
+
 #include "uicommon.h"
 
 using df::global::enabler;
diff --git a/plugins/manipulator.cpp b/plugins/manipulator.cpp
index 4604cd7ea..2d3f3bc0a 100644
--- a/plugins/manipulator.cpp
+++ b/plugins/manipulator.cpp
@@ -652,10 +652,12 @@ namespace unit_ops {
 struct ProfessionTemplate
 {
     std::string name;
+    std::string displayName;
+    bool library;
     bool mask;
     std::vector<df::unit_labor> labors;
 
-    bool load(string directory, string file)
+    bool load(string directory, string file, bool isLibrary)
     {
         cerr << "Attempt to load " << file << endl;
         std::ifstream infile(directory + "/" + file);
@@ -663,14 +665,25 @@ struct ProfessionTemplate
             return false;
         }
 
+        library = isLibrary;
+
         std::string line;
         name = file; // If no name is given we default to the filename
+        displayName = name;
         mask = false;
         while (std::getline(infile, line)) {
             if (strcmp(line.substr(0,5).c_str(),"NAME ")==0)
             {
                 auto nextInd = line.find(' ');
-                name = line.substr(nextInd + 1);
+                displayName = line.substr(nextInd + 1);
+                name = displayName;
+                size_t slashpos = name.find_first_of("\\/");
+                while (name.npos != slashpos) {
+                    name = name.substr(slashpos + 1);
+                    slashpos = name.find_first_of("\\/");
+                }
+                if (name == "")
+                    name = file;
                 continue;
             }
             if (line == "MASK")
@@ -745,7 +758,8 @@ struct ProfessionTemplate
     }
 };
 
-static std::string professions_folder = Filesystem::getcwd() + "/professions";
+static std::string professions_folder = "dfhack-config/professions";
+static std::string professions_library_folder = "dfhack-config/professions/library";
 class ProfessionTemplateManager
 {
 public:
@@ -760,27 +774,21 @@ public:
     }
     void load()
     {
-        vector <string> files;
-
         cerr << "Attempting to load professions: " << professions_folder.c_str() << endl;
         if (!Filesystem::isdir(professions_folder) && !Filesystem::mkdir(professions_folder))
         {
             cerr << professions_folder << ": Does not exist and cannot be created" << endl;
             return;
         }
-        Filesystem::listdir(professions_folder, files);
-        std::sort(files.begin(), files.end());
-        for(size_t i = 0; i < files.size(); i++)
-        {
-            if (files[i] == "." || files[i] == "..")
-                continue;
+        _load(professions_folder, false);
+        _load(professions_library_folder, true);
 
-            ProfessionTemplate t;
-            if (t.load(professions_folder, files[i]))
-            {
-                templates.push_back(t);
-            }
-        }
+        // sort alphabetically by display name, with user data above library data
+        std::sort(templates.begin(), templates.end(),
+                  [](const ProfessionTemplate &a, const ProfessionTemplate &b) {
+                        return (a.library == b.library && a.displayName < b.displayName)
+                                || (b.library && !a.library);
+                  });
     }
     void save_from_unit(UnitInfo *unit)
     {
@@ -792,6 +800,21 @@ public:
         t.save(professions_folder);
         reload();
     }
+
+private:
+    void _load(const std::string &path, bool library) {
+        vector<string> files;
+        Filesystem::listdir(path, files);
+        for (auto &fname : files) {
+            if (Filesystem::isdir(path + "/" + fname))
+                continue;
+
+            ProfessionTemplate t;
+            if (t.load(path, fname, library)) {
+                templates.push_back(t);
+            }
+        }
+    }
 };
 static ProfessionTemplateManager manager;
 
@@ -992,7 +1015,7 @@ public:
 
         manager.reload();
         for (size_t i = 0; i < manager.templates.size(); i++) {
-            std::string name = manager.templates[i].name;
+            std::string name = manager.templates[i].displayName;
             if (manager.templates[i].mask)
                 name += " (mask)";
             ListEntry<size_t> elem(name, i);

From 15aae9cf1ef90c862d75c28e4d81d93764c59a6e Mon Sep 17 00:00:00 2001
From: Tachytaenius <henryfthomson@gmail.com>
Date: Thu, 7 Jul 2022 19:23:10 +0100
Subject: [PATCH 171/854] More guide

---
 docs/guides/modding-guide.rst | 79 ++++++++++++++++++++++++++++++++---
 1 file changed, 74 insertions(+), 5 deletions(-)

diff --git a/docs/guides/modding-guide.rst b/docs/guides/modding-guide.rst
index b3b5c515b..085c53a1e 100644
--- a/docs/guides/modding-guide.rst
+++ b/docs/guides/modding-guide.rst
@@ -98,14 +98,83 @@ Then, we pass the key, amount of time units between function calls, what the tim
 
 Check the full list of events at https://docs.dfhack.org/en/stable/docs/Lua%20API.html#list-of-events.
 
-Setting up an environment for a more advanced modular mod
----------------------------------------------------------
+Custom raw tokens
+-----------------
 
-Now, you may have noticed that you won't be able to run multiple functions on tick/as event callbacks with that ``modId`` idea alone. To solve that we can just define all the functions we want and call them from a single function.
+In this section, we are going to use custom raw tokens applied to a reaction to transfer the material of a reagent to a product as a handle improvement (like on artifact buckets), and then we are going to see how you could make boots that make units go faster when worn. Both of these involve custom raw tokens.
+
+First, let's define a custom crossbow with its own custom reaction. The crossbow: ::
+
+    [ITEM_WEAPON:ITEM_WEAPON_CROSSBOW_SIEGE]
+        [NAME:crossbow:crossbows]
+        [SIZE:600]
+        [SKILL:HAMMER]
+        [RANGED:CROSSBOW:BOLT]
+        [SHOOT_FORCE:4000]
+        [SHOOT_MAXVEL:800]
+        [TWO_HANDED:0]
+        [MINIMUM_SIZE:17500]
+        [MATERIAL_SIZE:4]
+        [ATTACK:BLUNT:10000:4000:bash:bashes:NO_SUB:1250]
+            [ATTACK_PREPARE_AND_RECOVER:3:3]
+        [FIRE_TIME:100] custom token (you'll see)
+
+The reaction to make it (you would add the reaction and not the weapon to an entity raw): ::
+
+    [REACTION:MAKE_SIEGE_CROSSBOW]
+        [NAME:make siege crossbow]
+        [BUILDING:BOWYER:NONE]
+        [SKILL:BOWYER]
+        [REAGENT:mechanism 1:2:TRAPPARTS:NONE:NONE:NONE]
+        [REAGENT:bar:150:BAR:NONE:NONE:NONE]
+            [METAL_ITEM_MATERIAL]
+        [REAGENT:handle 1:1:BLOCKS:NONE:NONE:NONE] wooden handles
+            [ANY_PLANT_MATERIAL]
+        [REAGENT:handle 2:1:BLOCKS:NONE:NONE:NONE]
+            [ANY_PLANT_MATERIAL]
+        [TRANSFER_HANDLE_MATERIAL_TO_PRODUCT_IMPROVEMENT:1] another custom token
+        [PRODUCT:100:1:WEAPON:ITEM_WEAPON_CROSSBOW_SIEGE:GET_MATERIAL_FROM_REAGENT:bar:NONE]
+
+So, we are going to use the ``eventful`` module to make it so that (after the script is run) when this crossbow is crafted, it will have two handles, each with the material given by the block reagents.
+
+First, require the modules we are going to use. ::
 
-TODO
+    local eventful = require("plugins.eventful")
+    local customRawTokens = require("custom-raw-tokens")
+
+Now, let's make a callback: ::
+
+    local modId = "siege-crossbow"
+    eventful.onReactionComplete[modId] = function(reaction, reactionProduct, unit, inputItems, inputReagents, outputItems)
+
+First, we check to see if it the reaction that just happened is relevant to this callback: ::
+
+    if not customRawTokens.getToken(reaction, "TRANSFER_HANDLE_MATERIAL_TO_PRODUCT_IMPROVEMENT") then return end
+
+Then, we get the product number listed. Next, for every reagent, if the reagent name starts with "handle" then we get the corresponding item, and... ::
+
+    for i, reagent in ipairs(inputReagents) do
+        if reagent.code:sub(1, #"handle") == "handle" then
+            -- Found handle reagent
+            local item = inputItems[i] -- hopefully found handle item
+
+...We then add a handle improvement to the listed product within our loop. ::
+
+    local new = df.itemimprovement_itemspecificst:new()
+    new.mat_type, new.mat_index = item.mat_type, item.mat_index
+    -- new.maker = outputItems[0].maker -- not a typical improvement
+    new.type = df.itemimprovement_specific_type.HANDLE
+    outputItems[productNumber - 1].improvements:insert("#", new)
+    -- break -- multiple handles, multiple "the handle is made from"s, so no break
+
+It's all a bit loose and hacky but it works, at least if you don't have multiple stacks filling up one reagent.
+
+TODO: fire rate
+TODO: "running shoes"
 
 Your first whole mod
 --------------------
 
-s
+Now, you may have noticed that you won't be able to run multiple functions on tick/as event callbacks with that ``modId`` idea alone. To solve that we can just define all the functions we want and call them from a single function.
+
+TODO

From 25175b5c2811d5f1a2da512485b8e1679ad2cde5 Mon Sep 17 00:00:00 2001
From: Tachytaenius <henryfthomson@gmail.com>
Date: Sat, 9 Jul 2022 17:04:20 +0100
Subject: [PATCH 172/854] Fire rate code

---
 docs/guides/modding-guide.rst | 24 ++++++++++++++++++++++--
 1 file changed, 22 insertions(+), 2 deletions(-)

diff --git a/docs/guides/modding-guide.rst b/docs/guides/modding-guide.rst
index 085c53a1e..15e96599d 100644
--- a/docs/guides/modding-guide.rst
+++ b/docs/guides/modding-guide.rst
@@ -117,7 +117,7 @@ First, let's define a custom crossbow with its own custom reaction. The crossbow
         [MATERIAL_SIZE:4]
         [ATTACK:BLUNT:10000:4000:bash:bashes:NO_SUB:1250]
             [ATTACK_PREPARE_AND_RECOVER:3:3]
-        [FIRE_TIME:100] custom token (you'll see)
+        [FIRE_RATE_MULTIPLIER:2] custom token (you'll see)
 
 The reaction to make it (you would add the reaction and not the weapon to an entity raw): ::
 
@@ -169,7 +169,27 @@ Then, we get the product number listed. Next, for every reagent, if the reagent
 
 It's all a bit loose and hacky but it works, at least if you don't have multiple stacks filling up one reagent.
 
-TODO: fire rate
+Let's also make some code to modify the fire rate of the siege crossbow. ::
+
+    eventful.onProjItemCheckMovement[modId] = function(projectile)
+        if projectile.distance_flown > 0 then -- don't repeat this
+            return
+        end
+
+        local firer = projectile.firer
+        if not firer then
+            return
+        end
+
+        local weapon = df.item.find(projectile.bow_id)
+        if not weapon then
+            return
+        end
+
+        local multiplier = tonumber(customRawTokens.getToken(weapon.subtype, "FIRE_RATE_MULTIPLIER")) or 1
+        firer.counters.think_counter = math.floor(firer.counters.think_counter * multiplier)
+    end
+
 TODO: "running shoes"
 
 Your first whole mod

From c7107e9c2356ab2eccec91d807c311396f012af7 Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Sat, 9 Jul 2022 23:34:57 -0700
Subject: [PATCH 173/854] ignore docs in the scripts repo

---
 conf.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/conf.py b/conf.py
index 79b873bf9..ccad5c806 100644
--- a/conf.py
+++ b/conf.py
@@ -283,6 +283,7 @@ exclude_patterns = [
     'build*',
     'docs/_auto/news*',
     'docs/_changelogs/',
+    'scripts/docs/',
     ]
 
 # The reST default role (used for this markup: `text`) to use for all

From 9c32a52cb08af66603a593b70f9dd42d5e7c9ff4 Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Sat, 9 Jul 2022 23:43:35 -0700
Subject: [PATCH 174/854] actually ignore the script docs

---
 conf.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/conf.py b/conf.py
index ccad5c806..5ec58fc98 100644
--- a/conf.py
+++ b/conf.py
@@ -283,7 +283,7 @@ exclude_patterns = [
     'build*',
     'docs/_auto/news*',
     'docs/_changelogs/',
-    'scripts/docs/',
+    'scripts/docs/*',
     ]
 
 # The reST default role (used for this markup: `text`) to use for all

From b560bcc25654cf3fcf2410b1c992ca0f141ad509 Mon Sep 17 00:00:00 2001
From: DFHack-Urist via GitHub Actions
 <63161697+DFHack-Urist@users.noreply.github.com>
Date: Sun, 10 Jul 2022 07:17:43 +0000
Subject: [PATCH 175/854] Auto-update submodules

scripts: master
---
 scripts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts b/scripts
index 6bc683d2c..ef5fc459c 160000
--- a/scripts
+++ b/scripts
@@ -1 +1 @@
-Subproject commit 6bc683d2ca42ef467465b0905513ad590a7dc4c2
+Subproject commit ef5fc459c4f0a65a9fd709c14fed0c5892c9eebd

From 28e15162a5921fab465a221ecfa998df33c7b3c7 Mon Sep 17 00:00:00 2001
From: Myk <myk002@yahoo.com>
Date: Sun, 10 Jul 2022 08:54:55 -0700
Subject: [PATCH 176/854] reorganize init scripts into dfhack-config (#2232)

* reorganize init scripts into dfhack-config

allows player init scripts to build on defaults instead of replace them
this also moves the init scripts out of the main df directory

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* escape asterisks in docs

* remove unneeded dfhack.init file creation for test

* write the test init script to the new init dir

* create the init dir before trying to write a file

* rename default init files for clarity

* Update changelog

* Update docs/changelog.txt

Co-authored-by: Alan <lethosor@users.noreply.github.com>

* Try to get buildmaster to work with old branches

* Update changelog

* get keybindings from all init scripts

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* Fix spacing in changelog

* split default loading into its own file

* update docs with new changes

* update help text wording in default init files

* Apply suggestions from code review

Co-authored-by: Alan <lethosor@users.noreply.github.com>

* Alphabetize changelog

* Update onMapLoad.default.init

* Update onMapLoad.init

* Update Core.rst

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: Alan <lethosor@users.noreply.github.com>
---
 .github/workflows/build.yml                   |   1 -
 ci/run-tests.py                               |  11 +-
 conf.py                                       |  36 +++--
 data/CMakeLists.txt                           |   3 +
 data/init/dfhack.default.init                 |   8 +
 .../init/dfhack.keybindings.init              | 140 +-----------------
 data/init/dfhack.tools.init                   | 131 ++++++++++++++++
 data/init/onLoad.default.init                 |   5 +
 data/init/onMapLoad.default.init              |   6 +
 data/init/onMapUnload.default.init            |   5 +
 data/init/onUnload.default.init               |   5 +
 dfhack-config/init/default.dfhack.init        |   7 +
 dfhack-config/init/default.onLoad.init        |   7 +
 dfhack-config/init/default.onMapLoad.init     |   7 +
 dfhack-config/init/default.onMapUnload.init   |   7 +
 dfhack-config/init/default.onUnload.init      |   7 +
 dfhack-config/init/dfhack.init                |   5 +
 dfhack-config/init/onLoad.init                |   6 +
 dfhack-config/init/onMapLoad.init             |   5 +
 dfhack-config/init/onMapUnload.init           |   5 +
 dfhack-config/init/onUnload.init              |   4 +
 docs/Core.rst                                 | 104 +++++++------
 docs/changelog.txt                            |   2 +-
 library/CMakeLists.txt                        |   3 -
 library/Core.cpp                              |  17 ++-
 25 files changed, 329 insertions(+), 208 deletions(-)
 create mode 100644 data/init/dfhack.default.init
 rename dfhack.init-example => data/init/dfhack.keybindings.init (60%)
 create mode 100644 data/init/dfhack.tools.init
 create mode 100644 data/init/onLoad.default.init
 create mode 100644 data/init/onMapLoad.default.init
 create mode 100644 data/init/onMapUnload.default.init
 create mode 100644 data/init/onUnload.default.init
 create mode 100644 dfhack-config/init/default.dfhack.init
 create mode 100644 dfhack-config/init/default.onLoad.init
 create mode 100644 dfhack-config/init/default.onMapLoad.init
 create mode 100644 dfhack-config/init/default.onMapUnload.init
 create mode 100644 dfhack-config/init/default.onUnload.init
 create mode 100644 dfhack-config/init/dfhack.init
 create mode 100644 dfhack-config/init/onLoad.init
 create mode 100644 dfhack-config/init/onMapLoad.init
 create mode 100644 dfhack-config/init/onMapUnload.init
 create mode 100644 dfhack-config/init/onUnload.init

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 2c710d91a..bef01888f 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -100,7 +100,6 @@ jobs:
       run: |
         export TERM=dumb
         status=0
-        mv "$DF_FOLDER"/dfhack.init-example "$DF_FOLDER"/dfhack.init
         script -qe -c "python ci/run-tests.py --headless --keep-status \"$DF_FOLDER\"" || status=$((status + 1))
         python ci/check-rpc.py "$DF_FOLDER/dfhack-rpc.txt" || status=$((status + 2))
         mkdir -p artifacts
diff --git a/ci/run-tests.py b/ci/run-tests.py
index be2a02b3f..a6a35bc76 100755
--- a/ci/run-tests.py
+++ b/ci/run-tests.py
@@ -68,7 +68,16 @@ init_contents = change_setting(init_contents, 'FPS', 'YES')
 if args.headless:
     init_contents = change_setting(init_contents, 'PRINT_MODE', 'TEXT')
 
-test_init_file = 'dfhackzzz_test.init'  # Core sorts these alphabetically
+init_path = 'dfhack-config/init'
+if not os.path.isdir('hack/init'):
+    # we're on an old branch that still reads init files from the root dir
+    init_path = '.'
+try:
+    os.mkdir(init_path)
+except OSError as error:
+    # ignore already exists errors
+    pass
+test_init_file = os.path.join(init_path, 'dfhackzzz_test.init')  # Core sorts these alphabetically
 with open(test_init_file, 'w') as f:
     f.write('''
     devel/dump-rpc dfhack-rpc.txt
diff --git a/conf.py b/conf.py
index 5ec58fc98..71ba65fb7 100644
--- a/conf.py
+++ b/conf.py
@@ -24,32 +24,40 @@ import sys
 
 
 # -- Support :dfhack-keybind:`command` ------------------------------------
-# this is a custom directive that pulls info from dfhack.init-example
+# this is a custom directive that pulls info from default keybindings
 
 from docutils import nodes
 from docutils.parsers.rst import roles
 
 sphinx_major_version = sphinx.version_info[0]
 
-def get_keybinds():
+def get_keybinds(root, files, keybindings):
+    """Add keybindings in the specified files to the
+    given keybindings dict.
+    """
+    for file in files:
+        with open(os.path.join(root, file)) as f:
+            lines = [l.replace('keybinding add', '').strip() for l in f.readlines()
+                     if l.startswith('keybinding add')]
+        for k in lines:
+            first, command = k.split(' ', 1)
+            bind, context = (first.split('@') + [''])[:2]
+            if ' ' not in command:
+                command = command.replace('"', '')
+            tool = command.split(' ')[0].replace('"', '')
+            keybindings[tool] = keybindings.get(tool, []) + [
+                (command, bind.split('-'), context)]
+
+def get_all_keybinds(root_dir):
     """Get the implemented keybinds, and return a dict of
     {tool: [(full_command, keybinding, context), ...]}.
     """
-    with open('dfhack.init-example') as f:
-        lines = [l.replace('keybinding add', '').strip() for l in f.readlines()
-                 if l.startswith('keybinding add')]
     keybindings = dict()
-    for k in lines:
-        first, command = k.split(' ', 1)
-        bind, context = (first.split('@') + [''])[:2]
-        if ' ' not in command:
-            command = command.replace('"', '')
-        tool = command.split(' ')[0].replace('"', '')
-        keybindings[tool] = keybindings.get(tool, []) + [
-            (command, bind.split('-'), context)]
+    for root, _, files in os.walk(root_dir):
+        get_keybinds(root, files, keybindings)
     return keybindings
 
-KEYBINDS = get_keybinds()
+KEYBINDS = get_all_keybinds('data/init')
 
 
 # pylint:disable=unused-argument,dangerous-default-value,too-many-arguments
diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt
index 26befdb34..ea88d4473 100644
--- a/data/CMakeLists.txt
+++ b/data/CMakeLists.txt
@@ -1,3 +1,6 @@
+install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/init/
+        DESTINATION "${DFHACK_DATA_DESTINATION}/init")
+
 install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/quickfort/
         DESTINATION "${DFHACK_DATA_DESTINATION}/data/quickfort")
 
diff --git a/data/init/dfhack.default.init b/data/init/dfhack.default.init
new file mode 100644
index 000000000..78dc70450
--- /dev/null
+++ b/data/init/dfhack.default.init
@@ -0,0 +1,8 @@
+# Default DFHack commands to run on program init
+
+# Please do not edit this file directly. It will be overwritten with new
+# defaults when you update DFHack. Instead, add your configuration to
+# dfhack-config/init/dfhack.init
+
+script hack/init/dfhack.keybindings.init
+script hack/init/dfhack.tools.init
diff --git a/dfhack.init-example b/data/init/dfhack.keybindings.init
similarity index 60%
rename from dfhack.init-example
rename to data/init/dfhack.keybindings.init
index 88528f650..e32a7c58e 100644
--- a/dfhack.init-example
+++ b/data/init/dfhack.keybindings.init
@@ -1,3 +1,9 @@
+# Default DFHack keybindings
+
+# Please do not edit this file directly. It will be overwritten with new
+# defaults when you update DFHack. Instead, add your configuration to
+# dfhack-config/init/dfhack.init
+
 ##############################
 # Generic dwarfmode bindings #
 ##############################
@@ -164,137 +170,3 @@ keybinding add Shift-B@pet/List/Unit "gui/autobutcher"
 
 # view pathable tiles from active cursor
 keybinding add Alt-Shift-P@dwarfmode/LookAround gui/pathable
-
-############################
-# UI and game logic tweaks #
-############################
-
-# stabilize the cursor of dwarfmode when switching menus
-tweak stable-cursor
-
-# stop stacked liquid/bar/thread/cloth items from lasting forever
-# if used in reactions that use only a fraction of the dimension.
-# might be fixed by DF
-# tweak fix-dimensions
-
-# make reactions requiring containers usable in advmode - the issue is
-# that the screen asks for those reagents to be selected directly
-tweak advmode-contained
-
-# support Shift-Enter in Trade and Move Goods to Depot screens for faster
-# selection; it selects the current item or stack and scrolls down one line
-tweak fast-trade
-
-# stop the right list in military->positions from resetting to top all the time
-tweak military-stable-assign
-# in same list, color units already assigned to squads in brown & green
-tweak military-color-assigned
-
-# make crafted cloth items wear out with time like in old versions (bug 6003)
-tweak craft-age-wear
-
-# stop adamantine clothing from wearing out (bug 6481)
-#tweak adamantine-cloth-wear
-
-# Add "Select all" and "Deselect all" options to farm plot menus
-tweak farm-plot-select
-
-# Add Shift-Left/Right controls to import agreement screen
-tweak import-priority-category
-
-# Fixes a crash in the work order contition material list (bug 9905).
-tweak condition-material
-
-# Adds an option to clear currently-bound hotkeys
-tweak hotkey-clear
-
-# Allows lowercase letters in embark profile names, and allows exiting the name prompt without saving
-tweak embark-profile-name
-
-# Reduce performance impact of temperature changes
-tweak fast-heat 100
-
-# Misc. UI tweaks
-tweak block-labors              # Prevents labors that can't be used from being toggled
-tweak burrow-name-cancel
-tweak cage-butcher
-tweak civ-view-agreement
-tweak do-job-now
-tweak eggs-fertile
-tweak fps-min
-tweak hide-priority
-tweak kitchen-prefs-all
-tweak kitchen-prefs-empty
-tweak max-wheelbarrow
-tweak partial-items
-tweak shift-8-scroll
-tweak stone-status-all
-tweak title-start-rename
-tweak tradereq-pet-gender
-
-###########################
-# Globally acting plugins #
-###########################
-
-# Display DFHack version on title screen
-enable title-version
-
-# Dwarf Manipulator (simple in-game Dwarf Therapist replacement)
-enable manipulator
-
-# Search tool in various screens (by falconne)
-enable search
-
-# Improved build material selection interface (by falconne)
-enable automaterial
-
-# Other interface improvement tools
-enable \
- confirm \
- dwarfmonitor \
- mousequery \
- autogems \
- autodump \
- automelt \
- autotrade \
- buildingplan \
- resume \
- trackstop \
- zone \
- stocks \
- autochop \
- stockpiles
-#end a line with a backslash to make it continue to the next line. The \ is deleted for the final command.
-# Multiline commands are ONLY supported for scripts like dfhack.init. You cannot do multiline command manually on the DFHack console.
-# You cannot extend a commented line.
-# You can comment out the extension of a line.
-
-# enable mouse controls and sand indicator in embark screen
-embark-tools enable sticky sand mouse
-
-# enable option to enter embark assistant
-enable embark-assistant
-
-###########
-# Scripts #
-###########
-
-# write extra information to the gamelog
-modtools/extra-gamelog enable
-
-# extended status screen (bedrooms page)
-enable gui/extended-status
-
-# add information to item viewscreens
-view-item-info enable
-
-# a replacement for the "load game" screen
-gui/load-screen enable
-
-##############################
-# Extra DFHack command files #
-##############################
-
-# Create a file named "onLoad.init" to run commands when a world is loaded
-# and/or create a file named "onMapLoad.init" to run commands when a map is
-# loaded. See the hack/examples/init/ directory for useful pre-made init files.
diff --git a/data/init/dfhack.tools.init b/data/init/dfhack.tools.init
new file mode 100644
index 000000000..aab17ebbe
--- /dev/null
+++ b/data/init/dfhack.tools.init
@@ -0,0 +1,131 @@
+# Default DFHack tool configuration
+
+# Please do not edit this file directly. It will be overwritten with new
+# defaults when you update DFHack. Instead, add your configuration to
+# dfhack-config/init/dfhack.init
+
+############################
+# UI and game logic tweaks #
+############################
+
+# stabilize the cursor of dwarfmode when switching menus
+tweak stable-cursor
+
+# stop stacked liquid/bar/thread/cloth items from lasting forever
+# if used in reactions that use only a fraction of the dimension.
+# might be fixed by DF
+# tweak fix-dimensions
+
+# make reactions requiring containers usable in advmode - the issue is
+# that the screen asks for those reagents to be selected directly
+tweak advmode-contained
+
+# support Shift-Enter in Trade and Move Goods to Depot screens for faster
+# selection; it selects the current item or stack and scrolls down one line
+tweak fast-trade
+
+# stop the right list in military->positions from resetting to top all the time
+tweak military-stable-assign
+# in same list, color units already assigned to squads in brown & green
+tweak military-color-assigned
+
+# make crafted cloth items wear out with time like in old versions (bug 6003)
+tweak craft-age-wear
+
+# stop adamantine clothing from wearing out (bug 6481)
+#tweak adamantine-cloth-wear
+
+# Add "Select all" and "Deselect all" options to farm plot menus
+tweak farm-plot-select
+
+# Add Shift-Left/Right controls to import agreement screen
+tweak import-priority-category
+
+# Fixes a crash in the work order contition material list (bug 9905).
+tweak condition-material
+
+# Adds an option to clear currently-bound hotkeys
+tweak hotkey-clear
+
+# Allows lowercase letters in embark profile names, and allows exiting the name prompt without saving
+tweak embark-profile-name
+
+# Reduce performance impact of temperature changes
+tweak fast-heat 100
+
+# Misc. UI tweaks
+tweak block-labors              # Prevents labors that can't be used from being toggled
+tweak burrow-name-cancel
+tweak cage-butcher
+tweak civ-view-agreement
+tweak do-job-now
+tweak eggs-fertile
+tweak fps-min
+tweak hide-priority
+tweak kitchen-prefs-all
+tweak kitchen-prefs-empty
+tweak max-wheelbarrow
+tweak partial-items
+tweak shift-8-scroll
+tweak stone-status-all
+tweak title-start-rename
+tweak tradereq-pet-gender
+
+###########################
+# Globally acting plugins #
+###########################
+
+# Display DFHack version on title screen
+enable title-version
+
+# Dwarf Manipulator (simple in-game Dwarf Therapist replacement)
+enable manipulator
+
+# Search tool in various screens (by falconne)
+enable search
+
+# Improved build material selection interface (by falconne)
+enable automaterial
+
+# Other interface improvement tools
+enable \
+ confirm \
+ dwarfmonitor \
+ mousequery \
+ autogems \
+ autodump \
+ automelt \
+ autotrade \
+ buildingplan \
+ resume \
+ trackstop \
+ zone \
+ stocks \
+ autochop \
+ stockpiles
+#end a line with a backslash to make it continue to the next line. The \ is deleted for the final command.
+# Multiline commands are ONLY supported for scripts like dfhack.init. You cannot do multiline command manually on the DFHack console.
+# You cannot extend a commented line.
+# You can comment out the extension of a line.
+
+# enable mouse controls and sand indicator in embark screen
+embark-tools enable sticky sand mouse
+
+# enable option to enter embark assistant
+enable embark-assistant
+
+###########
+# Scripts #
+###########
+
+# write extra information to the gamelog
+modtools/extra-gamelog enable
+
+# extended status screen (bedrooms page)
+enable gui/extended-status
+
+# add information to item viewscreens
+view-item-info enable
+
+# a replacement for the "load game" screen
+gui/load-screen enable
diff --git a/data/init/onLoad.default.init b/data/init/onLoad.default.init
new file mode 100644
index 000000000..c13190357
--- /dev/null
+++ b/data/init/onLoad.default.init
@@ -0,0 +1,5 @@
+# Default DFHack commands to run when a world is loaded
+
+# Please do not edit this file directly. It will be overwritten with new
+# defaults when you update DFHack. Instead, add your configuration to
+# dfhack-config/init/onLoad.init
diff --git a/data/init/onMapLoad.default.init b/data/init/onMapLoad.default.init
new file mode 100644
index 000000000..44986a044
--- /dev/null
+++ b/data/init/onMapLoad.default.init
@@ -0,0 +1,6 @@
+# Default DFHack commands to run when a map is loaded, either in
+# adventure or fort mode.
+
+# Please do not edit this file directly. It will be overwritten with new
+# defaults when you update DFHack. Instead, add your configuration to
+# dfhack-config/init/onMapLoad.init
diff --git a/data/init/onMapUnload.default.init b/data/init/onMapUnload.default.init
new file mode 100644
index 000000000..6441d72ff
--- /dev/null
+++ b/data/init/onMapUnload.default.init
@@ -0,0 +1,5 @@
+# Default DFHack commands to run when a map is unloaded
+
+# Please do not edit this file directly. It will be overwritten with new
+# defaults when you update DFHack. Instead, add your configuration to
+# dfhack-config/init/onMapUnload.init
diff --git a/data/init/onUnload.default.init b/data/init/onUnload.default.init
new file mode 100644
index 000000000..9254a257b
--- /dev/null
+++ b/data/init/onUnload.default.init
@@ -0,0 +1,5 @@
+# Default DFHack commands to run when a world is unloaded
+
+# Please do not edit this file directly. It will be overwritten with new
+# defaults when you update DFHack. Instead, add your configuration to
+# dfhack-config/init/onUnload.init
diff --git a/dfhack-config/init/default.dfhack.init b/dfhack-config/init/default.dfhack.init
new file mode 100644
index 000000000..aad18dd1c
--- /dev/null
+++ b/dfhack-config/init/default.dfhack.init
@@ -0,0 +1,7 @@
+# Load DFHack defaults.
+#
+# If you delete this file, it will reappear when you restart DFHack.
+# Instead, please comment out the following line if you do not want DFHack to
+# load its default configuration.
+
+script hack/init/dfhack.default.init
diff --git a/dfhack-config/init/default.onLoad.init b/dfhack-config/init/default.onLoad.init
new file mode 100644
index 000000000..fe87d4209
--- /dev/null
+++ b/dfhack-config/init/default.onLoad.init
@@ -0,0 +1,7 @@
+# Load DFHack defaults.
+#
+# If you delete this file, it will reappear when you restart DFHack.
+# Instead, please comment out the following line if you do not want DFHack to
+# load its default configuration.
+
+script hack/init/onLoad.default.init
diff --git a/dfhack-config/init/default.onMapLoad.init b/dfhack-config/init/default.onMapLoad.init
new file mode 100644
index 000000000..9e781b924
--- /dev/null
+++ b/dfhack-config/init/default.onMapLoad.init
@@ -0,0 +1,7 @@
+# Load DFHack defaults.
+#
+# If you delete this file, it will reappear when you restart DFHack.
+# Instead, please comment out the following line if you do not want DFHack to
+# load its default configuration.
+
+script hack/init/onMapLoad.default.init
diff --git a/dfhack-config/init/default.onMapUnload.init b/dfhack-config/init/default.onMapUnload.init
new file mode 100644
index 000000000..716680fd0
--- /dev/null
+++ b/dfhack-config/init/default.onMapUnload.init
@@ -0,0 +1,7 @@
+# Load DFHack defaults.
+#
+# If you delete this file, it will reappear when you restart DFHack.
+# Instead, please comment out the following line if you do not want DFHack to
+# load its default configuration.
+
+script hack/init/onMapUnload.default.init
diff --git a/dfhack-config/init/default.onUnload.init b/dfhack-config/init/default.onUnload.init
new file mode 100644
index 000000000..712c35098
--- /dev/null
+++ b/dfhack-config/init/default.onUnload.init
@@ -0,0 +1,7 @@
+# Load DFHack defaults.
+#
+# If you delete this file, it will reappear when you restart DFHack.
+# Instead, please comment out the following line if you do not want DFHack to
+# load its default configuration.
+
+script hack/init/onUnload.default.init
diff --git a/dfhack-config/init/dfhack.init b/dfhack-config/init/dfhack.init
new file mode 100644
index 000000000..b05598f98
--- /dev/null
+++ b/dfhack-config/init/dfhack.init
@@ -0,0 +1,5 @@
+# This file runs when DFHack is initialized, when Dwarf Fortress is first
+# started, before any world or save data is loaded.
+#
+# You can extend or override DFHack's default configuration by adding commands
+# to this file.
diff --git a/dfhack-config/init/onLoad.init b/dfhack-config/init/onLoad.init
new file mode 100644
index 000000000..ef4fd97af
--- /dev/null
+++ b/dfhack-config/init/onLoad.init
@@ -0,0 +1,6 @@
+# This file runs when a world is loaded. This happens when you open a save file
+# in fort, adventure, or legends mode. If a fort is being loaded, this file runs
+# before any onMapLoad.init files.
+#
+# You can extend or override DFHack's default configuration by adding commands
+# to this file.
diff --git a/dfhack-config/init/onMapLoad.init b/dfhack-config/init/onMapLoad.init
new file mode 100644
index 000000000..90c6b9e14
--- /dev/null
+++ b/dfhack-config/init/onMapLoad.init
@@ -0,0 +1,5 @@
+# This file runs when a map is loaded in adventure or fort mode, after any
+# onLoad.init files (which run earlier, when the world is loaded).
+#
+# You can extend or override DFHack's default configuration by adding commands
+# to this file.
diff --git a/dfhack-config/init/onMapUnload.init b/dfhack-config/init/onMapUnload.init
new file mode 100644
index 000000000..c513d9cae
--- /dev/null
+++ b/dfhack-config/init/onMapUnload.init
@@ -0,0 +1,5 @@
+# This file runs when a fortress map is unloaded, before any onUnload.init files
+# (which run later, when the world is unloaded).
+#
+# You can extend or override DFHack's default configuration by adding commands
+# to this file.
diff --git a/dfhack-config/init/onUnload.init b/dfhack-config/init/onUnload.init
new file mode 100644
index 000000000..c8ed3ab5b
--- /dev/null
+++ b/dfhack-config/init/onUnload.init
@@ -0,0 +1,4 @@
+# This file runs when a world is unloaded.
+#
+# You can extend or override DFHack's default configuration by adding commands
+# to this file.
diff --git a/docs/Core.rst b/docs/Core.rst
index ef178cc6e..fe881a54d 100644
--- a/docs/Core.rst
+++ b/docs/Core.rst
@@ -366,16 +366,27 @@ The following commands are *not* built-in, but offer similarly useful functions.
 * `repeat`
 
 
+.. _dfhack-config:
+
+Configuration Files
+===================
+
+Most DFHack settings can be changed by modifying files in the ``dfhack-config``
+folder (which is in the DF folder). The default versions of these files, if they
+exist, are in ``dfhack-config/default`` and are installed when DFHack starts if
+necessary.
+
 .. _init-files:
 
 Init Files
-==========
+----------
 
 .. contents::
    :local:
 
 DFHack allows users to automatically run commonly-used DFHack commands
-when DF is first loaded, when a game is loaded, and when a game is unloaded.
+when DF is first loaded, when a world is loaded, when a map is loaded, when a
+map is unloaded, and when a world is unloaded.
 
 Init scripts function the same way they would if the user manually typed
 in their contents, but are much more convenient.  In order to facilitate
@@ -385,32 +396,33 @@ save-specific init files in the save folders.
 
 DFHack looks for init files in three places each time they could be run:
 
-#. The main DF directory
+#. The :file:`dfhack-config/init` subdirectory in the main DF directory
 #. :file:`data/save/{world}/raw`, where ``world`` is the current save, and
 #. :file:`data/save/{world}/raw/objects`
 
-When reading commands from dfhack.init or with the `script` command, if the final
-character on a line is a backslash then the next uncommented line is considered a
-continuation of that line, with the backslash deleted.  Commented lines are skipped,
-so it is possible to comment out parts of a command with the ``#`` character.
+For each of those directories, all matching init files will be executed in
+alphabetical order.
 
+Before running matched init scripts in any of those locations, the
+:file:`dfhack-config/init/default.*` file that matches the event will be run to
+load DFHack defaults. Only the :file:`dfhack-config/init` directory is checked
+for this file, not any :file:`raw` directories. If you want DFHack to load
+without running any of its default configuration commands, edit the
+:file:`dfhack-config/init/default.*` files and comment out the commands you see
+there.
 
-.. _dfhack.init:
+When reading commands from the init files or with the `script` command, if the
+final character on a line is a backslash then the next uncommented line is
+considered a continuation of that line, with the backslash deleted.  Commented
+lines are skipped, so it is possible to comment out parts of a command with the
+``#`` character.
 
-dfhack*.init
-------------
-If your DF folder contains at least one file named ``dfhack*.init``
-(where ``*`` is a placeholder for any string), then all such files
-are executed in alphabetical order when DF is first started.
-
-DFHack is distributed with :download:`/dfhack.init-example` as an example
-with an up-to-date collection of basic commands; mostly setting standard
-keybindings and `enabling <enable>` plugins.  You are encouraged to look
-through this file to learn which features it makes available under which
-key combinations.  You may also customise it and rename it to ``dfhack.init``.
+.. _dfhack.init:
 
-If your DF folder does not contain any ``dfhack*.init`` files, the example
-will be run as a fallback.
+dfhack\*.init
+.............
+On startup, DFHack looks for files of the form ``dfhack*.init`` (where ``*`` is
+a placeholder for any string, including the empty string).
 
 These files are best used for keybindings and enabling persistent plugins
 which do not require a world to be loaded.
@@ -418,51 +430,49 @@ which do not require a world to be loaded.
 
 .. _onLoad.init:
 
-onLoad*.init
-------------
+onLoad\*.init
+.............
 When a world is loaded, DFHack looks for files of the form ``onLoad*.init``,
 where ``*`` can be any string, including the empty string.
 
-All matching init files will be executed in alphabetical order.
 A world being loaded can mean a fortress, an adventurer, or legends mode.
 
 These files are best used for non-persistent commands, such as setting
 a `fix <scripts-fix>` script to run on `repeat`.
 
 
-.. _onUnload.init:
+.. _onMapLoad.init:
 
-onUnload*.init
---------------
-When a world is unloaded, DFHack looks for files of the form ``onUnload*.init``.
-Again, these files may be in any of the above three places.
-All matching init files will be executed in alphebetical order.
+onMapLoad\*.init
+................
+When a map is loaded, either in adventure or fort mode, DFHack looks for files
+of the form ``onMapLoad*.init``, where ``*`` can be any string, including the
+empty string.
 
-Modders often use such scripts to disable tools which should not affect
-an unmodded save.
+These files are best used for commands that are only relevant once there is a
+game map loaded.
 
-.. _other_init_files:
 
-Other init files
-----------------
+.. _onMapUnload.init:
+.. _onUnload.init:
 
-* ``onMapLoad*.init`` and ``onMapUnload*.init`` are run when a map,
-  distinct from a world, is loaded.  This is good for map-affecting
-  commands (e.g. `clean`), or avoiding issues in Legends mode.
+onMapUnload\*.init and onUnload\*.init
+......................................
+When a map or world is unloaded, DFHack looks for files of the form
+``onMapUnload*.init`` or ``onUnload*.init``, respectively.
 
-* Any lua script named ``raw/init.d/*.lua``, in the save or main DF
-  directory, will be run when any world or that save is loaded.
+Modders often use unload init scripts to disable tools which should not run
+after a modded save is unloaded.
 
 
-.. _dfhack-config:
+.. _other_init_files:
 
-Configuration Files
-===================
+raw/init.d/\*.lua
+.................
+
+Any lua script named ``raw/init.d/*.lua``, in the save or main DF directory,
+will be run when any world or that save is loaded.
 
-Some DFHack settings can be changed by modifying files in the ``dfhack-config``
-folder (which is in the DF folder). The default versions of these files, if they
-exist, are in ``dfhack-config/default`` and are installed when DFHack starts if
-necessary.
 
 .. _script-paths:
 
diff --git a/docs/changelog.txt b/docs/changelog.txt
index 29e0d8e22..31f8b4615 100644
--- a/docs/changelog.txt
+++ b/docs/changelog.txt
@@ -41,7 +41,7 @@ changelog.txt uses a syntax similar to RST, with a few special sequences:
 - ``job.removeJob()``: ensure jobs are removed from the world list when they are canceled
 
 ## Misc Improvements
-
+- Init scripts: ``dfhack.init`` and other init scripts have moved to ``dfhack-config/init/``. If you have customized your ``dfhack.init`` file and want to keep your changes, please move the part that you have customized to the new location at ``dfhack-config/init/dfhack.init``. If you do not have changes that you want to keep, do not copy anything, and the new defaults will be used automatically.
 - `manipulator`: add a library of useful default professions
 - `manipulator`: move professions configuration from ``professions/`` to ``dfhack-config/professions/`` to keep it together with other dfhack configuration. If you have saved professions that you would like to keep, please manually move them to the new folder.
 - ``materials.ItemTraitsDialog``: added a default ``on_select``-handler which toggles the traits.
diff --git a/library/CMakeLists.txt b/library/CMakeLists.txt
index 9e7bf8590..b3cdf93b9 100644
--- a/library/CMakeLists.txt
+++ b/library/CMakeLists.txt
@@ -460,9 +460,6 @@ endif()
 # install the offset file
 install(FILES xml/symbols.xml
     DESTINATION ${DFHACK_DATA_DESTINATION})
-# install the example autoexec file
-install(FILES ../dfhack.init-example
-    DESTINATION ${DFHACK_BINARY_DESTINATION})
 
 install(TARGETS dfhack-run dfhack-client binpatch
     LIBRARY DESTINATION ${DFHACK_LIBRARY_DESTINATION}
diff --git a/library/Core.cpp b/library/Core.cpp
index 10f5057f3..aa43f3c2b 100644
--- a/library/Core.cpp
+++ b/library/Core.cpp
@@ -1450,13 +1450,12 @@ static void run_dfhack_init(color_ostream &out, Core *core)
         return;
     }
 
+    // load baseline defaults
+    core->loadScriptFile(out, "dfhack-config/init/default.dfhack.init", false);
+
+    // load user overrides
     std::vector<std::string> prefixes(1, "dfhack");
-    size_t count = loadScriptFiles(core, out, prefixes, ".");
-    if (!count || !Filesystem::isfile("dfhack.init"))
-    {
-        core->runCommand(out, "gui/no-dfhack-init");
-        core->loadScriptFile(out, "dfhack.init-example", false);
-    }
+    loadScriptFiles(core, out, prefixes, "dfhack-config/init");
 }
 
 // Load dfhack.init in a dedicated thread (non-interactive console mode)
@@ -2226,7 +2225,11 @@ void Core::handleLoadAndUnloadScripts(color_ostream& out, state_change_event eve
     auto i = table.find(event);
     if ( i != table.end() ) {
         const std::vector<std::string>& set = i->second;
-        loadScriptFiles(this, out, set, "."      );
+
+        // load baseline defaults
+        this->loadScriptFile(out, "dfhack-config/init/default." + set[0] + ".init", false);
+
+        loadScriptFiles(this, out, set, "dfhack-config/init");
         loadScriptFiles(this, out, set, rawFolder);
         loadScriptFiles(this, out, set, rawFolder + "objects/");
     }

From f1cb9b9a839b2f80f2b4b5daab3000503b1353fc Mon Sep 17 00:00:00 2001
From: Myk <myk002@yahoo.com>
Date: Tue, 5 Jul 2022 12:21:41 -0700
Subject: [PATCH 177/854] Build and install text help alongside html (#2236)

* build text docs alongside html

also:
- capture more doc dependencies that should cause rebuilds
- move intermediate build output (doctree data) into build dir
- allow sphinx build to multitask more for faster completion times

* install text help alongside html help

* update settings in docs build action
---
 .github/workflows/build.yml |  4 ++--
 .gitignore                  |  1 +
 CMakeLists.txt              | 42 ++++++++++++++++++++++++-------------
 3 files changed, 30 insertions(+), 17 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index bef01888f..fc6eac094 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -128,14 +128,14 @@ jobs:
         python-version: 3
     - name: Install dependencies
       run: |
-        pip install 'sphinx<4.4.0'
+        pip install 'sphinx'
     - name: Clone DFHack
       uses: actions/checkout@v1
       with:
         submodules: true
     - name: Build docs
       run: |
-        sphinx-build -W --keep-going -j3 --color . docs/html
+        sphinx-build -W --keep-going -j auto --color . docs/html
     - name: Upload docs
       uses: actions/upload-artifact@v1
       with:
diff --git a/.gitignore b/.gitignore
index 8e401a7df..0b54f4a84 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,6 +18,7 @@ build/VC2010
 docs/_*
 docs/html/
 docs/pdf/
+docs/text/
 
 # in-place build
 build/Makefile
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8271840e6..6bee1c04a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,7 +1,7 @@
 # main project file. use it from a build sub-folder, see COMPILE for details
 
 ## some generic CMake magic
-cmake_minimum_required(VERSION 2.8.12 FATAL_ERROR)
+cmake_minimum_required(VERSION 3.6 FATAL_ERROR)
 cmake_policy(SET CMP0048 NEW)
 project(dfhack)
 
@@ -450,37 +450,47 @@ if(BUILD_DOCS)
         message(SEND_ERROR "Sphinx not found but BUILD_DOCS enabled")
     endif()
 
-    file(GLOB SPHINX_DEPS
-        "${CMAKE_CURRENT_SOURCE_DIR}/docs/*.rst"
-        "${CMAKE_CURRENT_SOURCE_DIR}/docs/guides/*.rst"
-        "${CMAKE_CURRENT_SOURCE_DIR}/docs/changelog.txt"
-        "${CMAKE_CURRENT_SOURCE_DIR}/docs/gen_changelog.py"
+    file(GLOB SPHINX_GLOB_DEPS
+        LIST_DIRECTORIES false
         "${CMAKE_CURRENT_SOURCE_DIR}/docs/images/*.png"
         "${CMAKE_CURRENT_SOURCE_DIR}/docs/styles/*"
-        "${CMAKE_CURRENT_SOURCE_DIR}/conf.py"
-        "${CMAKE_CURRENT_SOURCE_DIR}/scripts/about.txt"
-        "${CMAKE_CURRENT_SOURCE_DIR}/scripts/*/about.txt"
+        "${CMAKE_CURRENT_SOURCE_DIR}/data/init/*init"
+    )
+    file(GLOB_RECURSE SPHINX_GLOB_RECURSE_DEPS
+        "${CMAKE_CURRENT_SOURCE_DIR}/*.rst"
+        "${CMAKE_CURRENT_SOURCE_DIR}/changelog.txt"
+    )
+    list(FILTER SPHINX_GLOB_RECURSE_DEPS
+        EXCLUDE REGEX "docs/_"
     )
     file(GLOB_RECURSE SPHINX_SCRIPT_DEPS
         "${CMAKE_CURRENT_SOURCE_DIR}/scripts/*.lua"
         "${CMAKE_CURRENT_SOURCE_DIR}/scripts/*.rb"
+        "${CMAKE_CURRENT_SOURCE_DIR}/scripts/*.txt"
     )
-    set(SPHINX_DEPS ${SPHINX_DEPS} ${SPHINX_SCRIPT_DEPS}
-        "${CMAKE_CURRENT_SOURCE_DIR}/LICENSE.rst"
+    set(SPHINX_DEPS ${SPHINX_GLOB_DEPS} ${SPHINX_GLOB_RECURSE_DEPS} ${SPHINX_SCRIPT_DEPS}
         "${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt"
+        "${CMAKE_CURRENT_SOURCE_DIR}/conf.py"
+        "${CMAKE_CURRENT_SOURCE_DIR}/docs/gen_changelog.py"
     )
 
     set(SPHINX_OUTPUT "${CMAKE_CURRENT_SOURCE_DIR}/docs/html/.buildinfo")
     set_source_files_properties(${SPHINX_OUTPUT} PROPERTIES GENERATED TRUE)
     add_custom_command(OUTPUT ${SPHINX_OUTPUT}
         COMMAND ${SPHINX_EXECUTABLE}
-            -a -E -q -b html
+            -q -b html -d "${CMAKE_BINARY_DIR}/docs/html"
             "${CMAKE_CURRENT_SOURCE_DIR}"
             "${CMAKE_CURRENT_SOURCE_DIR}/docs/html"
-            -w "${CMAKE_CURRENT_SOURCE_DIR}/docs/_sphinx-warnings.txt"
-            -j 2
+            -w "${CMAKE_BINARY_DIR}/docs/html/_sphinx-warnings.txt"
+            -j auto
+        COMMAND ${SPHINX_EXECUTABLE}
+            -q -b text -d "${CMAKE_BINARY_DIR}/docs/text"
+            "${CMAKE_CURRENT_SOURCE_DIR}"
+            "${CMAKE_CURRENT_SOURCE_DIR}/docs/text"
+            -w "${CMAKE_BINARY_DIR}/docs/text/_sphinx-warnings.txt"
+            -j auto
         DEPENDS ${SPHINX_DEPS}
-        COMMENT "Building HTML documentation with Sphinx"
+        COMMENT "Building documentation with Sphinx"
     )
 
     add_custom_target(dfhack_docs ALL
@@ -493,6 +503,8 @@ if(BUILD_DOCS)
 
     install(DIRECTORY ${dfhack_SOURCE_DIR}/docs/html/
         DESTINATION ${DFHACK_USERDOC_DESTINATION}/docs)
+    install(DIRECTORY ${dfhack_SOURCE_DIR}/docs/text/
+        DESTINATION ${DFHACK_USERDOC_DESTINATION}/docs)
     install(FILES docs/_auto/news.rst docs/_auto/news-dev.rst DESTINATION ${DFHACK_USERDOC_DESTINATION})
     install(FILES "README.html" DESTINATION "${DFHACK_DATA_DESTINATION}")
 endif()

From 27d7c3acc64009f0f4e361a4c3da891e9df1b239 Mon Sep 17 00:00:00 2001
From: Myk <myk002@yahoo.com>
Date: Tue, 5 Jul 2022 14:05:34 -0700
Subject: [PATCH 178/854] Myk sample command help (#2238)

* add example tool documentation in proposed format

* refine Tools.rst
---
 conf.py                  |  6 +-----
 docs/Tools.rst           | 13 +++++++++++++
 docs/tools/cromulate.rst | 34 ++++++++++++++++++++++++++++++++++
 index.rst                |  1 +
 4 files changed, 49 insertions(+), 5 deletions(-)
 create mode 100644 docs/Tools.rst
 create mode 100644 docs/tools/cromulate.rst

diff --git a/conf.py b/conf.py
index 71ba65fb7..53b192467 100644
--- a/conf.py
+++ b/conf.py
@@ -66,11 +66,7 @@ def dfhack_keybind_role_func(role, rawtext, text, lineno, inliner,
     """Custom role parser for DFHack default keybinds."""
     roles.set_classes(options)
     if text not in KEYBINDS:
-        msg = inliner.reporter.error(
-            'no keybinding for {} in dfhack.init-example'.format(text),
-            line=lineno)
-        prb = inliner.problematic(rawtext, rawtext, msg)
-        return [prb], [msg]
+        return [], []
     newnode = nodes.paragraph()
     for cmd, key, ctx in KEYBINDS[text]:
         n = nodes.paragraph()
diff --git a/docs/Tools.rst b/docs/Tools.rst
new file mode 100644
index 000000000..15c5f878e
--- /dev/null
+++ b/docs/Tools.rst
@@ -0,0 +1,13 @@
+.. _tools-index:
+
+############
+DFHack Tools
+############
+
+These are the DFHack commands you can run.
+
+.. toctree::
+   :titlesonly:
+   :glob:
+
+   /docs/tools/*
diff --git a/docs/tools/cromulate.rst b/docs/tools/cromulate.rst
new file mode 100644
index 000000000..ca07ae0ca
--- /dev/null
+++ b/docs/tools/cromulate.rst
@@ -0,0 +1,34 @@
+cromulate
+=========
+
+Tags: productivity, unit, adventure
+:dfhack-keybind:`cromulate`
+
+Collects all widgets into a frobozz electric cromufiler. You might want to do
+this if you discover that your widgets have become decromulated. It is safe to
+run this command periodically even if you are unsure if that's the case.
+
+Usage::
+
+    cromulate [all|here] [<options>]
+
+When run without parameters, it lists all your widgets. Add the ``all`` keyword
+to collect all widgets into the cromufiler, or the ``here`` keyword to just
+collect those under the cursor.
+
+Options:
+
+:``-d``, ``--destroy``:
+    Destroy the widgets instead of collecting them into the cromufiler.
+:``-q``, ``--quiet``:
+    Don't display any informational output. Errors will still be printed to the
+    console.
+
+Examples:
+
+- ``cromulate``
+    Lists all widgets and their positions
+- ``cromlate all``
+    Gather all widgets into the cromufiler
+- ``cromulate here --destroy``
+    Destroys the widgets under the cursor
diff --git a/index.rst b/index.rst
index 2e5454f40..63ab02a86 100644
--- a/index.rst
+++ b/index.rst
@@ -32,6 +32,7 @@ User Manual
    /docs/Core
    /docs/Plugins
    /docs/Scripts
+   /docs/Tools
    /docs/guides/index
    /docs/index-about
    /docs/index-dev

From b0e7325d4fc54ab9d0cf6b2876351bcc7df0823a Mon Sep 17 00:00:00 2001
From: Myk <myk002@yahoo.com>
Date: Tue, 5 Jul 2022 14:13:25 -0700
Subject: [PATCH 179/854] add sample plugin to go with the sample help (#2239)

---
 plugins/CMakeLists.txt |  1 +
 plugins/cromulate.cpp  | 28 ++++++++++++++++++++++++++++
 2 files changed, 29 insertions(+)
 create mode 100644 plugins/cromulate.cpp

diff --git a/plugins/CMakeLists.txt b/plugins/CMakeLists.txt
index 4a4b74eaa..732673926 100644
--- a/plugins/CMakeLists.txt
+++ b/plugins/CMakeLists.txt
@@ -106,6 +106,7 @@ if(BUILD_SUPPORTED)
     dfhack_plugin(command-prompt command-prompt.cpp)
     dfhack_plugin(confirm confirm.cpp LINK_LIBRARIES lua)
     dfhack_plugin(createitem createitem.cpp)
+    dfhack_plugin(cromulate cromulate.cpp)
     dfhack_plugin(cursecheck cursecheck.cpp)
     dfhack_plugin(cxxrandom cxxrandom.cpp LINK_LIBRARIES lua)
     dfhack_plugin(deramp deramp.cpp)
diff --git a/plugins/cromulate.cpp b/plugins/cromulate.cpp
new file mode 100644
index 000000000..9f7fdb9f9
--- /dev/null
+++ b/plugins/cromulate.cpp
@@ -0,0 +1,28 @@
+#include "Core.h"
+#include <Console.h>
+#include <Export.h>
+#include <PluginManager.h>
+
+using namespace DFHack;
+using namespace df::enums;
+
+DFHACK_PLUGIN("cromulate");
+
+command_result cromulate (color_ostream &out, std::vector <std::string> & parameters);
+
+DFhackCExport command_result plugin_init (color_ostream &out, std::vector <PluginCommand> &commands) {
+    commands.push_back(PluginCommand("cromulate",
+                                     "in-cpp plugin short desc", //to use one line in the ``[DFHack]# ls`` output
+                                     cromulate,
+                                     false,
+                                     "in-cpp plugin long help"));
+    return CR_OK;
+}
+
+DFhackCExport command_result plugin_shutdown (color_ostream &out) {
+    return CR_OK;
+}
+
+command_result cromulate (color_ostream &out, std::vector <std::string> &parameters) {
+    return CR_OK;
+}

From 64aba7a8a38f87dfb8dc984ccefb773e871c4cbe Mon Sep 17 00:00:00 2001
From: Myk <myk002@yahoo.com>
Date: Wed, 6 Jul 2022 11:57:48 -0700
Subject: [PATCH 180/854] Myk rendered help (#2240)

* implement help db

* add initial list of tags

* read tags fr help, read script short desc, filter
---
 docs/Tags.rst          |  14 ++
 index.rst              |   1 +
 library/LuaApi.cpp     |  76 ++++++++
 library/lua/helpdb.lua | 410 +++++++++++++++++++++++++++++++++++++++++
 4 files changed, 501 insertions(+)
 create mode 100644 docs/Tags.rst
 create mode 100644 library/lua/helpdb.lua

diff --git a/docs/Tags.rst b/docs/Tags.rst
new file mode 100644
index 000000000..effc0ad23
--- /dev/null
+++ b/docs/Tags.rst
@@ -0,0 +1,14 @@
+Tags
+====
+
+This is the list of tags and their descriptions.
+
+- adventure: tools relevant to adventure mode
+- fort: tools relevant to fort mode
+- legends: tools relevant to legends mode
+- enable: tools that are able to be enabled/disabled for some persistent effect
+- items: tools that create or modify in-game items
+- units: tools that create or modify units
+- jobs: tools that create or modify jobs
+- labors: tools that deal with labor assignment
+- auto: tools that automatically manage some aspect of your fortress
diff --git a/index.rst b/index.rst
index 63ab02a86..3e761bbc6 100644
--- a/index.rst
+++ b/index.rst
@@ -32,6 +32,7 @@ User Manual
    /docs/Core
    /docs/Plugins
    /docs/Scripts
+   /docs/Tags
    /docs/Tools
    /docs/guides/index
    /docs/index-about
diff --git a/library/LuaApi.cpp b/library/LuaApi.cpp
index 101b645fd..fb557329d 100644
--- a/library/LuaApi.cpp
+++ b/library/LuaApi.cpp
@@ -3023,6 +3023,79 @@ static int internal_findScript(lua_State *L)
     return 1;
 }
 
+static int internal_listPlugins(lua_State *L)
+{
+    auto plugins = Core::getInstance().getPluginManager();
+
+    int i = 1;
+    lua_newtable(L);
+    for (auto it = plugins->begin(); it != plugins->end(); ++it)
+    {
+        lua_pushinteger(L, i++);
+        lua_pushstring(L, it->first.c_str());
+        lua_settable(L, -3);
+    }
+    return 1;
+}
+
+static int internal_listCommands(lua_State *L)
+{
+    auto plugins = Core::getInstance().getPluginManager();
+
+    const char *name = luaL_checkstring(L, 1);
+
+    auto plugin = plugins->getPluginByName(name);
+    if (!plugin)
+    {
+        lua_pushnil(L);
+        return 1;
+    }
+
+    size_t num_commands = plugin->size();
+    lua_newtable(L);
+    for (size_t i = 0; i < num_commands; ++i)
+    {
+        lua_pushinteger(L, i + 1);
+        lua_pushstring(L, (*plugin)[i].name.c_str());
+        lua_settable(L, -3);
+    }
+    return 1;
+}
+static int internal_getCommandHelp(lua_State *L)
+{
+    auto plugins = Core::getInstance().getPluginManager();
+
+    const char *name = luaL_checkstring(L, 1);
+
+    auto plugin = plugins->getPluginByCommand(name);
+    if (!plugin)
+    {
+        lua_pushnil(L);
+        return 1;
+    }
+
+    size_t num_commands = plugin->size();
+    for (size_t i = 0; i < num_commands; ++i)
+    {
+        if ((*plugin)[i].name == name)
+        {
+            const auto &pc = (*plugin)[i];
+            std::string help = pc.description;
+            if (help.size() && help[help.size()-1] != '.')
+            {
+                help += ".";
+            }
+            help += "\n" + pc.usage;
+            lua_pushstring(L, help.c_str());
+            return 1;
+        }
+    }
+
+    // not found (somehow)
+    lua_pushnil(L);
+    return 1;
+}
+
 static int internal_threadid(lua_State *L)
 {
     std::stringstream ss;
@@ -3094,6 +3167,9 @@ static const luaL_Reg dfhack_internal_funcs[] = {
     { "removeScriptPath", internal_removeScriptPath },
     { "getScriptPaths", internal_getScriptPaths },
     { "findScript", internal_findScript },
+    { "listPlugins", internal_listPlugins },
+    { "listCommands", internal_listCommands },
+    { "getCommandHelp", internal_getCommandHelp },
     { "threadid", internal_threadid },
     { "md5File", internal_md5file },
     { NULL, NULL }
diff --git a/library/lua/helpdb.lua b/library/lua/helpdb.lua
new file mode 100644
index 000000000..cc8665aa1
--- /dev/null
+++ b/library/lua/helpdb.lua
@@ -0,0 +1,410 @@
+-- The help text database.
+--
+-- Command help is read from the the following sources:
+-- 1. rendered text in hack/docs/docs/
+-- 2. (for scripts) the script sources if no pre-rendered text exists or if the
+--    script file has a modification time that is more recent than the
+--    pre-rendered text
+-- 3. (for plugins) the string passed to the PluginCommand initializer if no
+--    pre-rendered text exists
+--
+-- For plugins that don't register any commands, the plugin name serves as the
+-- command so documentation on what happens when you enable the plugin can be
+-- found.
+
+local _ENV = mkmodule('helpdb')
+
+local RENDERED_PATH = 'hack/docs/docs/tools/'
+local TAG_DEFINITIONS = 'hack/docs/docs/Tags.txt'
+
+local SCRIPT_DOC_BEGIN = '[====['
+local SCRIPT_DOC_END = ']====]'
+
+local SOURCES = {
+    STUB='stub',
+    RENDERED='rendered',
+    PLUGIN='plugin',
+    SCRIPT='script',
+}
+
+-- command name -> {short_help, long_help, tags, source, source_timestamp}
+-- also includes a script_source_path element if the source is a script
+-- and a unrunnable boolean if the source is a plugin that does not provide any
+-- commands to invoke directly.
+db = db or {}
+
+-- tag name -> list of command names
+tag_index = tag_index or {}
+
+local function get_rendered_path(command)
+    return RENDERED_PATH .. command .. '.txt'
+end
+
+local function has_rendered_help(command)
+    return dfhack.filesystem.mtime(get_rendered_path(command)) ~= -1
+end
+
+local DEFAULT_HELP_TEMPLATE = [[
+%s
+%s
+
+Tags: None
+
+No help available.
+]]
+
+local function make_default_entry(command, source)
+    local default_long_help = DEFAULT_HELP_TEMPLATE:format(
+                                                command, ('*'):rep(#command))
+    return {short_help='No help available.', long_help=default_long_help,
+            tags={}, source=source, source_timestamp=0}
+end
+
+-- updates the short_text, the long_text, and the tags in the given entry
+local function update_entry(entry, iterator, opts)
+    opts = opts or {}
+    local lines = {}
+    local begin_marker_found,header_found = not opts.begin_marker,opts.no_header
+    local tags_found, short_help_found, in_short_help = false, false, false
+    for line in iterator do
+        if not short_help_found and opts.first_line_is_short_help then
+            local _,_,text = line:trim():find('^%-%-%s*(.*)')
+            if text[#text] ~= '.' then
+                text = text .. '.'
+            end
+            entry.short_help = text
+            short_help_found = true
+            goto continue
+        end
+        if not begin_marker_found then
+            local _, endpos = line:find(opts.begin_marker, 1, true)
+            if endpos == #line then
+                begin_marker_found = true
+            end
+            goto continue
+        end
+        if opts.end_marker then
+            local _, endpos = line:find(opts.end_marker, 1, true)
+            if endpos == #line then
+                break
+            end
+        end
+        if not header_found and line:find('%w') then
+            header_found = true
+        elseif not tags_found and line:find('^Tags: [%w, ]+$') then
+            -- tags must appear before the help text begins
+            local _,_,tags = line:trim():find('Tags: (.*)')
+            entry.tags = tags:split('[ ,]+')
+            table.sort(entry.tags)
+            tags_found = true
+        elseif not short_help_found and not line:find('^Keybinding:') and
+                line:find('%w') then
+            if in_short_help then
+                entry.short_help = entry.short_help .. ' ' .. line
+            else
+                entry.short_help = line
+            end
+            local sentence_end = entry.short_help:find('.', 1, true)
+            if sentence_end then
+                entry.short_help = entry.short_help:sub(1, sentence_end)
+                short_help_found = true
+            else
+                in_short_help = true
+            end
+        end
+        table.insert(lines, line)
+        ::continue::
+    end
+    entry.long_help = table.concat(lines, '\n')
+end
+
+local function make_rendered_entry(old_entry, command)
+    local rendered_path = get_rendered_path(command)
+    local source_timestamp = dfhack.filesystem.mtime(rendered_path)
+    if old_entry and old_entry.source == SOURCES.RENDERED and
+            old_entry.source_timestamp >= source_timestamp then
+        -- we already have the latest info
+        return old_entry
+    end
+    local entry = make_default_entry(command, SOURCES.RENDERED)
+    update_entry(entry, io.lines(rendered_path))
+    entry.source_timestamp = source_timestamp
+    return entry
+end
+
+local function make_plugin_entry(old_entry, command)
+    if old_entry and old_entry.source == SOURCES.PLUGIN then
+        -- we can't tell when a plugin is reloaded, so we can either choose to
+        -- always refresh or never refresh. let's go with never for now for
+        -- performance.
+        return old_entry
+    end
+    local entry = make_default_entry(command, SOURCES.PLUGIN)
+    local long_help = dfhack.internal.getCommandHelp(command)
+    if long_help and #long_help:trim() > 0 then
+        update_entry(entry, long_help:trim():gmatch('[^\n]*'), {no_header=true})
+    end
+    return entry
+end
+
+local function make_script_entry(old_entry, command, script_source_path)
+    local source_timestamp = dfhack.filesystem.mtime(script_source_path)
+    if old_entry and old_entry.source == SOURCES.SCRIPT and
+            old_entry.script_source_path == script_source_path and
+            old_entry.source_timestamp >= source_timestamp then
+        -- we already have the latest info
+        return old_entry
+    end
+    local entry = make_default_entry(command, SOURCES.SCRIPT)
+    update_entry(entry, io.lines(script_source_path),
+                 {begin_marker=SCRIPT_DOC_BEGIN, end_marker=SCRIPT_DOC_END,
+                  first_line_is_short_help=true})
+    entry.source_timestamp = source_timestamp
+    return entry
+end
+
+local function update_db(old_db, db, source, command, flags)
+    if db[command] then
+        -- already in db (e.g. from a higher-priority script dir); skip
+        return
+    end
+    local entry, old_entry = nil, old_db[command]
+    if source == SOURCES.RENDERED then
+        entry = make_rendered_entry(old_entry, command)
+    elseif source == SOURCES.PLUGIN then
+        entry = make_plugin_entry(old_entry, command)
+    elseif source == SOURCES.SCRIPT then
+        entry = make_script_entry(old_entry, command, flags.script_source)
+    elseif source == SOURCES.STUB then
+        entry = make_default_entry(command, SOURCES.STUB)
+    else
+        error('unhandled help source: ' .. source)
+    end
+
+    entry.unrunnable = (flags or {}).unrunnable
+
+    db[command] = entry
+    for _,tag in ipairs(entry.tags) do
+        -- unknown tags are ignored
+        if tag_index[tag] then
+            table.insert(tag_index[tag], command)
+        end
+    end
+end
+
+local function scan_plugins(old_db, db)
+    local plugin_names = dfhack.internal.listPlugins()
+    for _,plugin in ipairs(plugin_names) do
+        local commands = dfhack.internal.listCommands(plugin)
+        if #commands == 0 then
+            -- use plugin name as the command so we have something to anchor the
+            -- documentation to
+            update_db(old_db, db,
+                      has_rendered_help(plugin) and
+                            SOURCES.RENDERED or SOURCES.STUB,
+                      plugin, {unrunnable=true})
+            goto continue
+        end
+        for _,command in ipairs(commands) do
+            update_db(old_db, db,
+                      has_rendered_help(command) and
+                            SOURCES.RENDERED or SOURCES.PLUGIN,
+                      command)
+        end
+        ::continue::
+    end
+end
+
+local function scan_scripts(old_db, db)
+    for _,script_path in ipairs(dfhack.internal.getScriptPaths()) do
+        local files = dfhack.filesystem.listdir_recursive(
+                                            script_path, nil, false)
+        if not files then goto skip_path end
+        for _,f in ipairs(files) do
+            if f.isdir or not f.path:endswith('.lua') or
+                    f.path:startswith('test/') or
+                    f.path:startswith('internal/') then
+                goto continue
+            end
+            local script_source = script_path .. '/' .. f.path
+            local script_is_newer = dfhack.filesystem.mtime(script_source) >
+                    dfhack.filesystem.mtime(get_rendered_path(f.path))
+            update_db(old_db, db,
+                      script_is_newer and SOURCES.SCRIPT or SOURCES.RENDERED,
+                      f.path:sub(1, #f.path - 4), {script_source=script_source})
+            ::continue::
+        end
+        ::skip_path::
+    end
+end
+
+local function initialize_tags()
+    local tag, desc, in_desc = nil, nil, false
+    for line in io.lines(TAG_DEFINITIONS) do
+        if in_desc then
+            line = line:trim()
+            if #line == 0 then
+                in_desc = false
+                goto continue
+            end
+            desc = desc .. ' ' .. line
+            tag_index[tag].description = desc
+        else
+            _,_,tag,desc = line:find('^%* (%w+): (.+)')
+            if not tag then goto continue end
+            tag_index[tag] = {description=desc}
+            in_desc = true
+        end
+        ::continue::
+    end
+end
+
+-- ensures the db is up to date by scanning all help sources. does not do
+-- anything if it has already been run within the last second.
+last_refresh_ms = last_refresh_ms or 0
+local function ensure_db()
+    local now_ms = dfhack.getTickCount()
+    if now_ms - last_refresh_ms < 1000 then return end
+    last_refresh_ms = now_ms
+
+    local old_db = db
+    db, tag_index = {}, {}
+
+    initialize_tags()
+    scan_plugins(old_db, db)
+    scan_scripts(old_db, db)
+end
+
+local function get_db_property(command, property)
+    ensure_db()
+    if not db[command] then
+        error(('command not found: "%s"'):format(command))
+    end
+    return db[command][property]
+end
+
+-- returns the ~54 char summary blurb associated with the entry
+function get_entry_short_help(entry)
+    return get_db_property(entry, 'short_help')
+end
+
+-- returns the full help documentation associated with the entry
+function get_entry_long_help(entry)
+    return get_db_property(entry, 'long_help')
+end
+
+-- returns the list of tags associated with the entry
+function get_entry_tags(entry)
+    return get_db_property(entry, 'tags')
+end
+
+local function chunk_for_sorting(str)
+    local parts = str:split('/')
+    local chunks = {}
+    for i=1,#parts do
+        chunks[#parts - i + 1] = parts[i]
+    end
+    return chunks
+end
+
+-- sorts by last path component, then by parent path components.
+-- something comes before nothing.
+-- e.g. gui/autofarm comes immediately before autofarm
+local function sort_by_basename(a, b)
+    local a = chunk_for_sorting(a)
+    local b = chunk_for_sorting(b)
+    local i = 1
+    while a[i] do
+        if not b[i] then
+            return true
+        end
+        if a[i] ~= b[i] then
+            return a[i] < b[i]
+        end
+        i = i + 1
+    end
+    return false
+end
+
+local function add_if_matched(commands, command, strs, runnable)
+    if runnable and db[command].unrunnable then
+        return
+    end
+    if strs then
+        local matched = false
+        for _,str in ipairs(strs) do
+            if command:find(str, 1, true) then
+                matched = true
+                break
+            end
+        end
+        if not matched then
+            return
+        end
+    end
+    table.insert(commands, command)
+end
+
+-- returns a list of identifiers, alphabetized by their last path component
+-- (e.g. gui/autobutcher will immediately follow autobutcher).
+-- the optional filter element is a map with the following elements:
+--   str - if a string, filters by the given substring. if a table of strings,
+--         includes commands that match any of the given substrings.
+--   tag - if a string, filters by the given tag name. if a table of strings,
+--         includes commands that match any of the given tags.
+--   runnable - if true, filters out plugin names that do no correspond to
+--              runnable commands.
+function list_entries(filter)
+    ensure_db()
+    filter = filter or {}
+    local commands = {}
+    local strs = filter.str
+    if filter.str then
+        if type(strs) == 'string' then strs = {strs} end
+    end
+    local runnable = filter.runnable
+    if not filter.tag then
+        for command in pairs(db) do
+            add_if_matched(commands, command, strs, runnable)
+        end
+    else
+        local command_set = {}
+        local tags = filter.tag
+        if type(tags) == 'string' then tags = {tags} end
+        for _,tag in ipairs(tags) do
+            if not tag_index[tag] then
+                error('invalid tag: ' .. tag)
+            end
+            for _,command in ipairs(tag_index[tag]) do
+                command_set[command] = true
+            end
+        end
+        for command in pairs(command_set) do
+            add_if_matched(commands, command, strs, runnable)
+        end
+    end
+    table.sort(commands, sort_by_basename)
+    return commands
+end
+
+-- returns the defined tags in alphabetical order
+function list_tags()
+    ensure_db()
+    local tags = {}
+    for tag in pairs(tag_index) do
+        table.insert(tags, tag)
+    end
+    table.sort(tags)
+    return tags
+end
+
+-- returns the description associated with the given tag
+function get_tag_description(tag)
+    ensure_db()
+    if not tag_index[tag] then
+        error('invalid tag: ' .. tag)
+    end
+    return tag_index[tag].description
+end
+
+return _ENV

From 35a4d19ac9efce6081091fa5a63a21a3a192a146 Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Wed, 6 Jul 2022 22:26:06 -0700
Subject: [PATCH 181/854] implement listing functions for helpdb

---
 library/lua/helpdb.lua | 152 +++++++++++++++++++++++++++--------------
 1 file changed, 102 insertions(+), 50 deletions(-)

diff --git a/library/lua/helpdb.lua b/library/lua/helpdb.lua
index cc8665aa1..8a27abad8 100644
--- a/library/lua/helpdb.lua
+++ b/library/lua/helpdb.lua
@@ -69,7 +69,7 @@ local function update_entry(entry, iterator, opts)
     for line in iterator do
         if not short_help_found and opts.first_line_is_short_help then
             local _,_,text = line:trim():find('^%-%-%s*(.*)')
-            if text[#text] ~= '.' then
+            if not text:endswith('.') then
                 text = text .. '.'
             end
             entry.short_help = text
@@ -92,10 +92,11 @@ local function update_entry(entry, iterator, opts)
         if not header_found and line:find('%w') then
             header_found = true
         elseif not tags_found and line:find('^Tags: [%w, ]+$') then
-            -- tags must appear before the help text begins
             local _,_,tags = line:trim():find('Tags: (.*)')
-            entry.tags = tags:split('[ ,]+')
-            table.sort(entry.tags)
+            entry.tags = {}
+            for _,tag in ipairs(tags:split('[ ,]+')) do
+                entry.tags[tag] = true
+            end
             tags_found = true
         elseif not short_help_found and not line:find('^Keybinding:') and
                 line:find('%w') then
@@ -260,11 +261,11 @@ local function initialize_tags()
 end
 
 -- ensures the db is up to date by scanning all help sources. does not do
--- anything if it has already been run within the last second.
+-- anything if it has already been run within the last 10 seconds.
 last_refresh_ms = last_refresh_ms or 0
 local function ensure_db()
     local now_ms = dfhack.getTickCount()
-    if now_ms - last_refresh_ms < 1000 then return end
+    if now_ms - last_refresh_ms < 60000 then return end
     last_refresh_ms = now_ms
 
     local old_db = db
@@ -293,9 +294,18 @@ function get_entry_long_help(entry)
     return get_db_property(entry, 'long_help')
 end
 
--- returns the list of tags associated with the entry
+local function set_to_sorted_list(set)
+    local list = {}
+    for item in pairs(set) do
+        table.insert(list, item)
+    end
+    table.sort(list)
+    return list
+end
+
+-- returns the list of tags associated with the entry, in alphabetical order
 function get_entry_tags(entry)
-    return get_db_property(entry, 'tags')
+    return set_to_sorted_list(get_db_property(entry, 'tags'))
 end
 
 local function chunk_for_sorting(str)
@@ -326,76 +336,109 @@ local function sort_by_basename(a, b)
     return false
 end
 
-local function add_if_matched(commands, command, strs, runnable)
-    if runnable and db[command].unrunnable then
-        return
+local function matches(command, filter)
+    local db_entry = db[command]
+    if filter.runnable and db_entry.unrunnable then
+        return false
+    end
+    if filter.tag then
+        local matched = false
+        for _,tag in ipairs(filter.tag) do
+            if db_entry.tags[tag] then
+                matched = true
+                break
+            end
+        end
+        if not matched then
+            return false
+        end
     end
-    if strs then
+    if filter.str then
         local matched = false
-        for _,str in ipairs(strs) do
+        for _,str in ipairs(filter.str) do
             if command:find(str, 1, true) then
                 matched = true
                 break
             end
         end
         if not matched then
-            return
+            return false
         end
     end
-    table.insert(commands, command)
+    return true
+end
+
+local function normalize_string_list(l)
+    if not l then return nil end
+    if type(l) == 'string' then
+        return {l}
+    end
+    return l
+end
+
+local function normalize_filter(f)
+    if not f then return nil end
+    local filter = {}
+    filter.str = normalize_string_list(f.str)
+    filter.tag = normalize_string_list(f.tag)
+    filter.runnable = f.runnable
+    if not filter.str and not filter.tag and not filter.runnable then
+        return nil
+    end
+    return filter
 end
 
 -- returns a list of identifiers, alphabetized by their last path component
 -- (e.g. gui/autobutcher will immediately follow autobutcher).
--- the optional filter element is a map with the following elements:
+-- the optional include and exclude filter params are maps with the following
+-- elements:
 --   str - if a string, filters by the given substring. if a table of strings,
 --         includes commands that match any of the given substrings.
 --   tag - if a string, filters by the given tag name. if a table of strings,
 --         includes commands that match any of the given tags.
---   runnable - if true, filters out plugin names that do no correspond to
---              runnable commands.
-function list_entries(filter)
+--   runnable - if true, matches only runnable commands, not plugin names.
+function get_entries(include, exclude)
     ensure_db()
-    filter = filter or {}
+    include = normalize_filter(include)
+    exclude = normalize_filter(exclude)
     local commands = {}
-    local strs = filter.str
-    if filter.str then
-        if type(strs) == 'string' then strs = {strs} end
-    end
-    local runnable = filter.runnable
-    if not filter.tag then
-        for command in pairs(db) do
-            add_if_matched(commands, command, strs, runnable)
-        end
-    else
-        local command_set = {}
-        local tags = filter.tag
-        if type(tags) == 'string' then tags = {tags} end
-        for _,tag in ipairs(tags) do
-            if not tag_index[tag] then
-                error('invalid tag: ' .. tag)
-            end
-            for _,command in ipairs(tag_index[tag]) do
-                command_set[command] = true
-            end
-        end
-        for command in pairs(command_set) do
-            add_if_matched(commands, command, strs, runnable)
+    for command in pairs(db) do
+        if (not include or matches(command, include)) and
+                (not exclude or not matches(command, exclude)) then
+            table.insert(commands, command)
         end
     end
     table.sort(commands, sort_by_basename)
     return commands
 end
 
+local function get_max_width(list, min_width)
+    local width = min_width or 0
+    for _,item in ipairs(list) do
+        width = math.max(width, #item)
+    end
+    return width
+end
+
+-- prints the requested entries to the console. include and exclude filters are
+-- as in get_entries above.
+function list_entries(include_tags, include, exclude)
+    local entries = get_entries(include, exclude)
+    local width = get_max_width(entries, 10)
+    for _,entry in ipairs(entries) do
+        print(('  %-'..width..'s %s'):format(
+                entry, get_entry_short_help(entry)))
+        if include_tags then
+            print(('  '..(' '):rep(width)..' tags(%s)'):format(
+                    table.concat(get_entry_tags(entry), ',')))
+        end
+    end
+end
+
 -- returns the defined tags in alphabetical order
-function list_tags()
+function get_tags()
     ensure_db()
-    local tags = {}
-    for tag in pairs(tag_index) do
-        table.insert(tags, tag)
-    end
-    table.sort(tags)
-    return tags
+    return set_to_sorted_list(tag_index)
 end
 
 -- returns the description associated with the given tag
@@ -407,4 +450,13 @@ function get_tag_description(tag)
     return tag_index[tag].description
 end
 
+-- prints the defined tags and their descriptions to the console
+function list_tags()
+    local tags = get_tags()
+    local width = get_max_width(tags, 10)
+    for _,tag in ipairs(tags) do
+        print(('  %-'..width..'s %s'):format(tag, get_tag_description(tag)))
+    end
+end
+
 return _ENV

From 4ad8e7199a691f900cac1824d0f746924eb748c4 Mon Sep 17 00:00:00 2001
From: Myk <myk002@yahoo.com>
Date: Fri, 8 Jul 2022 14:43:41 -0700
Subject: [PATCH 182/854] Support builtin commands in helpdb (#2241)

* support builtin commands in helpdb, implement list API, document api
---
 docs/Builtin.rst       | 269 +++++++++++++++++++++++++++
 docs/Core.rst          | 264 +--------------------------
 index.rst              |   1 +
 library/lua/helpdb.lua | 405 ++++++++++++++++++++++++++++-------------
 4 files changed, 559 insertions(+), 380 deletions(-)
 create mode 100644 docs/Builtin.rst

diff --git a/docs/Builtin.rst b/docs/Builtin.rst
new file mode 100644
index 000000000..2d938e30f
--- /dev/null
+++ b/docs/Builtin.rst
@@ -0,0 +1,269 @@
+.. _built-in-commands:
+
+Built-in Commands
+=================
+The following commands are provided by the 'core' components of DFHack, rather
+than plugins or scripts.
+
+.. contents::
+   :local:
+
+.. _alias:
+
+alias
+-----
+The ``alias`` command allows configuring aliases to other DFHack commands.
+Aliases are resolved immediately after built-in commands, which means that an
+alias cannot override a built-in command, but can override a command implemented
+by a plugin or script.
+
+Usage:
+
+:``alias list``: lists all configured aliases
+:``alias add <name> <command> [arguments...]``: adds an alias
+:``alias replace <name> <command> [arguments...]``: replaces an existing
+    alias with a new command, or adds the alias if it does not already exist
+:``alias delete <name>``: removes the specified alias
+
+Aliases can be given additional arguments when created and invoked, which will
+be passed to the underlying command in order. An example with
+`devel/print-args`::
+
+    [DFHack]# alias add pargs devel/print-args example
+    [DFHack]# pargs text
+    example
+    text
+
+
+.. _cls:
+
+cls
+---
+Clear the terminal. Does not delete command history.
+
+
+.. _die:
+
+die
+---
+Instantly kills DF without saving.
+
+
+.. _disable:
+.. _enable:
+
+enable
+------
+Many plugins and scripts can be in a distinct enabled or disabled state. Some of
+them activate and deactivate automatically depending on the contents of the
+world raws. Others store their state in world data. However a number of them
+have to be enabled globally, and the init file is the right place to do it.
+
+Most such plugins or scripts support the built-in ``enable`` and ``disable``
+commands. Calling them at any time without arguments prints a list of enabled
+and disabled plugins, and shows whether that can be changed through the same
+commands. Passing plugin names to these commands will enable or disable the
+specified plugins. For example, to enable the `manipulator` plugin::
+
+  enable manipulator
+
+It is also possible to enable or disable multiple plugins at once::
+
+  enable manipulator search
+
+
+.. _fpause:
+
+fpause
+------
+Forces DF to pause. This is useful when your FPS drops below 1 and you lose
+control of the game.
+
+
+.. _help:
+
+help
+----
+Most commands support using the ``help <command>`` built-in command to retrieve
+further help without having to look online. ``? <cmd>`` and ``man <cmd>`` are
+aliases.
+
+Some commands (including many scripts) instead take ``help`` or ``?`` as an
+option on their command line - ie ``<cmd> help``.
+
+
+.. _hide:
+
+hide
+----
+Hides the DFHack terminal window. Only available on Windows.
+
+
+.. _keybinding:
+
+keybinding
+----------
+To set keybindings, use the built-in ``keybinding`` command. Like any other
+command it can be used at any time from the console, but bindings are not
+remembered between runs of the game unless re-created in `dfhack.init`.
+
+Currently, any combinations of Ctrl/Alt/Shift with A-Z, 0-9, or F1-F12 are
+supported.
+
+Possible ways to call the command:
+
+``keybinding list <key>``
+  List bindings active for the key combination.
+``keybinding clear <key> <key>...``
+  Remove bindings for the specified keys.
+``keybinding add <key> "cmdline" "cmdline"...``
+  Add bindings for the specified key.
+``keybinding set <key> "cmdline" "cmdline"...``
+  Clear, and then add bindings for the specified key.
+
+The ``<key>`` parameter above has the following *case-sensitive* syntax::
+
+    [Ctrl-][Alt-][Shift-]KEY[@context[|context...]]
+
+where the *KEY* part can be any recognized key and [] denote optional parts.
+
+When multiple commands are bound to the same key combination, DFHack selects
+the first applicable one. Later ``add`` commands, and earlier entries within one
+``add`` command have priority. Commands that are not specifically intended for
+use as a hotkey are always considered applicable.
+
+The ``context`` part in the key specifier above can be used to explicitly
+restrict the UI state where the binding would be applicable. If called without
+parameters, the ``keybinding`` command among other things prints the current
+context string.
+
+Only bindings with a ``context`` tag that either matches the current context
+fully, or is a prefix ending at a ``/`` boundary would be considered for
+execution, i.e. when in context ``foo/bar/baz``, keybindings restricted to any
+of ``@foo/bar/baz``, ``@foo/bar``, ``@foo`` or none will be active.
+
+Multiple contexts can be specified by separating them with a pipe (``|``) - for
+example, ``@foo|bar|baz/foo`` would match anything under ``@foo``, ``@bar``, or
+``@baz/foo``.
+
+Interactive commands like `liquids` cannot be used as hotkeys.
+
+
+.. _kill-lua:
+
+kill-lua
+--------
+Stops any currently-running Lua scripts. By default, scripts can only be
+interrupted every 256 instructions. Use ``kill-lua force`` to interrupt the next
+instruction.
+
+
+.. _load:
+.. _unload:
+.. _reload:
+
+load
+----
+``load``, ``unload``, and ``reload`` control whether a plugin is loaded into
+memory - note that plugins are loaded but disabled unless you explicitly enable
+them. Usage::
+
+    load|unload|reload PLUGIN|(-a|--all)
+
+Allows dealing with plugins individually by name, or all at once.
+
+Note that plugins do not maintain their enabled state if they are reloaded, so
+you may need to use `enable` to re-enable a plugin after reloading it.
+
+
+.. _ls:
+.. _dir:
+
+ls
+--
+``ls`` (or ``dir``) does not list files like the Unix command, but rather
+available commands. In order to group related commands, each command is
+associated with a list of tags. You can filter the listed commands by a
+tag or a substring of the command name. Usage:
+
+:``ls``: Lists all available commands and the tags associated with them
+    (if any).
+:``ls TAG``: Shows only commands that have the given tag. Use the `tags` command
+    to see the list of available tags.
+:``ls STRING``: Shows commands that include the given string. E.g. ``ls auto``
+    will show all the commands with "auto" in their names. If the string is also
+    the name of a tag, then it will be interpreted as a tag name.
+
+You can also pass some optional parameters to change how ``ls`` behaves:
+
+:``--notags``: Don't print out the tags associated with each command.
+:``--dev``: Include commands intended for developers and modders.
+
+
+.. _plug:
+
+plug
+----
+Lists available plugins and whether they are enabled.
+
+``plug``
+        Lists available plugins (*not* commands implemented by plugins)
+``plug [PLUGIN] [PLUGIN] ...``
+        List state and detailed description of the given plugins,
+        including commands implemented by the plugin.
+
+
+.. _sc-script:
+
+sc-script
+---------
+Allows additional scripts to be run when certain events occur (similar to
+onLoad\*.init scripts)
+
+
+.. _script:
+
+script
+------
+Reads a text file, and runs each line as a DFHack command as if it had been
+typed in by the user - treating the input like `an init file <init-files>`.
+
+Some other tools, such as `autobutcher` and `workflow`, export their settings as
+the commands to create them - which can later be reloaded with ``script``.
+
+
+.. _show:
+
+show
+----
+Shows the terminal window after it has been `hidden <hide>`. Only available on
+Windows. You'll need to use it from a `keybinding` set beforehand, or the
+in-game `command-prompt`.
+
+
+.. _tags:
+
+tags
+----
+
+List the strings that the DFHack tools can be tagged with. You can find groups
+of related tools by passing the tag name to `ls`.
+
+.. _type:
+
+type
+----
+``type command`` shows where ``command`` is implemented.
+
+Other Commands
+--------------
+The following commands are *not* built-in, but offer similarly useful functions.
+
+* `command-prompt`
+* `hotkeys`
+* `lua`
+* `multicmd`
+* `nopause`
+* `quicksave`
+* `rb`
+* `repeat`
diff --git a/docs/Core.rst b/docs/Core.rst
index fe881a54d..ffa620f55 100644
--- a/docs/Core.rst
+++ b/docs/Core.rst
@@ -11,22 +11,23 @@ DFHack Core
 
 Command Implementation
 ======================
-DFHack commands can be implemented in three ways, all of which
-are used in the same way:
+DFHack commands can be implemented in any of three ways:
 
 :builtin:   commands are implemented by the core of DFHack. They manage
             other DFHack tools, interpret commands, and control basic
-            aspects of DF (force pause or quit).
+            aspects of DF (force pause or quit). They are documented
+            `here <built-in-commands>`.
 
 :plugins:   are stored in ``hack/plugins/`` and must be compiled with the
             same version of DFHack.  They are less flexible than scripts,
             but used for complex or ongoing tasks because they run faster.
+            Plugins included with DFHack are documented `here <plugins-index>`.
 
 :scripts:   are Ruby or Lua scripts stored in ``hack/scripts/``.
             Because they don't need to be compiled, scripts are
             more flexible about versions, and easier to distribute.
-            Most third-party DFHack addons are scripts.
-
+            Most third-party DFHack addons are scripts. All scripts included
+            with DFHack are documented `here <scripts-index>`.
 
 Using DFHack Commands
 =====================
@@ -113,259 +114,6 @@ second (Windows) example uses `kill-lua` to stop a Lua script.
   you have multiple copies of DF running simultaneously. To assign a different
   port, see `remote-server-config`.
 
-
-Built-in Commands
-=================
-The following commands are provided by the 'core' components
-of DFHack, rather than plugins or scripts.
-
-.. contents::
-   :local:
-
-
-.. _alias:
-
-alias
------
-The ``alias`` command allows configuring aliases to other DFHack commands.
-Aliases are resolved immediately after built-in commands, which means that an
-alias cannot override a built-in command, but can override a command implemented
-by a plugin or script.
-
-Usage:
-
-:``alias list``: lists all configured aliases
-:``alias add <name> <command> [arguments...]``: adds an alias
-:``alias replace <name> <command> [arguments...]``: replaces an existing
-    alias with a new command, or adds the alias if it does not already exist
-:``alias delete <name>``: removes the specified alias
-
-Aliases can be given additional arguments when created and invoked, which will
-be passed to the underlying command in order. An example with `devel/print-args`::
-
-    [DFHack]# alias add pargs devel/print-args example
-    [DFHack]# pargs text
-    example
-    text
-
-
-.. _cls:
-
-cls
----
-Clear the terminal.  Does not delete command history.
-
-
-.. _die:
-
-die
----
-Instantly kills DF without saving.
-
-
-.. _disable:
-
-.. _enable:
-
-enable
-------
-Many plugins can be in a distinct enabled or disabled state. Some of
-them activate and deactivate automatically depending on the contents
-of the world raws. Others store their state in world data. However a
-number of them have to be enabled globally, and the init file is the
-right place to do it.
-
-Most such plugins or scripts support the built-in ``enable`` and ``disable``
-commands. Calling them at any time without arguments prints a list
-of enabled and disabled plugins, and shows whether that can be changed
-through the same commands. Passing plugin names to these commands will enable
-or disable the specified plugins. For example, to enable the `manipulator`
-plugin::
-
-  enable manipulator
-
-It is also possible to enable or disable multiple plugins at once::
-
-  enable manipulator search
-
-
-.. _fpause:
-
-fpause
-------
-Forces DF to pause. This is useful when your FPS drops below 1 and you lose
-control of the game.
-
-
-.. _help:
-
-help
-----
-Most commands support using the ``help <command>`` built-in command
-to retrieve further help without having to look at this document.
-``? <cmd>`` and ``man <cmd>`` are aliases.
-
-Some commands (including many scripts) instead take ``help`` or ``?``
-as an option on their command line - ie ``<cmd> help``.
-
-
-.. _hide:
-
-hide
-----
-Hides the DFHack terminal window.  Only available on Windows.
-
-
-.. _keybinding:
-
-keybinding
-----------
-To set keybindings, use the built-in ``keybinding`` command. Like any other
-command it can be used at any time from the console, but bindings are not
-remembered between runs of the game unless re-created in `dfhack.init`.
-
-Currently, any combinations of Ctrl/Alt/Shift with A-Z, 0-9, or F1-F12 are supported.
-
-Possible ways to call the command:
-
-``keybinding list <key>``
-  List bindings active for the key combination.
-``keybinding clear <key> <key>...``
-  Remove bindings for the specified keys.
-``keybinding add <key> "cmdline" "cmdline"...``
-  Add bindings for the specified key.
-``keybinding set <key> "cmdline" "cmdline"...``
-  Clear, and then add bindings for the specified key.
-
-The ``<key>`` parameter above has the following *case-sensitive* syntax::
-
-    [Ctrl-][Alt-][Shift-]KEY[@context[|context...]]
-
-where the *KEY* part can be any recognized key and [] denote optional parts.
-
-When multiple commands are bound to the same key combination, DFHack selects
-the first applicable one. Later ``add`` commands, and earlier entries within one
-``add`` command have priority. Commands that are not specifically intended for use
-as a hotkey are always considered applicable.
-
-The ``context`` part in the key specifier above can be used to explicitly restrict
-the UI state where the binding would be applicable. If called without parameters,
-the ``keybinding`` command among other things prints the current context string.
-
-Only bindings with a ``context`` tag that either matches the current context fully,
-or is a prefix ending at a ``/`` boundary would be considered for execution, i.e.
-when in context ``foo/bar/baz``, keybindings restricted to any of ``@foo/bar/baz``,
-``@foo/bar``, ``@foo`` or none will be active.
-
-Multiple contexts can be specified by separating them with a
-pipe (``|``) - for example, ``@foo|bar|baz/foo`` would match
-anything under ``@foo``, ``@bar``, or ``@baz/foo``.
-
-Interactive commands like `liquids` cannot be used as hotkeys.
-
-
-.. _kill-lua:
-
-kill-lua
---------
-Stops any currently-running Lua scripts. By default, scripts can
-only be interrupted every 256 instructions. Use ``kill-lua force``
-to interrupt the next instruction.
-
-
-.. _load:
-.. _unload:
-.. _reload:
-
-load
-----
-``load``, ``unload``, and ``reload`` control whether a plugin is loaded
-into memory - note that plugins are loaded but disabled unless you do
-something.  Usage::
-
-    load|unload|reload PLUGIN|(-a|--all)
-
-Allows dealing with plugins individually by name, or all at once.
-
-Note that plugins do not maintain their enabled state if they are reloaded, so
-you may need to use `enable` to re-enable a plugin after reloading it.
-
-
-.. _ls:
-
-ls
---
-``ls`` does not list files like the Unix command, but rather
-available commands - first built in commands, then plugins,
-and scripts at the end.  Usage:
-
-:ls -a:         Also list scripts in subdirectories of ``hack/scripts/``,
-                which are generally not intended for direct use.
-:ls <plugin>:   List subcommands for the given plugin.
-
-
-.. _plug:
-
-plug
-----
-Lists available plugins, including their state and detailed description.
-
-``plug``
-        Lists available plugins (*not* commands implemented by plugins)
-``plug [PLUGIN] [PLUGIN] ...``
-        List state and detailed description of the given plugins,
-        including commands implemented by the plugin.
-
-
-.. _sc-script:
-
-sc-script
----------
-Allows additional scripts to be run when certain events occur
-(similar to onLoad*.init scripts)
-
-
-.. _script:
-
-script
-------
-Reads a text file, and runs each line as a DFHack command
-as if it had been typed in by the user - treating the
-input like `an init file <init-files>`.
-
-Some other tools, such as `autobutcher` and `workflow`, export
-their settings as the commands to create them - which are later
-loaded with ``script``
-
-
-.. _show:
-
-show
-----
-Shows the terminal window after it has been `hidden <hide>`.
-Only available on Windows.  You'll need to use it from a
-`keybinding` set beforehand, or the in-game `command-prompt`.
-
-.. _type:
-
-type
-----
-``type command`` shows where ``command`` is implemented.
-
-Other Commands
---------------
-The following commands are *not* built-in, but offer similarly useful functions.
-
-* `command-prompt`
-* `hotkeys`
-* `lua`
-* `multicmd`
-* `nopause`
-* `quicksave`
-* `rb`
-* `repeat`
-
-
 .. _dfhack-config:
 
 Configuration Files
diff --git a/index.rst b/index.rst
index 3e761bbc6..3b46699a7 100644
--- a/index.rst
+++ b/index.rst
@@ -30,6 +30,7 @@ User Manual
    /docs/Installing
    /docs/Support
    /docs/Core
+   /docs/Builtin
    /docs/Plugins
    /docs/Scripts
    /docs/Tags
diff --git a/library/lua/helpdb.lua b/library/lua/helpdb.lua
index 8a27abad8..2999ee67e 100644
--- a/library/lua/helpdb.lua
+++ b/library/lua/helpdb.lua
@@ -1,80 +1,122 @@
--- The help text database.
+-- The help text database and query interface.
 --
--- Command help is read from the the following sources:
--- 1. rendered text in hack/docs/docs/
--- 2. (for scripts) the script sources if no pre-rendered text exists or if the
---    script file has a modification time that is more recent than the
---    pre-rendered text
--- 3. (for plugins) the string passed to the PluginCommand initializer if no
---    pre-rendered text exists
+-- Help text is read from the rendered text in hack/docs/docs/. If no rendered
+-- text exists, it is read from the script sources (for scripts) or the string
+-- passed to the PluginCommand initializer (for plugins).
 --
--- For plugins that don't register any commands, the plugin name serves as the
--- command so documentation on what happens when you enable the plugin can be
--- found.
+-- For plugins that don't register a command with the same name as the plugin,
+-- the plugin name is registered as a separate entry so documentation on what
+-- happens when you enable the plugin can be found.
+--
+-- The database is lazy-loaded when an API method is called. It rechecks its
+-- help sources for updates if an API method has not been called in the last
+-- 60 seconds.
 
 local _ENV = mkmodule('helpdb')
 
+-- paths
 local RENDERED_PATH = 'hack/docs/docs/tools/'
+local BUILTIN_HELP = 'hack/docs/docs/Builtin.txt'
 local TAG_DEFINITIONS = 'hack/docs/docs/Tags.txt'
 
+-- used when reading help text embedded in script sources
 local SCRIPT_DOC_BEGIN = '[====['
 local SCRIPT_DOC_END = ']====]'
+local SCRIPT_DOC_BEGIN_RUBY = '=begin'
+local SCRIPT_DOC_END_RUBY = '=end'
+
+local ENTRY_TYPES = {
+    BUILTIN='builtin',
+    PLUGIN='plugin',
+    COMMAND='command'
+}
 
-local SOURCES = {
+local HELP_SOURCES = {
     STUB='stub',
     RENDERED='rendered',
     PLUGIN='plugin',
     SCRIPT='script',
 }
 
--- command name -> {short_help, long_help, tags, source, source_timestamp}
--- also includes a script_source_path element if the source is a script
--- and a unrunnable boolean if the source is a plugin that does not provide any
--- commands to invoke directly.
+-- entry name -> {
+--   entry_types (set of ENTRY_TYPES),
+--   short_help (string),
+--   long_help (string),
+--   tags (set),
+--   help_source (element of HELP_SOURCES),
+--   source_timestamp (mtime, 0 for non-files),
+--   source_path (string, nil for non-files)
+-- }
+--
+-- entry_types is a set because plugin commands can also be the plugin names.
 db = db or {}
 
--- tag name -> list of command names
+-- tag name -> list of entry names
+-- Tags defined in the TAG_DEFINITIONS file that have no associated db entries
+-- will have an empty list.
 tag_index = tag_index or {}
 
-local function get_rendered_path(command)
-    return RENDERED_PATH .. command .. '.txt'
+local function get_rendered_path(entry_name)
+    return RENDERED_PATH .. entry_name .. '.txt'
 end
 
-local function has_rendered_help(command)
-    return dfhack.filesystem.mtime(get_rendered_path(command)) ~= -1
+local function has_rendered_help(entry_name)
+    return dfhack.filesystem.mtime(get_rendered_path(entry_name)) ~= -1
 end
 
 local DEFAULT_HELP_TEMPLATE = [[
 %s
 %s
 
-Tags: None
-
 No help available.
 ]]
-
-local function make_default_entry(command, source)
+local function make_default_entry(entry_name, entry_types, source,
+                                  source_timestamp, source_path)
     local default_long_help = DEFAULT_HELP_TEMPLATE:format(
-                                                command, ('*'):rep(#command))
-    return {short_help='No help available.', long_help=default_long_help,
-            tags={}, source=source, source_timestamp=0}
+                                            entry_name, ('*'):rep(#entry_name))
+    return {
+        entry_types=entry_types,
+        short_help='No help available.',
+        long_help=default_long_help,
+        tags={},
+        help_source=source,
+        source_timestamp=source_timestamp or 0,
+        source_path=source_path}
 end
 
--- updates the short_text, the long_text, and the tags in the given entry
+-- updates the short_text, the long_text, and the tags in the given entry based
+-- on the text returned from the iterator.
+-- if defined, opts can have the following fields:
+--   begin_marker (string that marks the beginning of the help text; all text
+--                 before this marker is ignored)
+--   end_marker (string that marks the end of the help text; text will stop
+--               being parsed after this marker is seen)
+--   no_header (don't try to find the entity name at the top of the help text)
+--   first_line_is_short_help (read the short help text from the first commented
+--                             line of the script instead of using the first
+--                             sentence of the long help text)
 local function update_entry(entry, iterator, opts)
     opts = opts or {}
     local lines = {}
+    local first_line_is_short_help = opts.first_line_is_short_help
     local begin_marker_found,header_found = not opts.begin_marker,opts.no_header
     local tags_found, short_help_found, in_short_help = false, false, false
     for line in iterator do
-        if not short_help_found and opts.first_line_is_short_help then
-            local _,_,text = line:trim():find('^%-%-%s*(.*)')
-            if not text:endswith('.') then
-                text = text .. '.'
+        if not short_help_found and first_line_is_short_help then
+            line = line:trim()
+            local _,_,text = line:find('^%-%-%s*(.*)') or line:find('^#%s*(.*)')
+            if not text then
+                -- if no first-line short help found, fall back to getting the
+                -- first sentence of the help text.
+                first_line_is_short_help = false
+            else
+                if not text:endswith('.') then
+                    text = text .. '.'
+                end
+                entry.short_help = text
+                short_help_found = true
+                goto continue
             end
-            entry.short_help = text
-            short_help_found = true
-            goto continue
         end
         if not begin_marker_found then
             local _, endpos = line:find(opts.begin_marker, 1, true)
@@ -119,80 +161,131 @@ local function update_entry(entry, iterator, opts)
     entry.long_help = table.concat(lines, '\n')
 end
 
-local function make_rendered_entry(old_entry, command)
-    local rendered_path = get_rendered_path(command)
+-- create db entry based on parsing sphinx-rendered help text
+local function make_rendered_entry(old_entry, entry_name, entry_types)
+    local rendered_path = get_rendered_path(entry_name)
     local source_timestamp = dfhack.filesystem.mtime(rendered_path)
-    if old_entry and old_entry.source == SOURCES.RENDERED and
+    if old_entry and old_entry.source == HELP_SOURCES.RENDERED and
             old_entry.source_timestamp >= source_timestamp then
         -- we already have the latest info
         return old_entry
     end
-    local entry = make_default_entry(command, SOURCES.RENDERED)
+    local entry = make_default_entry(entry_name, entry_types,
+                HELP_SOURCES.RENDERED, source_timestamp, rendered_path)
     update_entry(entry, io.lines(rendered_path))
-    entry.source_timestamp = source_timestamp
     return entry
 end
 
-local function make_plugin_entry(old_entry, command)
-    if old_entry and old_entry.source == SOURCES.PLUGIN then
+-- create db entry based on the help text in the plugin source (used by
+-- out-of-tree plugins)
+local function make_plugin_entry(old_entry, entry_name, entry_types)
+    if old_entry and old_entry.source == HELP_SOURCES.PLUGIN then
         -- we can't tell when a plugin is reloaded, so we can either choose to
         -- always refresh or never refresh. let's go with never for now for
         -- performance.
         return old_entry
     end
-    local entry = make_default_entry(command, SOURCES.PLUGIN)
-    local long_help = dfhack.internal.getCommandHelp(command)
+    local entry = make_default_entry(entry_name, entry_types,
+                                     HELP_SOURCES.PLUGIN)
+    local long_help = dfhack.internal.getCommandHelp(entry_name)
     if long_help and #long_help:trim() > 0 then
         update_entry(entry, long_help:trim():gmatch('[^\n]*'), {no_header=true})
     end
     return entry
 end
 
-local function make_script_entry(old_entry, command, script_source_path)
+-- create db entry based on the help text in the script source (used by
+-- out-of-tree scripts)
+local function make_script_entry(old_entry, entry_name, script_source_path)
     local source_timestamp = dfhack.filesystem.mtime(script_source_path)
-    if old_entry and old_entry.source == SOURCES.SCRIPT and
+    if old_entry and old_entry.source == HELP_SOURCES.SCRIPT and
             old_entry.script_source_path == script_source_path and
             old_entry.source_timestamp >= source_timestamp then
         -- we already have the latest info
         return old_entry
     end
-    local entry = make_default_entry(command, SOURCES.SCRIPT)
+    local entry = make_default_entry(entry_name, {[ENTRY_TYPES.COMMAND]=true},
+                    HELP_SOURCES.SCRIPT, source_timestamp, script_source_path)
+    local is_rb = script_source_path:endswith('.rb')
     update_entry(entry, io.lines(script_source_path),
-                 {begin_marker=SCRIPT_DOC_BEGIN, end_marker=SCRIPT_DOC_END,
-                  first_line_is_short_help=true})
-    entry.source_timestamp = source_timestamp
+            {begin_marker=(is_rb and SCRIPT_DOC_BEGIN_RUBY or SCRIPT_DOC_BEGIN),
+             end_marker=(is_rb and SCRIPT_DOC_BEGIN_RUBY or SCRIPT_DOC_END),
+             first_line_is_short_help=true})
     return entry
 end
 
-local function update_db(old_db, db, source, command, flags)
-    if db[command] then
+-- updates the db (and associated tag index) with a new entry if the entry_name
+-- doesn't already exist in the db.
+local function update_db(old_db, db, source, entry_name, kwargs)
+    if db[entry_name] then
         -- already in db (e.g. from a higher-priority script dir); skip
         return
     end
-    local entry, old_entry = nil, old_db[command]
-    if source == SOURCES.RENDERED then
-        entry = make_rendered_entry(old_entry, command)
-    elseif source == SOURCES.PLUGIN then
-        entry = make_plugin_entry(old_entry, command)
-    elseif source == SOURCES.SCRIPT then
-        entry = make_script_entry(old_entry, command, flags.script_source)
-    elseif source == SOURCES.STUB then
-        entry = make_default_entry(command, SOURCES.STUB)
+    local entry, old_entry = nil, old_db[entry_name]
+    if source == HELP_SOURCES.RENDERED then
+        entry = make_rendered_entry(old_entry, entry_name, kwargs.entry_types)
+    elseif source == HELP_SOURCES.PLUGIN then
+        entry = make_plugin_entry(old_entry, entry_name, kwargs.entry_types)
+    elseif source == HELP_SOURCES.SCRIPT then
+        entry = make_script_entry(old_entry, entry_name, kwargs.script_source)
+    elseif source == HELP_SOURCES.STUB then
+        entry = make_default_entry(entry_name, kwargs.entry_types,
+                                   HELP_SOURCES.STUB)
     else
         error('unhandled help source: ' .. source)
     end
-
-    entry.unrunnable = (flags or {}).unrunnable
-
-    db[command] = entry
+    db[entry_name] = entry
     for _,tag in ipairs(entry.tags) do
-        -- unknown tags are ignored
+        -- ignore unknown tags
         if tag_index[tag] then
-            table.insert(tag_index[tag], command)
+            table.insert(tag_index[tag], entry_name)
         end
     end
 end
 
+local BUILTINS = {
+    alias='Configure helper aliases for other DFHack commands.',
+    cls='Clear the console screen.',
+    clear='Clear the console screen.',
+    die='Force DF to close immediately, without saving.',
+    enable='Enable a plugin or persistent script.',
+    disable='Disable a plugin or persistent script.',
+    fpause='Force DF to pause.',
+    help='Usage help for the given plugin, command, or script.',
+    hide='Hide the terminal window (Windows only).',
+    keybinding='Modify bindings of commands to in-game key shortcuts.',
+    ['kill-lua']='Stop a misbehaving Lua script.',
+    ['load']='Load and register a plugin library.',
+    unload='Unregister and unload a plugin.',
+    reload='Unload and reload a plugin library.',
+    ls='List commands, optionally filtered by a tag or substring.',
+    dir='List commands, optionally filtered by a tag or substring.',
+    plug='List plugins and whether they are enabled.',
+    ['sc-script']='Automatically run specified scripts on state change events.',
+    script='Run commands specified in a file.',
+    show='Show a hidden terminal window (Windows only).',
+    tags='List the tags that the DFHack tools are grouped by.',
+    ['type']='Discover how a command is implemented.',
+}
+
+-- add the builtin commands to the db
+local function scan_builtins(old_db, db)
+    local entry = make_default_entry('builtin',
+                {[ENTRY_TYPES.BUILTIN]=true, [ENTRY_TYPES.COMMAND]=true},
+                HELP_SOURCES.RENDERED, 0, BUILTIN_HELP)
+    -- read in builtin help
+    local f = io.open(BUILTIN_HELP)
+    if f then
+        entry.long_help = f:read('*all')
+    end
+    for b,short_help in pairs(BUILTINS) do
+        local builtin_entry = copyall(entry)
+        builtin_entry.short_help = short_help
+        db[b] = builtin_entry
+    end
+end
+
+-- scan for plugins and plugin-provided commands and add their help to the db
 local function scan_plugins(old_db, db)
     local plugin_names = dfhack.internal.listPlugins()
     for _,plugin in ipairs(plugin_names) do
@@ -202,36 +295,41 @@ local function scan_plugins(old_db, db)
             -- documentation to
             update_db(old_db, db,
                       has_rendered_help(plugin) and
-                            SOURCES.RENDERED or SOURCES.STUB,
-                      plugin, {unrunnable=true})
+                            HELP_SOURCES.RENDERED or HELP_SOURCES.STUB,
+                      plugin, {entry_types={[ENTRY_TYPES.PLUGIN]=true}})
             goto continue
         end
         for _,command in ipairs(commands) do
+            local entry_types = {[ENTRY_TYPES.COMMAND]=true}
+            if command == plugin then
+                entry_types[ENTRY_TYPES.PLUGIN]=true
+            end
             update_db(old_db, db,
                       has_rendered_help(command) and
-                            SOURCES.RENDERED or SOURCES.PLUGIN,
-                      command)
+                            HELP_SOURCES.RENDERED or HELP_SOURCES.PLUGIN,
+                      command, {entry_types=entry_types})
         end
         ::continue::
     end
 end
 
+-- scan for scripts and add their help to the db
 local function scan_scripts(old_db, db)
     for _,script_path in ipairs(dfhack.internal.getScriptPaths()) do
         local files = dfhack.filesystem.listdir_recursive(
                                             script_path, nil, false)
         if not files then goto skip_path end
         for _,f in ipairs(files) do
-            if f.isdir or not f.path:endswith('.lua') or
+            if f.isdir or
+                (not f.path:endswith('.lua') and not f.path:endswith('.rb')) or
                     f.path:startswith('test/') or
                     f.path:startswith('internal/') then
                 goto continue
             end
             local script_source = script_path .. '/' .. f.path
-            local script_is_newer = dfhack.filesystem.mtime(script_source) >
-                    dfhack.filesystem.mtime(get_rendered_path(f.path))
             update_db(old_db, db,
-                      script_is_newer and SOURCES.SCRIPT or SOURCES.RENDERED,
+                      has_rendered_help(f.path) and
+                            HELP_SOURCES.RENDERED or HELP_SOURCES.SCRIPT,
                       f.path:sub(1, #f.path - 4), {script_source=script_source})
             ::continue::
         end
@@ -239,6 +337,8 @@ local function scan_scripts(old_db, db)
     end
 end
 
+-- read tags and descriptions from the TAG_DEFINITIONS file and add them all
+-- to tag_index, initizlizing each entry with an empty list.
 local function initialize_tags()
     local tag, desc, in_desc = nil, nil, false
     for line in io.lines(TAG_DEFINITIONS) do
@@ -261,7 +361,7 @@ local function initialize_tags()
 end
 
 -- ensures the db is up to date by scanning all help sources. does not do
--- anything if it has already been run within the last 10 seconds.
+-- anything if it has already been run within the last 60 seconds.
 last_refresh_ms = last_refresh_ms or 0
 local function ensure_db()
     local now_ms = dfhack.getTickCount()
@@ -272,16 +372,21 @@ local function ensure_db()
     db, tag_index = {}, {}
 
     initialize_tags()
+    scan_builtins(old_db, db)
     scan_plugins(old_db, db)
     scan_scripts(old_db, db)
 end
 
-local function get_db_property(command, property)
+---------------------------------------------------------------------------
+-- get API
+---------------------------------------------------------------------------
+
+local function get_db_property(entry_name, property)
     ensure_db()
-    if not db[command] then
-        error(('command not found: "%s"'):format(command))
+    if not db[entry_name] then
+        error(('entry not found: "%s"'):format(entry_name))
     end
-    return db[command][property]
+    return db[entry_name][property]
 end
 
 -- returns the ~54 char summary blurb associated with the entry
@@ -308,6 +413,32 @@ function get_entry_tags(entry)
     return set_to_sorted_list(get_db_property(entry, 'tags'))
 end
 
+-- returns whether the given string matches a tag name
+function is_tag(str)
+    ensure_db()
+    return not not tag_index[str]
+end
+
+-- returns the defined tags in alphabetical order
+function get_tags()
+    ensure_db()
+    return set_to_sorted_list(tag_index)
+end
+
+-- returns the description associated with the given tag
+function get_tag_description(tag)
+    ensure_db()
+    if not tag_index[tag] then
+        error('invalid tag: ' .. tag)
+    end
+    return tag_index[tag].description
+end
+
+---------------------------------------------------------------------------
+-- search API
+---------------------------------------------------------------------------
+
+-- returns a list of path elements in reverse order
 local function chunk_for_sorting(str)
     local parts = str:split('/')
     local chunks = {}
@@ -336,11 +467,8 @@ local function sort_by_basename(a, b)
     return false
 end
 
-local function matches(command, filter)
-    local db_entry = db[command]
-    if filter.runnable and db_entry.unrunnable then
-        return false
-    end
+local function matches(entry_name, filter)
+    local db_entry = db[entry_name]
     if filter.tag then
         local matched = false
         for _,tag in ipairs(filter.tag) do
@@ -353,10 +481,22 @@ local function matches(command, filter)
             return false
         end
     end
+    if filter.types then
+        local matched = false
+        for _,etype in ipairs(filter.types) do
+            if db_entry.entry_types[etype] then
+                matched = true
+                break
+            end
+        end
+        if not matched then
+            return false
+        end
+    end
     if filter.str then
         local matched = false
         for _,str in ipairs(filter.str) do
-            if command:find(str, 1, true) then
+            if entry_name:find(str, 1, true) then
                 matched = true
                 break
             end
@@ -368,6 +508,7 @@ local function matches(command, filter)
     return true
 end
 
+-- converts strings into single-element lists containing that string
 local function normalize_string_list(l)
     if not l then return nil end
     if type(l) == 'string' then
@@ -376,28 +517,35 @@ local function normalize_string_list(l)
     return l
 end
 
+-- normalizes the lists in the filter and returns nil if no filter elements are
+-- populated
 local function normalize_filter(f)
     if not f then return nil end
     local filter = {}
     filter.str = normalize_string_list(f.str)
     filter.tag = normalize_string_list(f.tag)
-    filter.runnable = f.runnable
-    if not filter.str and not filter.tag and not filter.runnable then
+    filter.types = normalize_string_list(f.types)
+    if not filter.str and not filter.tag and not filter.types then
         return nil
     end
     return filter
 end
 
--- returns a list of identifiers, alphabetized by their last path component
--- (e.g. gui/autobutcher will immediately follow autobutcher).
+-- returns a list of entry names, alphabetized by their last path component,
+-- with populated path components coming before null path components (e.g.
+-- autobutcher will immediately follow gui/autobutcher).
 -- the optional include and exclude filter params are maps with the following
 -- elements:
 --   str - if a string, filters by the given substring. if a table of strings,
---         includes commands that match any of the given substrings.
+--         includes entry names that match any of the given substrings.
 --   tag - if a string, filters by the given tag name. if a table of strings,
---         includes commands that match any of the given tags.
---   runnable - if true, matches only runnable commands, not plugin names.
-function get_entries(include, exclude)
+--         includes entries that match any of the given tags.
+--   types - if a string, matches entries of the given type. if a table of
+--           strings, includes entries that match any of the given types. valid
+--           types are: "builtin", "plugin", "command". note that many plugin
+--           commands have the same name as the plugin, so those entries will
+--           match both "plugin" and "command" types.
+function search_entries(include, exclude)
     ensure_db()
     include = normalize_filter(include)
     exclude = normalize_filter(exclude)
@@ -412,6 +560,10 @@ function get_entries(include, exclude)
     return commands
 end
 
+---------------------------------------------------------------------------
+-- list API (outputs to console)
+---------------------------------------------------------------------------
+
 local function get_max_width(list, min_width)
     local width = min_width or 0
     for _,item in ipairs(list) do
@@ -420,43 +572,52 @@ local function get_max_width(list, min_width)
     return width
 end
 
+-- prints the defined tags and their descriptions to the console
+function list_tags()
+    local tags = get_tags()
+    local width = get_max_width(tags, 10)
+    for _,tag in ipairs(tags) do
+        print(('  %-'..width..'s %s'):format(tag, get_tag_description(tag)))
+    end
+end
+
 -- prints the requested entries to the console. include and exclude filters are
--- as in get_entries above.
-function list_entries(include_tags, include, exclude)
-    local entries = get_entries(include, exclude)
+-- defined as in search_entries() above.
+function list_entries(skip_tags, include, exclude)
+    local entries = search_entries(include, exclude)
     local width = get_max_width(entries, 10)
     for _,entry in ipairs(entries) do
-        print(('  %-'..width..'s %s'):format(
+        print(('  %-'..width..'s  %s'):format(
                 entry, get_entry_short_help(entry)))
-        if include_tags then
-            print(('  '..(' '):rep(width)..' tags(%s)'):format(
-                    table.concat(get_entry_tags(entry), ',')))
+        if not skip_tags then
+            local tags = get_entry_tags(entry)
+            if #tags > 0 then
+                print(('    tags: %s'):format(table.concat(tags, ', ')))
+            end
         end
     end
-end
-
--- returns the defined tags in alphabetical order
-function get_tags()
-    ensure_db()
-    return set_to_sorted_list(tag_index)
-end
-
--- returns the description associated with the given tag
-function get_tag_description(tag)
-    ensure_db()
-    if not tag_index[tag] then
-        error('invalid tag: ' .. tag)
+    if #entries == 0 then
+        print('no entries found.')
     end
-    return tag_index[tag].description
 end
 
--- prints the defined tags and their descriptions to the console
-function list_tags()
-    local tags = get_tags()
-    local width = get_max_width(tags, 10)
-    for _,tag in ipairs(tags) do
-        print(('  %-'..width..'s %s'):format(tag, get_tag_description(tag)))
+-- wraps the list_entries() API to provide a more convenient interface for Core
+-- to implement the 'ls' builtin command.
+--   filter_str - if a tag name, will filter by that tag. otherwise, will filter
+--                as a substring
+--   skip_tags - whether to skip printing tag info
+--   show_dev_commands - if true, will include scripts in the modtools/ and
+--                       devel/ directories. otherwise those scripts will be
+--                       excluded
+function ls(filter_str, skip_tags, show_dev_commands)
+    local include = {types={ENTRY_TYPES.COMMAND}}
+    if is_tag(filter_str) then
+        include.tag = filter_str
+    else
+        include.str = filter_str
     end
+    list_entries(skip_tags, include,
+                 show_dev_commands and {} or {str={'modtools/', 'devel/'}})
 end
 
 return _ENV

From e899510b8bc3374896ae79575cb840ecc210e195 Mon Sep 17 00:00:00 2001
From: Myk <myk002@yahoo.com>
Date: Fri, 8 Jul 2022 15:53:51 -0700
Subject: [PATCH 183/854] Use helpdb to implement help and ls built-in commands
 and dfhack.script_help() (#2242)

* use helpdb to implement the help and ls builtins

* use helpdb to implement dfhack.script_help()
---
 library/Core.cpp       | 234 +++++++++++++++--------------------------
 library/lua/dfhack.lua |  38 +------
 library/lua/helpdb.lua |  35 ++++--
 3 files changed, 117 insertions(+), 190 deletions(-)

diff --git a/library/Core.cpp b/library/Core.cpp
index aa43f3c2b..62fe366f1 100644
--- a/library/Core.cpp
+++ b/library/Core.cpp
@@ -446,6 +446,7 @@ command_result Core::runCommand(color_ostream &out, const std::string &command)
 static const std::set<std::string> built_in_commands = {
     "ls" ,
     "help" ,
+    "tags" ,
     "type" ,
     "load" ,
     "unload" ,
@@ -674,25 +675,71 @@ string getBuiltinCommand(std::string cmd)
     return builtin;
 }
 
-void ls_helper(color_ostream &con, const string &name, const string &desc)
-{
-    const size_t help_line_length = 80 - 22 - 5;
-    const string padding = string(80 - help_line_length, ' ');
-    vector<string> lines;
-    con.print("  %-22s - ", name.c_str());
-    word_wrap(&lines, desc, help_line_length);
+void help_helper(color_ostream &con, const string &entry_name) {
+    CoreSuspender suspend;
+    auto L = Lua::Core::State;
+    Lua::StackUnwinder top(L);
+
+    if (!lua_checkstack(L, 2) ||
+        !Lua::PushModulePublic(con, L, "helpdb", "help")) {
+        con.printerr("Failed to load helpdb Lua code\n");
+        return;
+    }
+
+    Lua::Push(L, entry_name);
 
-    // print first line, then any additional lines preceded by padding
-    for (size_t i = 0; i < lines.size(); i++)
-        con.print("%s%s\n", i ? padding.c_str() : "", lines[i].c_str());
+    if (!Lua::SafeCall(con, L, 1, 0)) {
+        con.printerr("Failed Lua call to helpdb.help.\n");
+    }
 }
 
-void ls_helper(color_ostream &con, const PluginCommand &pcmd)
-{
-    if (pcmd.isHotkeyCommand())
-        con.color(COLOR_CYAN);
-    ls_helper(con, pcmd.name, pcmd.description);
-    con.reset_color();
+void tags_helper(color_ostream &con) {
+    CoreSuspender suspend;
+    auto L = Lua::Core::State;
+    Lua::StackUnwinder top(L);
+
+    if (!lua_checkstack(L, 1) ||
+        !Lua::PushModulePublic(con, L, "helpdb", "tags")) {
+        con.printerr("Failed to load helpdb Lua code\n");
+        return;
+    }
+
+    if (!Lua::SafeCall(con, L, 0, 0)) {
+        con.printerr("Failed Lua call to helpdb.tags.\n");
+    }
+}
+
+void ls_helper(color_ostream &con, const vector<string> &params) {
+    vector<string> filter;
+    bool skip_tags = false;
+    bool show_dev_commands = false;
+
+    for (auto str : params) {
+        if (str == "--notags")
+            skip_tags = true;
+        else if (str == "--dev")
+            show_dev_commands = true;
+        else
+            filter.push_back(str);
+    }
+
+    CoreSuspender suspend;
+    auto L = Lua::Core::State;
+    Lua::StackUnwinder top(L);
+
+    if (!lua_checkstack(L, 4) ||
+        !Lua::PushModulePublic(con, L, "helpdb", "ls")) {
+        con.printerr("Failed to load helpdb Lua code\n");
+        return;
+    }
+
+    Lua::PushVector(L, filter);
+    Lua::Push(L, skip_tags);
+    Lua::Push(L, show_dev_commands);
+
+    if (!Lua::SafeCall(con, L, 3, 0)) {
+        con.printerr("Failed Lua call to helpdb.ls.\n");
+    }
 }
 
 command_result Core::runCommand(color_ostream &con, const std::string &first_, vector<string> &parts)
@@ -733,70 +780,33 @@ command_result Core::runCommand(color_ostream &con, const std::string &first_, v
                               "On Windows, you may have to resize your console window. The appropriate menu is accessible\n"
                               "by clicking on the program icon in the top bar of the window.\n\n");
                 }
-                con.print("Basic commands:\n"
-                          "  help|?|man            - This text.\n"
-                          "  help COMMAND          - Usage help for the given command.\n"
-                          "  ls|dir [-a] [PLUGIN]  - List available commands. Optionally for single plugin.\n"
-                          "  cls|clear             - Clear the console.\n"
-                          "  fpause                - Force DF to pause.\n"
-                          "  die                   - Force DF to close immediately\n"
-                          "  keybinding            - Modify bindings of commands to keys\n"
-                          "Plugin management (useful for developers):\n"
-                          "  plug [PLUGIN|v]       - List plugin state and description.\n"
-                          "  load PLUGIN|-all      - Load a plugin by name or load all possible plugins.\n"
-                          "  unload PLUGIN|-all    - Unload a plugin or all loaded plugins.\n"
-                          "  reload PLUGIN|-all    - Reload a plugin or all loaded plugins.\n"
+                con.print("Here are some basic commands to get you started:\n"
+                          "  help|?|man         - This text.\n"
+                          "  help <tool>        - Usage help for the given plugin, command, or script.\n"
+                          "  tags               - List the tags that the DFHack tools are grouped by.\n"
+                          "  ls|dir [<filter>]  - List commands, optionally filtered by a tag or substring.\n"
+                          "                       Optional parameters:\n"
+                          "                         --notags: skip printing tags for each command.\n"
+                          "                         --dev:  include commands intended for developers and modders.\n"
+                          "  cls|clear          - Clear the console.\n"
+                          "  fpause             - Force DF to pause.\n"
+                          "  die                - Force DF to close immediately, without saving.\n"
+                          "  keybinding         - Modify bindings of commands to in-game key shortcuts.\n"
+                          "\n"
+                          "See more commands by running 'ls'.\n\n"
                          );
 
-                con.print("\nDFHack version %s\n", dfhack_version_desc().c_str());
-            }
-            else if (parts.size() == 1)
-            {
-                if (getBuiltinCommand(parts[0]).size())
-                {
-                    con << parts[0] << ": built-in command; Use `ls`, `help`, or check hack/Readme.html for more information" << std::endl;
-                    return CR_NOT_IMPLEMENTED;
-                }
-                Plugin *plug = plug_mgr->getPluginByCommand(parts[0]);
-                if (plug) {
-                    for (size_t j = 0; j < plug->size();j++)
-                    {
-                        const PluginCommand & pcmd = (plug->operator[](j));
-                        if (pcmd.name != parts[0])
-                            continue;
-
-                        if (pcmd.isHotkeyCommand())
-                            con.color(COLOR_CYAN);
-                        con.print("%s: %s\n",pcmd.name.c_str(), pcmd.description.c_str());
-                        con.reset_color();
-                        if (!pcmd.usage.empty())
-                            con << "Usage:\n" << pcmd.usage << flush;
-                        return CR_OK;
-                    }
-                }
-                string file = findScript(parts[0] + ".lua");
-                if ( file != "" ) {
-                    string help = getScriptHelp(file, "--");
-                    con.print("%s: %s\n", parts[0].c_str(), help.c_str());
-                    return CR_OK;
-                }
-                if (plug_mgr->ruby && plug_mgr->ruby->is_enabled() ) {
-                    file = findScript(parts[0] + ".rb");
-                    if ( file != "" ) {
-                        string help = getScriptHelp(file, "#");
-                        con.print("%s: %s\n", parts[0].c_str(), help.c_str());
-                        return CR_OK;
-                    }
-                }
-                con.printerr("Unknown command: %s\n", parts[0].c_str());
-                return CR_FAILURE;
+                con.print("DFHack version %s\n", dfhack_version_desc().c_str());
             }
             else
             {
-                con.printerr("not implemented yet\n");
-                return CR_NOT_IMPLEMENTED;
+                help_helper(con, parts[0]);
             }
         }
+        else if (builtin == "tags")
+        {
+            tags_helper(con);
+        }
         else if (builtin == "load" || builtin == "unload" || builtin == "reload")
         {
             bool all = false;
@@ -906,83 +916,7 @@ command_result Core::runCommand(color_ostream &con, const std::string &first_, v
         }
         else if (builtin == "ls" || builtin == "dir")
         {
-            bool all = false;
-            if (parts.size() && parts[0] == "-a")
-            {
-                all = true;
-                vector_erase_at(parts, 0);
-            }
-            if(parts.size())
-            {
-                string & plugname = parts[0];
-                const Plugin * plug = (*plug_mgr)[plugname];
-                if(!plug)
-                {
-                    con.printerr("There's no plugin called %s!\n", plugname.c_str());
-                }
-                else if (plug->getState() != Plugin::PS_LOADED)
-                {
-                    con.printerr("Plugin %s is not loaded.\n", plugname.c_str());
-                }
-                else if (!plug->size())
-                {
-                    con.printerr("Plugin %s is loaded but does not implement any commands.\n", plugname.c_str());
-                }
-                else for (size_t j = 0; j < plug->size();j++)
-                {
-                    ls_helper(con, plug->operator[](j));
-                }
-            }
-            else
-            {
-                con.print(
-                "builtin:\n"
-                "  help|?|man                  - This text or help specific to a plugin.\n"
-                "  ls|dir [-a] [PLUGIN]        - List available commands. Optionally for single plugin.\n"
-                "  cls|clear                   - Clear the console.\n"
-                "  fpause                      - Force DF to pause.\n"
-                "  die                         - Force DF to close immediately\n"
-                "  kill-lua                    - Stop an active Lua script\n"
-                "  keybinding                  - Modify bindings of commands to keys\n"
-                "  script FILENAME             - Run the commands specified in a file.\n"
-                "  sc-script                   - Automatically run specified scripts on state change events\n"
-                "  plug [PLUGIN|v]             - List plugin state and detailed description.\n"
-                "  load PLUGIN|-all [...]      - Load a plugin by name or load all possible plugins.\n"
-                "  unload PLUGIN|-all [...]    - Unload a plugin or all loaded plugins.\n"
-                "  reload PLUGIN|-all [...]    - Reload a plugin or all loaded plugins.\n"
-                "  enable/disable PLUGIN [...] - Enable or disable a plugin if supported.\n"
-                "  type COMMAND                - Display information about where a command is implemented\n"
-                "\n"
-                "plugins:\n"
-                );
-                std::set <sortable> out;
-                for (auto it = plug_mgr->begin(); it != plug_mgr->end(); ++it)
-                {
-                    const Plugin * plug = it->second;
-                    if(!plug->size())
-                        continue;
-                    for (size_t j = 0; j < plug->size();j++)
-                    {
-                        const PluginCommand & pcmd = (plug->operator[](j));
-                        out.insert(sortable(pcmd.isHotkeyCommand(),pcmd.name,pcmd.description));
-                    }
-                }
-                for(auto iter = out.begin();iter != out.end();iter++)
-                {
-                    if ((*iter).recolor)
-                        con.color(COLOR_CYAN);
-                    ls_helper(con, iter->name, iter->description);
-                    con.reset_color();
-                }
-                std::map<string, string> scripts;
-                listAllScripts(scripts, all);
-                if (!scripts.empty())
-                {
-                    con.print("\nscripts:\n");
-                    for (auto iter = scripts.begin(); iter != scripts.end(); ++iter)
-                        ls_helper(con, iter->first, iter->second);
-                }
-            }
+            ls_helper(con, parts);
         }
         else if (builtin == "plug")
         {
diff --git a/library/lua/dfhack.lua b/library/lua/dfhack.lua
index e476ffa11..8af77e2e4 100644
--- a/library/lua/dfhack.lua
+++ b/library/lua/dfhack.lua
@@ -1,4 +1,4 @@
--- Common startup file for all dfhack plugins with lua support
+-- Common startup file for all dfhack scripts and plugins with lua support
 -- The global dfhack table is already created by C++ init code.
 
 -- Setup the global environment.
@@ -652,8 +652,9 @@ function Script:needs_update()
     return (not self.env) or self.mtime ~= dfhack.filesystem.mtime(self.path)
 end
 function Script:get_flags()
-    if self.flags_mtime ~= dfhack.filesystem.mtime(self.path) then
-        self.flags_mtime = dfhack.filesystem.mtime(self.path)
+    local mtime = dfhack.filesystem.mtime(self.path)
+    if self.flags_mtime ~= mtime then
+        self.flags_mtime = mtime
         self._flags = {}
         local f = io.open(self.path)
         local contents = f:read('*all')
@@ -814,36 +815,7 @@ end
 
 function dfhack.script_help(script_name, extension)
     script_name = script_name or dfhack.current_script_name()
-    extension = extension or 'lua'
-    local full_name = script_name .. '.' .. extension
-    local path = dfhack.internal.findScript(script_name .. '.' .. extension)
-        or error("Could not find script: " .. full_name)
-    local begin_seq, end_seq
-    if extension == 'rb' then
-        begin_seq = '=begin'
-        end_seq = '=end'
-    else
-        begin_seq = '[====['
-        end_seq = ']====]'
-    end
-    local f = io.open(path) or error("Could not open " .. path)
-    local in_help = false
-    local help = ''
-    for line in f:lines() do
-        if line:endswith(begin_seq) then
-            in_help = true
-        elseif in_help then
-            if line:endswith(end_seq) then
-                break
-            end
-            if line ~= script_name and line ~= ('='):rep(#script_name) then
-                help = help .. line .. '\n'
-            end
-        end
-    end
-    f:close()
-    help = help:gsub('^\n+', ''):gsub('\n+$', '')
-    return help
+    return require('helpdb').get_entry_long_help(script_name)
 end
 
 local function _run_command(args, use_console)
diff --git a/library/lua/helpdb.lua b/library/lua/helpdb.lua
index 2999ee67e..e72f0804d 100644
--- a/library/lua/helpdb.lua
+++ b/library/lua/helpdb.lua
@@ -326,11 +326,13 @@ local function scan_scripts(old_db, db)
                     f.path:startswith('internal/') then
                 goto continue
             end
+            local dot_index = f.path:find('%.[^.]*$')
             local script_source = script_path .. '/' .. f.path
             update_db(old_db, db,
                       has_rendered_help(f.path) and
                             HELP_SOURCES.RENDERED or HELP_SOURCES.SCRIPT,
-                      f.path:sub(1, #f.path - 4), {script_source=script_source})
+                      f.path:sub(1, dot_index - 1),
+                      {script_source=script_source})
             ::continue::
         end
         ::skip_path::
@@ -384,7 +386,7 @@ end
 local function get_db_property(entry_name, property)
     ensure_db()
     if not db[entry_name] then
-        error(('entry not found: "%s"'):format(entry_name))
+        error(('helpdb entry not found: "%s"'):format(entry_name))
     end
     return db[entry_name][property]
 end
@@ -415,8 +417,17 @@ end
 
 -- returns whether the given string matches a tag name
 function is_tag(str)
+    if not str or #str == 0 then
+        return false
+    end
     ensure_db()
-    return not not tag_index[str]
+    if type(str) == "string" then str = {str} end
+    for _,s in ipairs(str) do
+        if not tag_index[s] then
+            return false
+        end
+    end
+    return true
 end
 
 -- returns the defined tags in alphabetical order
@@ -510,7 +521,7 @@ end
 
 -- converts strings into single-element lists containing that string
 local function normalize_string_list(l)
-    if not l then return nil end
+    if not l or #l == 0 then return nil end
     if type(l) == 'string' then
         return {l}
     end
@@ -561,9 +572,19 @@ function search_entries(include, exclude)
 end
 
 ---------------------------------------------------------------------------
--- list API (outputs to console)
+-- print API (outputs to console)
 ---------------------------------------------------------------------------
 
+-- implements the 'help' builtin command
+function help(entry)
+    ensure_db()
+    if not db[entry] then
+        dfhack.printerr(('No help entry found for "%s"'):format(entry))
+        return
+    end
+    print(get_entry_long_help(entry))
+end
+
 local function get_max_width(list, min_width)
     local width = min_width or 0
     for _,item in ipairs(list) do
@@ -572,8 +593,8 @@ local function get_max_width(list, min_width)
     return width
 end
 
--- prints the defined tags and their descriptions to the console
-function list_tags()
+-- implements the 'tags' builtin command
+function tags()
     local tags = get_tags()
     local width = get_max_width(tags, 10)
     for _,tag in ipairs(tags) do

From 8d99b7e6e1f5d14ee5d1eb4c4ecea5750c4bddef Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Sat, 9 Jul 2022 23:01:31 -0700
Subject: [PATCH 184/854] prepare for plugin doc split

---
 .gitignore                                  |    3 +-
 CMakeLists.txt                              |    2 +-
 conf.py                                     |  139 +-
 docs/Core.rst                               |   11 +-
 docs/Dev-intro.rst                          |    7 +-
 docs/Documentation.rst                      |    8 +-
 docs/History.rst                            |    4 +-
 docs/Introduction.rst                       |    2 +-
 docs/Memory-research.rst                    |    2 +-
 docs/NEWS-dev.rst                           |    2 +-
 docs/NEWS.rst                               |    2 +-
 docs/Plugins.rst                            | 3436 -------------------
 docs/Removed.rst                            |    8 +
 docs/Scripts.rst                            |   19 -
 docs/Tools.rst                              |   13 -
 docs/_auto/.gitignore                       |    1 -
 docs/build-pdf.sh                           |   11 +-
 docs/build.sh                               |   12 +-
 docs/{_changelogs => changelogs}/.gitignore |    1 +
 docs/guides/examples-guide.rst              |    4 +-
 docs/index-tools.rst                        |   24 +
 docs/{tools => plugins}/cromulate.rst       |    0
 docs/sphinx_extensions/dfhack/changelog.py  |   14 +-
 index.rst                                   |    6 +-
 24 files changed, 127 insertions(+), 3604 deletions(-)
 delete mode 100644 docs/Plugins.rst
 delete mode 100644 docs/Scripts.rst
 delete mode 100644 docs/Tools.rst
 delete mode 100644 docs/_auto/.gitignore
 rename docs/{_changelogs => changelogs}/.gitignore (50%)
 create mode 100644 docs/index-tools.rst
 rename docs/{tools => plugins}/cromulate.rst (100%)

diff --git a/.gitignore b/.gitignore
index 0b54f4a84..5155f2bb9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,10 +15,11 @@ build/VC2010
 !build/
 
 # Sphinx generated documentation
-docs/_*
+docs/changelogs/
 docs/html/
 docs/pdf/
 docs/text/
+docs/tools/
 
 # in-place build
 build/Makefile
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6bee1c04a..46bd1917b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -505,7 +505,7 @@ if(BUILD_DOCS)
         DESTINATION ${DFHACK_USERDOC_DESTINATION}/docs)
     install(DIRECTORY ${dfhack_SOURCE_DIR}/docs/text/
         DESTINATION ${DFHACK_USERDOC_DESTINATION}/docs)
-    install(FILES docs/_auto/news.rst docs/_auto/news-dev.rst DESTINATION ${DFHACK_USERDOC_DESTINATION})
+    install(FILES docs/changelogs/news.rst docs/changelogs/news-dev.rst DESTINATION ${DFHACK_USERDOC_DESTINATION})
     install(FILES "README.html" DESTINATION "${DFHACK_DATA_DESTINATION}")
 endif()
 
diff --git a/conf.py b/conf.py
index 53b192467..d7be99a15 100644
--- a/conf.py
+++ b/conf.py
@@ -29,8 +29,6 @@ import sys
 from docutils import nodes
 from docutils.parsers.rst import roles
 
-sphinx_major_version = sphinx.version_info[0]
-
 def get_keybinds(root, files, keybindings):
     """Add keybindings in the specified files to the
     given keybindings dict.
@@ -85,107 +83,86 @@ def dfhack_keybind_role_func(role, rawtext, text, lineno, inliner,
 
 roles.register_canonical_role('dfhack-keybind', dfhack_keybind_role_func)
 
-# -- Autodoc for DFhack scripts -------------------------------------------
+# -- Autodoc for DFhack plugins and scripts -------------------------------
 
-def doc_dir(dirname, files):
-    """Yield (command, includepath) for each script in the directory."""
+def doc_dir(dirname, files, prefix):
+    """Yield (name, includepath) for each file in the directory."""
     sdir = os.path.relpath(dirname, '.').replace('\\', '/').replace('../', '')
+    if prefix == '.':
+        prefix = ''
+    else:
+        prefix += '/'
     for f in files:
-        if f[-3:] not in ('lua', '.rb'):
+        if f[-4:] != '.rst':
             continue
-        with open(os.path.join(dirname, f), 'r', encoding='utf8') as fstream:
-            text = [l.rstrip() for l in fstream.readlines() if l.strip()]
-        # Some legacy lua files use the ruby tokens (in 3rdparty scripts)
-        tokens = ('=begin', '=end')
-        if f[-4:] == '.lua' and any('[====[' in line for line in text):
-            tokens = ('[====[', ']====]')
-        command = None
-        for line in text:
-            if command and line == len(line) * '=':
-                yield command, sdir + '/' + f, tokens[0], tokens[1]
-                break
-            command = line
+        yield prefix + f[:-4], sdir + '/' + f
 
 
 def doc_all_dirs():
     """Collect the commands and paths to include in our docs."""
-    scripts = []
-    for root, _, files in os.walk('scripts'):
-        scripts.extend(doc_dir(root, files))
-    return tuple(scripts)
+    tools = []
+    # TODO: as we scan the docs, parse out the tags and short descriptions and
+    # build a map for use in generating the tags pages and links in the tool
+    # doc footers
+    for root, _, files in os.walk('docs/plugins'):
+        tools.extend(doc_dir(root, files, os.path.relpath(root, 'docs/plugins')))
+    for root, _, files in os.walk('scripts/docs'):
+        tools.extend(doc_dir(root, files, os.path.relpath(root, 'scripts/docs')))
+    return tuple(tools)
 
 DOC_ALL_DIRS = doc_all_dirs()
 
+def generate_tag_indices():
+    #TODO: generate docs/tags/<tag>.rst with the tag description and links to the
+    # tools that have that tag
+    os.makedirs('docs/tags', mode=0o755, exist_ok=True)
 
-def document_scripts():
-    """Autodoc for files with the magic script documentation marker strings.
 
-    Returns a dict of script-kinds to lists of .rst include directives.
+def write_tool_docs():
     """
-    # Next we split by type and create include directives sorted by command
-    kinds = {'base': [], 'devel': [], 'fix': [], 'gui': [], 'modtools': []}
-    for s in DOC_ALL_DIRS:
-        k_fname = s[0].split('/', 1)
-        if len(k_fname) == 1:
-            kinds['base'].append(s)
-        else:
-            kinds[k_fname[0]].append(s)
-
-    def template(arg):
-        tmp = '.. _{}:\n\n.. include:: /{}\n' +\
-            '   :start-after: {}\n   :end-before: {}\n'
-        if arg[0] in KEYBINDS:
-            tmp += '\n:dfhack-keybind:`{}`\n'.format(arg[0])
-        return tmp.format(*arg)
-
-    return {key: '\n\n'.join(map(template, sorted(value)))
-            for key, value in kinds.items()}
-
-
-def write_script_docs():
+    Creates a file for each tool with the ".. include::" directives to pull in
+    the original documentation. Then we generate a label and useful info in the
+    footer.
     """
-    Creates a file for eack kind of script (base/devel/fix/gui/modtools)
-    with all the ".. include::" directives to pull out docs between the
-    magic strings.
-    """
-    kinds = document_scripts()
-    head = {
-        'base': 'Basic Scripts',
-        'devel': 'Development Scripts',
-        'fix': 'Bugfixing Scripts',
-        'gui': 'GUI Scripts',
-        'modtools': 'Scripts for Modders'}
-    for k in head:
-        title = ('.. _scripts-{k}:\n\n{l}\n{t}\n{l}\n\n'
-                 '.. include:: /scripts/{a}about.txt\n\n'
-                 '.. contents:: Contents\n'
-                 '  :local:\n\n').format(
-                     k=k, t=head[k],
-                     l=len(head[k])*'#',
-                     a=('' if k == 'base' else k + '/')
-                     )
+    for k in DOC_ALL_DIRS:
+        label = ('.. _{name}:\n\n').format(name=k[0])
+        # TODO: can we autogenerate the :dfhack-keybind: line? it would go beneath
+        # the tool header, which is currently in the middle of the included file.
+        # should we remove those headers from the doc files and just generate them
+        # here? That might be easier. But then where will the tags go? It would
+        # look better if they were above the keybinds, but then we'd be in the
+        # same situation.
+        include = ('.. include:: /{path}\n\n').format(path=k[1])
+        # TODO: generate a footer with links to tools that share at least one
+        # tag with this tool. Just the tool names, strung across the bottom of
+        # the page in one long wrapped line, similar to how the wiki does it
         mode = 'w' if sys.version_info.major > 2 else 'wb'
-        with open('docs/_auto/{}.rst'.format(k), mode) as outfile:
-            outfile.write(title)
-            outfile.write(kinds[k])
+        os.makedirs(os.path.join('docs/tools', os.path.dirname(k[0])),
+                    mode=0o755, exist_ok=True)
+        with open('docs/tools/{}.rst'.format(k[0]), mode) as outfile:
+            if k[0] != 'search':
+                outfile.write(label)
+            outfile.write(include)
 
 
 def all_keybinds_documented():
     """Check that all keybindings are documented with the :dfhack-keybind:
     directive somewhere."""
-    configured_binds = set(KEYBINDS)
-    script_commands = set(i[0] for i in DOC_ALL_DIRS)
-    with open('./docs/Plugins.rst') as f:
-        plugin_binds = set(re.findall(':dfhack-keybind:`(.*?)`', f.read()))
-    undocumented_binds = configured_binds - script_commands - plugin_binds
+    undocumented_binds = set(KEYBINDS)
+    tools = set(i[0] for i in DOC_ALL_DIRS)
+    for t in tools:
+        with open(('./docs/tools/{}.rst').format(t)) as f:
+            tool_binds = set(re.findall(':dfhack-keybind:`(.*?)`', f.read()))
+            undocumented_binds -= tool_binds
     if undocumented_binds:
         raise ValueError('The following DFHack commands have undocumented '
                          'keybindings: {}'.format(sorted(undocumented_binds)))
 
 
 # Actually call the docs generator and run test
-write_script_docs()
-all_keybinds_documented()
+write_tool_docs()
+generate_tag_indices()
+#all_keybinds_documented() # comment out while we're transitioning
 
 # -- General configuration ------------------------------------------------
 
@@ -203,6 +180,8 @@ extensions = [
     'dfhack.lexer',
 ]
 
+sphinx_major_version = sphinx.version_info[0]
+
 def get_caption_str(prefix=''):
     return prefix + (sphinx_major_version >= 5 and '%s' or '')
 
@@ -282,11 +261,11 @@ today_fmt = html_last_updated_fmt = '%Y-%m-%d'
 # directories to ignore when looking for source files.
 exclude_patterns = [
     'README.md',
-    'docs/html*',
-    'depends/*',
     'build*',
-    'docs/_auto/news*',
-    'docs/_changelogs/',
+    'depends/*',
+    'docs/html/*',
+    'docs/text/*',
+    'docs/plugins/*',
     'scripts/docs/*',
     ]
 
diff --git a/docs/Core.rst b/docs/Core.rst
index ffa620f55..f7ba0824b 100644
--- a/docs/Core.rst
+++ b/docs/Core.rst
@@ -15,19 +15,18 @@ DFHack commands can be implemented in any of three ways:
 
 :builtin:   commands are implemented by the core of DFHack. They manage
             other DFHack tools, interpret commands, and control basic
-            aspects of DF (force pause or quit). They are documented
-            `here <built-in-commands>`.
+            aspects of DF (force pause or quit).
 
 :plugins:   are stored in ``hack/plugins/`` and must be compiled with the
             same version of DFHack.  They are less flexible than scripts,
             but used for complex or ongoing tasks because they run faster.
-            Plugins included with DFHack are documented `here <plugins-index>`.
 
 :scripts:   are Ruby or Lua scripts stored in ``hack/scripts/``.
             Because they don't need to be compiled, scripts are
             more flexible about versions, and easier to distribute.
-            Most third-party DFHack addons are scripts. All scripts included
-            with DFHack are documented `here <scripts-index>`.
+            Most third-party DFHack addons are scripts.
+
+All tools distributed with DFHack are documented `here <tools-index>`.
 
 Using DFHack Commands
 =====================
@@ -186,7 +185,7 @@ where ``*`` can be any string, including the empty string.
 A world being loaded can mean a fortress, an adventurer, or legends mode.
 
 These files are best used for non-persistent commands, such as setting
-a `fix <scripts-fix>` script to run on `repeat`.
+a `fix <tools-index>` script to run on `repeat`.
 
 
 .. _onMapLoad.init:
diff --git a/docs/Dev-intro.rst b/docs/Dev-intro.rst
index 758bf225f..6f46d86c5 100644
--- a/docs/Dev-intro.rst
+++ b/docs/Dev-intro.rst
@@ -41,7 +41,7 @@ Installed plugins live in the ``hack/plugins`` folder of a DFHack installation,
 and the `load` family of commands can be used to load a recompiled plugin
 without restarting DF.
 
-See `plugins-index` for a list of all plugins included in DFHack.
+Run `plug` at the DFHack prompt for a list of all plugins included in DFHack.
 
 Scripts
 -------
@@ -51,8 +51,9 @@ is more complete and currently better-documented, however. Referring to existing
 scripts as well as the API documentation can be helpful when developing new
 scripts.
 
-`Scripts included in DFHack <scripts-index>` live in a separate `scripts repository <https://github.com/dfhack/scripts>`_.
-This can be found in the ``scripts`` submodule if you have
+`Scripts included in DFHack <tools-index>` live in a separate
+`scripts repository <https://github.com/dfhack/scripts>`_. This can be found in
+the ``scripts`` submodule if you have
 `cloned DFHack <compile-how-to-get-the-code>`, or the ``hack/scripts`` folder
 of an installed copy of DFHack.
 
diff --git a/docs/Documentation.rst b/docs/Documentation.rst
index be4511ba8..acfffdbbb 100644
--- a/docs/Documentation.rst
+++ b/docs/Documentation.rst
@@ -318,10 +318,10 @@ changelogs are combined as part of the changelog build process:
 * ``scripts/changelog.txt`` for changes made to scripts in the ``scripts`` repo
 * ``library/xml/changelog.txt`` for changes made in the ``df-structures`` repo
 
-Building the changelogs generates two files: ``docs/_auto/news.rst`` and
-``docs/_auto/news-dev.rst``. These correspond to `changelog` and `dev-changelog`
-and contain changes organized by stable and development DFHack releases,
-respectively. For example, an entry listed under "0.44.05-alpha1" in
+Building the changelogs generates two files: ``docs/changelogs/news.rst`` and
+``docs/changelogs/news-dev.rst``. These correspond to `changelog` and
+`dev-changelog` and contain changes organized by stable and development DFHack
+releases, respectively. For example, an entry listed under "0.44.05-alpha1" in
 changelog.txt will be listed under that version in the development changelog as
 well, but under "0.44.05-r1" in the stable changelog (assuming that is the
 closest stable release after 0.44.05-alpha1). An entry listed under a stable
diff --git a/docs/History.rst b/docs/History.rst
index dc02d02b0..67b65f3bc 100644
--- a/docs/History.rst
+++ b/docs/History.rst
@@ -1350,7 +1350,7 @@ Misc improvements
 - `createitem`: in adventure mode it now defaults to the controlled unit as maker.
 - `autotrade`: adds "(Un)mark All" options to both panes of trade screen.
 - `mousequery`: several usability improvements; show live overlay (in menu area) of what's on the tile under the mouse cursor.
-- `search`: workshop profile search added.
+- `search-plugin`: workshop profile search added.
 - `dwarfmonitor`: add screen to summarise preferences of fortress dwarfs.
 - `getplants`: add autochop function to automate woodcutting.
 - `stocks`: added more filtering and display options.
@@ -1510,7 +1510,7 @@ New binary patches
 New Plugins
 -----------
 - `fix-armory`: Together with a couple of binary patches and the `gui/assign-rack` script, this plugin makes weapon racks, armor stands, chests and cabinets in properly designated barracks be used again for storage of squad equipment.
-- `search`: Adds an incremental search function to the Stocks, Trading, Stockpile and Unit List screens.
+- `search-plugin`: Adds an incremental search function to the Stocks, Trading, Stockpile and Unit List screens.
 - `automaterial`: Makes building constructions (walls, floors, fortifications, etc) a little bit easier by saving you from having to trawl through long lists of materials each time you place one.
 - Dfusion: Reworked to make use of lua modules, now all the scripts can be used from other scripts.
 - Eventful: A collection of lua events, that will allow new ways to interact with df world.
diff --git a/docs/Introduction.rst b/docs/Introduction.rst
index 27c887a8b..f0dc7a4b6 100644
--- a/docs/Introduction.rst
+++ b/docs/Introduction.rst
@@ -21,7 +21,7 @@ enhancements by default, and more can be enabled.  There are also many tools
 You can even add third-party scripts and plugins to do almost anything!
 
 For modders, DFHack makes many things possible.  Custom reactions, new
-interactions, magic creature abilities, and more can be set through `scripts-modtools`
+interactions, magic creature abilities, and more can be set through `DFHack tools <tools-index>`
 and custom raws.  Non-standard DFHack scripts and inits can be stored in the
 raw directory, making raws or saves fully self-contained for distribution -
 or for coexistence in a single DF install, even with incompatible components.
diff --git a/docs/Memory-research.rst b/docs/Memory-research.rst
index 9729072f5..bc7b45fd7 100644
--- a/docs/Memory-research.rst
+++ b/docs/Memory-research.rst
@@ -63,7 +63,7 @@ are not built by default, but can be built by setting the ``BUILD_DEVEL``
 Scripts
 ~~~~~~~
 
-Several `development scripts <scripts-devel>` can be useful for memory research.
+Several `development scripts <tools-index>` can be useful for memory research.
 These include (but are not limited to):
 
 - `devel/dump-offsets`
diff --git a/docs/NEWS-dev.rst b/docs/NEWS-dev.rst
index f0c47fe96..f77737176 100644
--- a/docs/NEWS-dev.rst
+++ b/docs/NEWS-dev.rst
@@ -17,4 +17,4 @@ See `changelog` for a list of changes grouped by stable releases.
   :local:
   :depth: 1
 
-.. include:: /docs/_auto/news-dev.rst
+.. include:: /docs/changelogs/news-dev.rst
diff --git a/docs/NEWS.rst b/docs/NEWS.rst
index 1283b079a..fb33aebf9 100644
--- a/docs/NEWS.rst
+++ b/docs/NEWS.rst
@@ -17,7 +17,7 @@ See `dev-changelog` for a list of changes grouped by development releases.
   :local:
   :depth: 1
 
-.. include:: /docs/_auto/news.rst
+.. include:: /docs/changelogs/news.rst
 
 
 Older Changelogs
diff --git a/docs/Plugins.rst b/docs/Plugins.rst
deleted file mode 100644
index 8acddfc6d..000000000
--- a/docs/Plugins.rst
+++ /dev/null
@@ -1,3436 +0,0 @@
-.. _plugins-index:
-
-##############
-DFHack Plugins
-##############
-
-DFHack plugins are the commands, that are compiled with a specific version.
-They can provide anything from a small keybinding, to a complete overhaul of
-game subsystems or the entire renderer.
-
-Most commands offered by plugins are listed here,
-hopefully organised in a way you will find useful.
-
-.. contents:: Contents
-  :local:
-  :depth: 2
-
-========
-Bugfixes
-========
-
-.. contents::
-   :local:
-
-.. _fix-armory:
-
-fix-armory
-==========
-`This plugin requires a binpatch <binpatches/needs-patch>`, which has not
-been available since DF 0.34.11
-
-.. _fix-unit-occupancy:
-
-fix-unit-occupancy
-==================
-This plugin fixes issues with unit occupancy, notably phantom
-"unit blocking tile" messages (:bug:`3499`). It can be run manually, or
-periodically when enabled with the built-in enable/disable commands:
-
-:(no argument):         Run the plugin once immediately, for the whole map.
-:-h, here, cursor:      Run immediately, only operate on the tile at the cursor
-:-n, dry, dry-run:      Run immediately, do not write changes to map
-:interval <X>:          Run the plugin every ``X`` ticks (when enabled).
-                        The default is 1200 ticks, or 1 day.
-                        Ticks are only counted when the game is unpaused.
-
-.. _fixveins:
-
-fixveins
-========
-Removes invalid references to mineral inclusions and restores missing ones.
-Use this if you broke your embark with tools like `tiletypes`, or if you
-accidentally placed a construction on top of a valuable mineral floor.
-
-.. _petcapRemover:
-
-petcapRemover
-=============
-Allows you to remove or raise the pet population cap. In vanilla
-DF, pets will not reproduce unless the population is below 50 and the number of
-children of that species is below a certain percentage. This plugin allows
-removing the second restriction and removing or raising the first. Pets still
-require PET or PET_EXOTIC tags in order to reproduce. Type ``help petcapRemover``
-for exact usage. In order to make population more stable and avoid sudden
-population booms as you go below the raised population cap, this plugin counts
-pregnancies toward the new population cap. It can still go over, but only in the
-case of multiple births.
-
-Usage:
-
-:petcapRemover:             cause pregnancies now and schedule the next check
-:petcapRemover every n:     set how often in ticks the plugin checks for possible pregnancies
-:petcapRemover cap n:       set the new cap to n. if n = 0, no cap
-:petcapRemover pregtime n:  sets the pregnancy duration to n ticks. natural pregnancies are
-                            300000 ticks for the current race and 200000 for everyone else
-
-.. _tweak:
-
-tweak
-=====
-Contains various tweaks for minor bugs.
-
-One-shot subcommands:
-
-:clear-missing:  Remove the missing status from the selected unit.
-                 This allows engraving slabs for ghostly, but not yet
-                 found, creatures.
-:clear-ghostly:  Remove the ghostly status from the selected unit and mark
-                 it as dead. This allows getting rid of bugged ghosts
-                 which do not show up in the engraving slab menu at all,
-                 even after using clear-missing. It works, but is
-                 potentially very dangerous - so use with care. Probably
-                 (almost certainly) it does not have the same effects like
-                 a proper burial. You've been warned.
-:fixmigrant:     Remove the resident/merchant flag from the selected unit.
-                 Intended to fix bugged migrants/traders who stay at the
-                 map edge and don't enter your fort. Only works for
-                 dwarves (or generally the player's race in modded games).
-                 Do NOT abuse this for 'real' caravan merchants (if you
-                 really want to kidnap them, use 'tweak makeown' instead,
-                 otherwise they will have their clothes set to forbidden etc).
-:makeown:        Force selected unit to become a member of your fort.
-                 Can be abused to grab caravan merchants and escorts, even if
-                 they don't belong to the player's race. Foreign sentients
-                 (humans, elves) can be put to work, but you can't assign rooms
-                 to them and they don't show up in DwarfTherapist because the
-                 game treats them like pets. Grabbing draft animals from
-                 a caravan can result in weirdness (animals go insane or berserk
-                 and are not flagged as tame), but you are allowed to mark them
-                 for slaughter. Grabbing wagons results in some funny spam, then
-                 they are scuttled.
-
-Subcommands that persist until disabled or DF quits:
-
-.. comment: sort these alphabetically
-
-:adamantine-cloth-wear: Prevents adamantine clothing from wearing out while being worn (:bug:`6481`).
-:advmode-contained:     Works around :bug:`6202`, custom reactions with container inputs
-                        in advmode. The issue is that the screen tries to force you to select
-                        the contents separately from the container. This forcefully skips child
-                        reagents.
-:block-labors:          Prevents labors that can't be used from being toggled
-:burrow-name-cancel:    Implements the "back" option when renaming a burrow,
-                        which currently does nothing (:bug:`1518`)
-:cage-butcher:          Adds an option to butcher units when viewing cages with :kbd:`q`
-:civ-view-agreement:    Fixes overlapping text on the "view agreement" screen
-:condition-material:    Fixes a crash in the work order contition material list (:bug:`9905`).
-:craft-age-wear:        Fixes the behavior of crafted items wearing out over time (:bug:`6003`).
-                        With this tweak, items made from cloth and leather will gain a level of
-                        wear  every 20 years.
-:do-job-now:            Adds a job priority toggle to the jobs list
-:embark-profile-name:   Allows the use of lowercase letters when saving embark profiles
-:eggs-fertile:          Displays a fertility indicator on nestboxes
-:farm-plot-select:      Adds "Select all" and "Deselect all" options to farm plot menus
-:fast-heat:             Further improves temperature update performance by ensuring that 1 degree
-                        of item temperature is crossed in no more than specified number of frames
-                        when updating from the environment temperature. This reduces the time it
-                        takes for stable-temp to stop updates again when equilibrium is disturbed.
-:fast-trade:            Makes Shift-Down in the Move Goods to Depot and Trade screens select
-                        the current item (fully, in case of a stack), and scroll down one line.
-:fps-min:               Fixes the in-game minimum FPS setting
-:hide-priority:         Adds an option to hide designation priority indicators
-:hotkey-clear:          Adds an option to clear currently-bound hotkeys (in the :kbd:`H` menu)
-:import-priority-category:
-                        Allows changing the priority of all goods in a
-                        category when discussing an import agreement with the liaison
-:kitchen-prefs-all:     Adds an option to toggle cook/brew for all visible items in kitchen preferences
-:kitchen-prefs-color:   Changes color of enabled items to green in kitchen preferences
-:kitchen-prefs-empty:   Fixes a layout issue with empty kitchen tabs (:bug:`9000`)
-:max-wheelbarrow:       Allows assigning more than 3 wheelbarrows to a stockpile
-:military-color-assigned:
-                        Color squad candidates already assigned to other squads in yellow/green
-                        to make them stand out more in the list.
-
-                        .. image:: images/tweak-mil-color.png
-
-:military-stable-assign:
-                        Preserve list order and cursor position when assigning to squad,
-                        i.e. stop the rightmost list of the Positions page of the military
-                        screen from constantly resetting to the top.
-:nestbox-color:         Fixes the color of built nestboxes
-:partial-items:         Displays percentages on partially-consumed items such as hospital cloth
-:reaction-gloves:       Fixes reactions to produce gloves in sets with correct handedness (:bug:`6273`)
-:shift-8-scroll:        Gives Shift-8 (or :kbd:`*`) priority when scrolling menus, instead of scrolling the map
-:stable-cursor:         Saves the exact cursor position between t/q/k/d/b/etc menus of fortress mode, if the
-                        map view is near enough to its previous position.
-:stone-status-all:      Adds an option to toggle the economic status of all stones
-:title-start-rename:    Adds a safe rename option to the title screen "Start Playing" menu
-:tradereq-pet-gender:   Displays pet genders on the trade request screen
-
-.. comment: sort these alphabetically
-
-
-===============================
-Data inspection and visualizers
-===============================
-
-.. contents::
-   :local:
-
-.. _blueprint:
-
-blueprint
-=========
-The ``blueprint`` command exports the structure of a portion of your fortress in
-a blueprint file that you (or anyone else) can later play back with `quickfort`.
-
-Blueprints are ``.csv`` or ``.xlsx`` files created in the ``blueprints``
-subdirectory of your DF folder. The map area to turn into a blueprint is either
-selected interactively with the ``blueprint gui`` command or, if the GUI is not
-used, starts at the active cursor location and extends right and down for the
-requested width and height.
-
-**Usage:**
-
-    ``blueprint <width> <height> [<depth>] [<name> [<phases>]] [<options>]``
-
-    ``blueprint gui [<name> [<phases>]] [<options>]``
-
-**Examples:**
-
-``blueprint gui``
-    Runs `gui/blueprint`, the interactive frontend, where all configuration for
-    a ``blueprint`` command can be set visually and interactively.
-
-``blueprint 30 40 bedrooms``
-    Generates blueprints for an area 30 tiles wide by 40 tiles tall, starting
-    from the active cursor on the current z-level. Blueprints are written
-    sequentially to ``bedrooms.csv`` in the ``blueprints`` directory.
-
-``blueprint 30 40 bedrooms dig --cursor 108,100,150``
-    Generates only the ``#dig`` blueprint in the ``bedrooms.csv`` file, and
-    the start of the blueprint area is set to a specific value instead of using
-    the in-game cursor position.
-
-**Positional Parameters:**
-
-:``width``:   Width of the area (in tiles) to translate.
-:``height``:  Height of the area (in tiles) to translate.
-:``depth``:   Number of z-levels to translate. Positive numbers go *up* from the
-    cursor and negative numbers go *down*. Defaults to 1 if not specified,
-    indicating that the blueprint should only include the current z-level.
-:``name``:    Base name for blueprint files created in the ``blueprints``
-    directory. If no name is specified, "blueprint" is used by default. The
-    string must contain some characters other than numbers so the name won't be
-    confused with the optional ``depth`` parameter.
-
-**Phases:**
-
-If you want to generate blueprints only for specific phases, add their names to
-the commandline, anywhere after the blueprint base name. You can list multiple
-phases; just separate them with a space.
-
-:``dig``:    Generate quickfort ``#dig`` blueprints for digging natural stone.
-:``carve``:  Generate quickfort ``#dig`` blueprints for smoothing and carving.
-:``build``:  Generate quickfort ``#build`` blueprints for constructions and
-    buildings.
-:``place``:  Generate quickfort ``#place`` blueprints for placing stockpiles.
-:``zone``:   Generate quickfort ``#zone`` blueprints for designating zones.
-:``query``:  Generate quickfort ``#query`` blueprints for configuring rooms.
-
-If no phases are specified, phases are autodetected. For example, a ``#place``
-blueprint will be created only if there are stockpiles in the blueprint area.
-
-**Options:**
-
-``-c``, ``--cursor <x>,<y>,<z>``:
-    Use the specified map coordinates instead of the current cursor position for
-    the upper left corner of the blueprint range. If this option is specified,
-    then an active game map cursor is not necessary.
-``-e``, ``--engrave``:
-    Record engravings in the ``carve`` phase. If this option is not specified,
-    engravings are ignored.
-``-f``, ``--format <format>``:
-    Select the output format of the generated files. See the ``Output formats``
-    section below for options. If not specified, the output format defaults to
-    "minimal", which will produce a small, fast ``.csv`` file.
-``-h``, ``--help``:
-    Show command help text.
-``-s``, ``--playback-start <x>,<y>,<comment>``:
-    Specify the column and row offsets (relative to the upper-left corner of the
-    blueprint, which is ``1,1``) where the player should put the cursor when the
-    blueprint is played back with `quickfort`, in
-    `quickfort start marker <quickfort-start>` format, for example:
-    ``10,10,central stairs``. If there is a space in the comment, you will need
-    to surround the parameter string in double quotes: ``"-s10,10,central stairs"`` or
-    ``--playback-start "10,10,central stairs"`` or
-    ``"--playback-start=10,10,central stairs"``.
-``-t``, ``--splitby <strategy>``:
-    Split blueprints into multiple files. See the ``Splitting output into
-    multiple files`` section below for details. If not specified, defaults to
-    "none", which will create a standard quickfort
-    `multi-blueprint <quickfort-packaging>` file.
-
-**Output formats:**
-
-Here are the values that can be passed to the ``--format`` flag:
-
-:``minimal``:
-    Creates ``.csv`` files with minimal file size that are fast to read and
-    write. This is the default.
-:``pretty``:
-    Makes the blueprints in the ``.csv`` files easier to read and edit with a text
-    editor by adding extra spacing and alignment markers.
-
-**Splitting output into multiple files:**
-
-The ``--splitby`` flag can take any of the following values:
-
-:``none``:
-    Writes all blueprints into a single file. This is the standard format for
-    quickfort fortress blueprint bundles and is the default.
-:``phase``:
-    Creates a separate file for each phase.
-
-.. _cursecheck:
-
-cursecheck
-==========
-Checks a single map tile or the whole map/world for cursed creatures (ghosts,
-vampires, necromancers, werebeasts, zombies).
-
-With an active in-game cursor only the selected tile will be observed.
-Without a cursor the whole map will be checked.
-
-By default cursed creatures will be only counted in case you just want to find
-out if you have any of them running around in your fort. Dead and passive
-creatures (ghosts who were put to rest, killed vampires, ...) are ignored.
-Undead skeletons, corpses, bodyparts and the like are all thrown into the curse
-category "zombie". Anonymous zombies and resurrected body parts will show
-as "unnamed creature".
-
-Options:
-
-:detail:      Print full name, date of birth, date of curse and some status
-              info (some vampires might use fake identities in-game, though).
-:ids:         Print the creature and race IDs.
-:nick:        Set the type of curse as nickname (does not always show up
-              in-game, some vamps don't like nicknames).
-:all:         Include dead and passive cursed creatures (can result in a quite
-              long list after having FUN with necromancers).
-:verbose:     Print all curse tags (if you really want to know it all).
-
-Examples:
-
-``cursecheck detail all``
-   Give detailed info about all cursed creatures including deceased ones (no
-   in-game cursor).
-``cursecheck nick``
-   Give a nickname all living/active cursed creatures on the map(no in-game
-   cursor).
-
-.. note::
-
-    If you do a full search (with the option "all") former ghosts will show up
-    with the cursetype "unknown" because their ghostly flag is not set.
-
-    Please report any living/active creatures with cursetype "unknown" -
-    this is most likely with mods which introduce new types of curses.
-
-.. _flows:
-
-flows
-=====
-A tool for checking how many tiles contain flowing liquids. If you suspect that
-your magma sea leaks into HFS, you can use this tool to be sure without
-revealing the map.
-
-.. _isoworldremote:
-
-isoworldremote
-==============
-A plugin that implements a `remote API <remote>` used by Isoworld.
-
-.. _probe:
-
-probe
-=====
-
-This plugin provides multiple commands that print low-level properties of the
-selected objects.
-
-* ``probe``: prints some properties of the tile selected with :kbd:`k`. Some of
-  these properties can be passed into `tiletypes`.
-* ``cprobe``: prints some properties of the unit selected with :kbd:`v`, as well
-  as the IDs of any worn items. `gui/gm-unit` and `gui/gm-editor` are more
-  complete in-game alternatives.
-* ``bprobe``: prints some properties of the building selected with :kbd:`q` or
-  :kbd:`t`. `gui/gm-editor` is a more complete in-game alternative.
-
-.. _prospect:
-.. _prospector:
-
-prospect
-========
-
-**Usage:**
-
-    ``prospect [all|hell] [<options>]``
-
-Shows a summary of resources that exist on the map. By default, only the visible
-part of the map is scanned. Include the ``all`` keyword if you want ``prospect``
-to scan the whole map as if it were revealed. Use ``hell`` instead of ``all`` if
-you also want to see the Z range of HFS tubes in the 'features' report section.
-
-**Options:**
-
-:``-h``, ``--help``:
-    Shows this help text.
-:``-s``, ``--show <sections>``:
-    Shows only the named comma-separated list of report sections. Report section
-    names are: summary, liquids, layers, features, ores, gems, veins, shrubs,
-    and trees. If run during pre-embark, only the layers, ores, gems, and veins
-    report sections are available.
-:``-v``, ``--values``:
-    Includes material value in the output. Most useful for the 'gems' report
-    section.
-
-**Examples:**
-
-``prospect all``
-    Shows the entire report for the entire map.
-
-``prospect hell --show layers,ores,veins``
-    Shows only the layers, ores, and other vein stone report sections, and
-    includes information on HFS tubes when a fort is loaded.
-
-``prospect all -sores``
-    Show only information about ores for the pre-embark or fortress map report.
-
-**Pre-embark estimate:**
-
-If prospect is called during the embark selection screen, it displays an
-estimate of layer stone availability. If the ``all`` keyword is specified, it
-also estimates ores, gems, and vein material. The estimate covers all tiles of
-the embark rectangle.
-
-.. note::
-
-    The results of pre-embark prospect are an *estimate*, and can at best be
-    expected to be somewhere within +/- 30% of the true amount; sometimes it
-    does a lot worse. Especially, it is not clear how to precisely compute how
-    many soil layers there will be in a given embark tile, so it can report a
-    whole extra layer, or omit one that is actually present.
-
-.. _remotefortressreader:
-
-remotefortressreader
-====================
-An in-development plugin for realtime fortress visualisation.
-See :forums:`Armok Vision <146473>`.
-
-.. _reveal:
-.. _unreveal:
-.. _revtoggle:
-.. _revflood:
-.. _revforget:
-
-reveal
-======
-This reveals the map. By default, HFS will remain hidden so that the demons
-don't spawn. You can use ``reveal hell`` to reveal everything. With hell revealed,
-you won't be able to unpause until you hide the map again. If you really want
-to unpause with hell revealed, use ``reveal demons``.
-
-Reveal also works in adventure mode, but any of its effects are negated once
-you move. When you use it this way, you don't need to run ``unreveal``.
-
-Usage and related commands:
-
-:reveal:        Reveal the whole map, except for HFS to avoid demons spawning
-:reveal hell:   Also show hell, but requires ``unreveal`` before unpausing
-:reveal demon:  Reveals everything and allows unpausing - good luck!
-:unreveal:      Reverts the effects of ``reveal``
-:revtoggle:     Switches between ``reveal`` and ``unreveal``
-:revflood:      Hide everything, then reveal tiles with a path to the cursor.
-                Note that tiles behind constructed walls are also revealed as a
-                workaround for :bug:`1871`.
-:revforget:     Discard info about what was visible before revealing the map.
-                Only useful where (e.g.) you abandoned with the fort revealed
-                and no longer want the data.
-
-.. _showmood:
-
-showmood
-========
-Shows all items needed for the currently active strange mood.
-
-.. _spectate:
-
-spectate
-========
-Simple plugin to automate following random dwarves. Most of the time things will
-be weighted towards z-levels with the highest job activity. Simply enter the
-``spectate`` command to toggle the plugin's state.
-
-.. _plugin-stonesense:
-
-stonesense
-==========
-An isometric visualizer that runs in a second window. Usage:
-
-:stonesense:        Open the visualiser in a new window.  Alias ``ssense``.
-:ssense overlay:    Overlay DF window, replacing the map area.
-
-For more information, see `the full Stonesense README <stonesense>`.
-
-===========================
-Job and Fortress management
-===========================
-
-.. contents::
-   :local:
-
-
-.. _autobutcher:
-
-autobutcher
-===========
-Assigns lifestock for slaughter once it reaches a specific count. Requires that
-you add the target race(s) to a watch list. Only tame units will be processed.
-
-Units will be ignored if they are:
-
-* Nicknamed (for custom protection; you can use the `rename` ``unit`` tool
-  individually, or `zone` ``nick`` for groups)
-* Caged, if and only if the cage is defined as a room (to protect zoos)
-* Trained for war or hunting
-
-Creatures who will not reproduce (because they're not interested in the
-opposite sex or have been gelded) will be butchered before those who will.
-Older adults and younger children will be butchered first if the population
-is above the target (default 1 male, 5 female kids and adults).  Note that
-you may need to set a target above 1 to have a reliable breeding population
-due to asexuality etc.  See `fix-ster` if this is a problem.
-
-Options:
-
-:example:      Print some usage examples.
-:start:        Start running every X frames (df simulation ticks).
-               Default: X=6000, which would be every 60 seconds at 100fps.
-:stop:         Stop running automatically.
-:sleep <x>:    Changes the timer to sleep X frames between runs.
-:watch R:      Start watching a race. R can be a valid race RAW id (ALPACA,
-               BIRD_TURKEY, etc) or a list of ids seperated by spaces or
-               the keyword 'all' which affects all races on your current
-               watchlist.
-:unwatch R:    Stop watching race(s). The current target settings will be
-               remembered. R can be a list of ids or the keyword 'all'.
-:forget R:     Stop watching race(s) and forget it's/their target settings.
-               R can be a list of ids or the keyword 'all'.
-:autowatch:    Automatically adds all new races (animals you buy from merchants,
-               tame yourself or get from migrants) to the watch list using
-               default target count.
-:noautowatch:  Stop auto-adding new races to the watchlist.
-:list:         Print the current status and watchlist.
-:list_export:  Print the commands needed to set up status and watchlist,
-               which can be used to import them to another save (see notes).
-:target <fk> <mk> <fa> <ma> <R>:
-               Set target count for specified race(s).  The first four arguments
-               are the number of female and male kids, and female and male adults.
-               R can be a list of spceies ids, or the keyword ``all`` or ``new``.
-               ``R = 'all'``: change target count for all races on watchlist
-               and set the new default for the future. ``R = 'new'``: don't touch
-               current settings on the watchlist, only set the new default
-               for future entries.
-:list_export:  Print the commands required to rebuild your current settings.
-
-.. note::
-
-    Settings and watchlist are stored in the savegame, so that you can have
-    different settings for each save. If you want to copy your watchlist to
-    another savegame you must export the commands required to recreate your settings.
-
-    To export, open an external terminal in the DF directory, and run
-    ``dfhack-run autobutcher list_export > filename.txt``.  To import, load your
-    new save and run ``script filename.txt`` in the DFHack terminal.
-
-
-Examples:
-
-You want to keep max 7 kids (4 female, 3 male) and max 3 adults (2 female,
-1 male) of the race alpaca. Once the kids grow up the oldest adults will get
-slaughtered. Excess kids will get slaughtered starting with the youngest
-to allow that the older ones grow into adults. Any unnamed cats will
-be slaughtered as soon as possible. ::
-
-     autobutcher target 4 3 2 1 ALPACA BIRD_TURKEY
-     autobutcher target 0 0 0 0 CAT
-     autobutcher watch ALPACA BIRD_TURKEY CAT
-     autobutcher start
-
-Automatically put all new races onto the watchlist and mark unnamed tame units
-for slaughter as soon as they arrive in your fort. Settings already made
-for specific races will be left untouched. ::
-
-     autobutcher target 0 0 0 0 new
-     autobutcher autowatch
-     autobutcher start
-
-Stop watching the races alpaca and cat, but remember the target count
-settings so that you can use 'unwatch' without the need to enter the
-values again. Note: 'autobutcher unwatch all' works, but only makes sense
-if you want to keep the plugin running with the 'autowatch' feature or manually
-add some new races with 'watch'. If you simply want to stop it completely use
-'autobutcher stop' instead. ::
-
-    autobutcher unwatch ALPACA CAT
-
-.. _autochop:
-
-autochop
-========
-Automatically manage tree cutting designation to keep available logs withing given
-quotas.
-
-Open the dashboard by running::
-
-    enable autochop
-
-The plugin must be activated (with :kbd:`d`-:kbd:`t`-:kbd:`c`-:kbd:`a`) before
-it can be used. You can then set logging quotas and restrict designations to
-specific burrows (with 'Enter') if desired. The plugin's activity cycle runs
-once every in game day.
-
-If you add ``enable autochop`` to your dfhack.init there will be a hotkey to
-open the dashboard from the chop designation menu.
-
-.. _autoclothing:
-
-autoclothing
-============
-
-Automatically manage clothing work orders, allowing the user to set how many of
-each clothing type every citizen should have. Usage::
-
-    autoclothing <material> <item> [number]
-
-Examples:
-
-* ``autoclothing cloth "short skirt" 10``:
-    Sets the desired number of cloth short skirts available per citizen to 10.
-* ``autoclothing cloth dress``:
-    Displays the currently set number of cloth dresses chosen per citizen.
-
-.. _autodump:
-
-autodump
-========
-This plugin adds an option to the :kbd:`q` menu for stckpiles when `enabled <enable>`.
-When autodump is enabled for a stockpile, any items placed in the stockpile will
-automatically be designated to be dumped.
-
-Alternatively, you can use it to quickly move all items designated to be dumped.
-Items are instantly moved to the cursor position, the dump flag is unset,
-and the forbid flag is set, as if it had been dumped normally.
-Be aware that any active dump item tasks still point at the item.
-
-Cursor must be placed on a floor tile so the items can be dumped there.
-
-Options:
-
-:destroy:            Destroy instead of dumping. Doesn't require a cursor.
-                     If called again before the game is resumed, cancels destroy.
-:destroy-here:       As ``destroy``, but only the selected item in the :kbd:`k` list,
-                     or inside a container.
-                     Alias ``autodump-destroy-here``, for keybindings.
-                     :dfhack-keybind:`autodump-destroy-here`
-:visible:            Only process items that are not hidden.
-:hidden:             Only process hidden items.
-:forbidden:          Only process forbidden items (default: only unforbidden).
-
-``autodump-destroy-item`` destroys the selected item, which may be selected
-in the :kbd:`k` list, or inside a container. If called again before the game
-is resumed, cancels destruction of the item.
-:dfhack-keybind:`autodump-destroy-item`
-
-.. _autofarm:
-
-autofarm
-========
-
-Automatically handles crop selection in farm plots based on current plant
-stocks, and selects crops for planting if current stock is below a threshold.
-Selected crops are dispatched on all farmplots. (Note that this plugin replaces
-an older Ruby script of the same name.)
-
-Use the `enable` or `disable <disable>` commands to change whether this plugin is
-enabled.
-
-Usage:
-
-* ``autofarm runonce``:
-    Updates all farm plots once, without enabling the plugin
-* ``autofarm status``:
-    Prints status information, including any applied limits
-* ``autofarm default 30``:
-    Sets the default threshold
-* ``autofarm threshold 150 helmet_plump tail_pig``:
-    Sets thresholds of individual plants
-
-.. _autogems:
-
-autogems
-========
-Creates a new Workshop Order setting, automatically cutting rough gems
-when `enabled <enable>`.
-
-See `gui/autogems` for a configuration UI. If necessary, the ``autogems-reload``
-command reloads the configuration file produced by that script.
-
-.. _autohauler:
-
-autohauler
-==========
-Autohauler is an autolabor fork.
-
-Rather than the all-of-the-above means of autolabor, autohauler will instead
-only manage hauling labors and leave skilled labors entirely to the user, who
-will probably use Dwarf Therapist to do so.
-
-Idle dwarves will be assigned the hauling labors; everyone else (including
-those currently hauling) will have the hauling labors removed. This is to
-encourage every dwarf to do their assigned skilled labors whenever possible,
-but resort to hauling when those jobs are not available. This also implies
-that the user will have a very tight skill assignment, with most skilled
-labors only being assigned to just one dwarf, no dwarf having more than two
-active skilled labors, and almost every non-military dwarf having at least
-one skilled labor assigned.
-
-Autohauler allows skills to be flagged as to prevent hauling labors from
-being assigned when the skill is present. By default this is the unused
-ALCHEMIST labor but can be changed by the user.
-
-.. _autolabor:
-
-autolabor
-=========
-Automatically manage dwarf labors to efficiently complete jobs.
-Autolabor tries to keep as many dwarves as possible busy but
-also tries to have dwarves specialize in specific skills.
-
-The key is that, for almost all labors, once a dwarf begins a job it will finish that
-job even if the associated labor is removed. Autolabor therefore frequently checks
-which dwarf or dwarves should take new jobs for that labor, and sets labors accordingly.
-Labors with equipment (mining, hunting, and woodcutting), which are abandoned
-if labors change mid-job, are handled slightly differently to minimise churn.
-
-.. warning::
-
-    *autolabor will override any manual changes you make to labors while
-    it is enabled, including through other tools such as Dwarf Therapist*
-
-Simple usage:
-
-:enable autolabor:      Enables the plugin with default settings.  (Persistent per fortress)
-:disable autolabor:     Disables the plugin.
-
-Anything beyond this is optional - autolabor works well on the default settings.
-
-By default, each labor is assigned to between 1 and 200 dwarves (2-200 for mining).
-By default 33% of the workforce become haulers, who handle all hauling jobs as well
-as cleaning, pulling levers, recovering wounded, removing constructions, and filling ponds.
-Other jobs are automatically assigned as described above.  Each of these settings can be adjusted.
-
-Jobs are rarely assigned to nobles with responsibilities for meeting diplomats or merchants,
-never to the chief medical dwarf, and less often to the bookeeper and manager.
-
-Hunting is never assigned without a butchery, and fishing is never assigned without a fishery.
-
-For each labor a preference order is calculated based on skill, biased against masters of other
-trades and excluding those who can't do the job.  The labor is then added to the best <minimum>
-dwarves for that labor.  We assign at least the minimum number of dwarfs, in order of preference,
-and then assign additional dwarfs that meet any of these conditions:
-
-* The dwarf is idle and there are no idle dwarves assigned to this labor
-* The dwarf has non-zero skill associated with the labor
-* The labor is mining, hunting, or woodcutting and the dwarf currently has it enabled.
-
-We stop assigning dwarfs when we reach the maximum allowed.
-
-Advanced usage:
-
-:autolabor <labor> <minimum> [<maximum>]:
-                                Set number of dwarves assigned to a labor.
-:autolabor <labor> haulers:     Set a labor to be handled by hauler dwarves.
-:autolabor <labor> disable:     Turn off autolabor for a specific labor.
-:autolabor <labor> reset:       Return a labor to the default handling.
-:autolabor reset-all:           Return all labors to the default handling.
-:autolabor list:                List current status of all labors.
-:autolabor status:              Show basic status information.
-
-See `autolabor-artisans` for a differently-tuned setup.
-
-Examples:
-
-``autolabor MINE``
-        Keep at least 5 dwarves with mining enabled.
-``autolabor CUT_GEM 1 1``
-        Keep exactly 1 dwarf with gemcutting enabled.
-``autolabor COOK 1 1 3``
-        Keep 1 dwarf with cooking enabled, selected only from the top 3.
-``autolabor FEED_WATER_CIVILIANS haulers``
-        Have haulers feed and water wounded dwarves.
-``autolabor CUTWOOD disable``
-        Turn off autolabor for wood cutting.
-
-.. _autonestbox:
-
-autonestbox
-===========
-Assigns unpastured female egg-layers to nestbox zones. Requires that you create
-pen/pasture zones above nestboxes. If the pen is bigger than 1x1 the nestbox
-must be in the top left corner. Only 1 unit will be assigned per pen, regardless
-of the size. The age of the units is currently not checked, most birds grow up
-quite fast. Egglayers who are also grazers will be ignored, since confining them
-to a 1x1 pasture is not a good idea. Only tame and domesticated own units are
-processed since pasturing half-trained wild egglayers could destroy your neat
-nestbox zones when they revert to wild. When called without options autonestbox
-will instantly run once.
-
-Options:
-
-:start:        Start running every X frames (df simulation ticks).
-               Default: X=6000, which would be every 60 seconds at 100fps.
-:stop:         Stop running automatically.
-:sleep:        Must be followed by number X. Changes the timer to sleep X
-               frames between runs.
-
-.. _clean:
-
-clean
-=====
-Cleans all the splatter that get scattered all over the map, items and
-creatures. In an old fortress, this can significantly reduce FPS lag. It can
-also spoil your !!FUN!!, so think before you use it.
-
-Options:
-
-:map:          Clean the map tiles. By default, it leaves mud and snow alone.
-:units:        Clean the creatures. Will also clean hostiles.
-:items:        Clean all the items. Even a poisoned blade.
-
-Extra options for ``map``:
-
-:mud:          Remove mud in addition to the normal stuff.
-:snow:         Also remove snow coverings.
-
-.. _cleanowned:
-
-cleanowned
-==========
-Confiscates items owned by dwarfs. By default, owned food on the floor
-and rotten items are confistacted and dumped.
-
-Options:
-
-:all:          confiscate all owned items
-:scattered:    confiscated and dump all items scattered on the floor
-:x:            confiscate/dump items with wear level 'x' and more
-:X:            confiscate/dump items with wear level 'X' and more
-:dryrun:       a dry run. combine with other options to see what will happen
-               without it actually happening.
-
-Example:
-
-``cleanowned scattered X``
-    This will confiscate rotten and dropped food, garbage on the floors and any
-    worn items with 'X' damage and above.
-
-.. _dwarfmonitor:
-
-dwarfmonitor
-============
-Records dwarf activity to measure fort efficiency.
-
-Options:
-
-:enable <mode>:     Start monitoring ``mode``. ``mode`` can be "work", "misery",
-                    "weather", or "all".  This will enable all corresponding widgets,
-                    if applicable.
-:disable <mode>:    Stop monitoring ``mode``, and disable corresponding widgets, if applicable.
-:stats:             Show statistics summary
-:prefs:             Show dwarf preferences summary
-:reload:            Reload configuration file (``dfhack-config/dwarfmonitor.json``)
-
-:dfhack-keybind:`dwarfmonitor`
-
-Widget configuration:
-
-The following types of widgets (defined in :file:`hack/lua/plugins/dwarfmonitor.lua`)
-can be displayed on the main fortress mode screen:
-
-:date:      Show the in-game date
-:misery:    Show overall happiness levels of all dwarves
-:weather:   Show current weather (rain/snow)
-:cursor:    Show the current mouse cursor position
-
-The file :file:`dfhack-config/dwarfmonitor.json` can be edited to control the
-positions and settings of all widgets displayed. This file should contain a
-JSON object with the key ``widgets`` containing an array of objects - see the
-included file in the ``dfhack-config`` folder for an example:
-
-.. code-block:: lua
-
-    {
-        "widgets": [
-            {
-                "type": "widget type (weather, misery, etc.)",
-                "x": X coordinate,
-                "y": Y coordinate
-                <...additional options...>
-            }
-        ]
-    }
-
-X and Y coordinates begin at zero (in the upper left corner of the screen).
-Negative coordinates will be treated as distances from the lower right corner,
-beginning at 1 - e.g. an x coordinate of 0 is the leftmost column, while an x
-coordinate of 1 is the rightmost column.
-
-By default, the x and y coordinates given correspond to the leftmost tile of
-the widget. Including an ``anchor`` option set to ``right`` will cause the
-rightmost tile of the widget to be located at this position instead.
-
-Some widgets support additional options:
-
-* ``date`` widget:
-
-  * ``format``: specifies the format of the date. The following characters
-    are replaced (all others, such as punctuation, are not modified)
-
-    * ``Y`` or ``y``: The current year
-    * ``M``: The current month, zero-padded if necessary
-    * ``m``: The current month, *not* zero-padded
-    * ``D``: The current day, zero-padded if necessary
-    * ``d``: The current day, *not* zero-padded
-
-    The default date format is ``Y-M-D``, per the ISO8601_ standard.
-
-    .. _ISO8601: https://en.wikipedia.org/wiki/ISO_8601
-
-* ``cursor`` widget:
-
-  * ``format``: Specifies the format. ``X``, ``x``, ``Y``, and ``y`` are
-    replaced with the corresponding cursor cordinates, while all other
-    characters are unmodified.
-  * ``show_invalid``: If set to ``true``, the mouse coordinates will both be
-    displayed as ``-1`` when the cursor is outside of the DF window; otherwise,
-    nothing will be displayed.
-
-.. _dwarfvet:
-
-dwarfvet
-========
-Enables Animal Caretaker functionality
-
-Always annoyed your dragons become useless after a minor injury? Well, with
-dwarfvet, your animals become first rate members of your fort. It can also
-be used to train medical skills.
-
-Animals need to be treated in an animal hospital, which is simply a hospital
-that is also an animal training zone. The console will print out a list on game
-load, and whenever one is added or removed. Dwarfs must have the Animal Caretaker
-labor to treat animals. Normal medical skills are used (and no experience is given
-to the Animal Caretaker skill).
-
-Options:
-
-:enable:        Enables Animal Caretakers to treat and manage animals
-:disable:       Turns off the plguin
-:report:        Reports all zones that the game considers animal hospitals
-
-.. _fix-job-postings:
-
-fix-job-postings
-----------------
-This command fixes crashes caused by previous versions of workflow, mostly in
-DFHack 0.40.24-r4, and should be run automatically when loading a world (but can
-also be run manually if desired).
-
-.. _job:
-
-job
-===
-Command for general job query and manipulation.
-
-Options:
-
-*no extra options*
-    Print details of the current job. The job can be selected
-    in a workshop, or the unit/jobs screen.
-**list**
-    Print details of all jobs in the selected workshop.
-**item-material <item-idx> <material[:subtoken]>**
-    Replace the exact material id in the job item.
-**item-type <item-idx> <type[:subtype]>**
-    Replace the exact item type id in the job item.
-
-.. _job-duplicate:
-
-job-duplicate
-=============
-In :kbd:`q` mode, when a job is highlighted within a workshop or furnace
-building, calling ``job-duplicate`` instantly duplicates the job.
-
-:dfhack-keybind:`job-duplicate`
-
-.. _job-material:
-
-job-material
-============
-Alter the material of the selected job.  Similar to ``job item-material ...``
-
-Invoked as::
-
-    job-material <inorganic-token>
-
-:dfhack-keybind:`job-material`
-
-* In :kbd:`q` mode, when a job is highlighted within a workshop or furnace,
-  changes the material of the job. Only inorganic materials can be used
-  in this mode.
-* In :kbd:`b` mode, during selection of building components positions the cursor
-  over the first available choice with the matching material.
-
-.. _labormanager:
-
-labormanager
-============
-Automatically manage dwarf labors to efficiently complete jobs.
-Labormanager is derived from autolabor (above) but uses a completely
-different approach to assigning jobs to dwarves. While autolabor tries
-to keep as many dwarves busy as possible, labormanager instead strives
-to get jobs done as quickly as possible.
-
-Labormanager frequently scans the current job list, current list of
-dwarfs, and the map to determine how many dwarves need to be assigned to
-what labors in order to meet all current labor needs without starving
-any particular type of job.
-
-.. warning::
-
-    *As with autolabor, labormanager will override any manual changes you
-    make to labors while it is enabled, including through other tools such
-    as Dwarf Therapist*
-
-Simple usage:
-
-:enable labormanager: Enables the plugin with default settings.
-    (Persistent per fortress)
-
-:disable labormanager: Disables the plugin.
-
-Anything beyond this is optional - labormanager works fairly well on the
-default settings.
-
-The default priorities for each labor vary (some labors are higher
-priority by default than others). The way the plugin works is that, once
-it determines how many of each labor is needed, it then sorts them by
-adjusted priority. (Labors other than hauling have a bias added to them
-based on how long it's been since they were last used, to prevent job
-starvation.) The labor with the highest priority is selected, the "best
-fit" dwarf for that labor is assigned to that labor, and then its
-priority is *halved*. This process is repeated until either dwarfs or
-labors run out.
-
-Because there is no easy way to detect how many haulers are actually
-needed at any moment, the plugin always ensures that at least one dwarf
-is assigned to each of the hauling labors, even if no hauling jobs are
-detected. At least one dwarf is always assigned to construction removing
-and cleaning because these jobs also cannot be easily detected. Lever
-pulling is always assigned to everyone. Any dwarfs for which there are
-no jobs will be assigned hauling, lever pulling, and cleaning labors. If
-you use animal trainers, note that labormanager will misbehave if you
-assign specific trainers to specific animals; results are only guaranteed
-if you use "any trainer", and animal trainers will probably be
-overallocated in any case.
-
-Labormanager also sometimes assigns extra labors to currently busy
-dwarfs so that when they finish their current job, they will go off and
-do something useful instead of standing around waiting for a job.
-
-There is special handling to ensure that at least one dwarf is assigned
-to haul food whenever food is detected left in a place where it will rot
-if not stored. This will cause a dwarf to go idle if you have no
-storepiles to haul food to.
-
-Dwarfs who are unable to work (child, in the military, wounded,
-handless, asleep, in a meeting) are entirely excluded from labor
-assignment. Any dwarf explicitly assigned to a burrow will also be
-completely ignored by labormanager.
-
-The fitness algorithm for assigning jobs to dwarfs generally attempts to
-favor dwarfs who are more skilled over those who are less skilled. It
-also tries to avoid assigning female dwarfs with children to jobs that
-are "outside", favors assigning "outside" jobs to dwarfs who are
-carrying a tool that could be used as a weapon, and tries to minimize
-how often dwarfs have to reequip.
-
-Labormanager automatically determines medical needs and reserves health
-care providers as needed. Note that this may cause idling if you have
-injured dwarfs but no or inadequate hospital facilities.
-
-Hunting is never assigned without a butchery, and fishing is never
-assigned without a fishery, and neither of these labors is assigned
-unless specifically enabled.
-
-The method by which labormanager determines what labor is needed for a
-particular job is complicated and, in places, incomplete. In some
-situations, labormanager will detect that it cannot determine what labor
-is required. It will, by default, pause and print an error message on
-the dfhack console, followed by the message "LABORMANAGER: Game paused
-so you can investigate the above message.". If this happens, please open
-an issue on github, reporting the lines that immediately preceded this
-message. You can tell labormanager to ignore this error and carry on by
-typing ``labormanager pause-on-error no``, but be warned that some job may go
-undone in this situation.
-
-Advanced usage:
-
-:labormanager enable:                      Turn plugin on.
-:labormanager disable:                     Turn plugin off.
-:labormanager priority <labor> <value>:    Set the priority value (see above) for labor <labor> to <value>.
-:labormanager reset <labor>:               Reset the priority value of labor <labor> to its default.
-:labormanager reset-all:                   Reset all priority values to their defaults.
-:labormanager allow-fishing:               Allow dwarfs to fish. *Warning* This tends to result in most of the fort going fishing.
-:labormanager forbid-fishing:              Forbid dwarfs from fishing. Default behavior.
-:labormanager allow-hunting:               Allow dwarfs to hunt. *Warning* This tends to result in as many dwarfs going hunting as you have crossbows.
-:labormanager forbid-hunting:              Forbid dwarfs from hunting. Default behavior.
-:labormanager list:                        Show current priorities and current allocation stats.
-:labormanager pause-on-error yes:          Make labormanager pause if the labor inference engine fails. See above.
-:labormanager pause-on-error no:           Allow labormanager to continue past a labor inference engine failure.
-
-.. _nestboxes:
-
-nestboxes
-=========
-
-Automatically scan for and forbid fertile eggs incubating in a nestbox.
-Toggle status with `enable` or `disable <disable>`.
-
-.. _orders:
-
-orders
-======
-
-A plugin for manipulating manager orders.
-
-Subcommands:
-
-:list: Shows the list of previously exported orders, including the orders library.
-:export NAME: Exports the current list of manager orders to a file named ``dfhack-config/orders/NAME.json``.
-:import NAME: Imports manager orders from a file named ``dfhack-config/orders/NAME.json``.
-:clear: Deletes all manager orders in the current embark.
-:sort: Sorts current manager orders by repeat frequency so daily orders don't
-    prevent other orders from ever being completed: one-time orders first, then
-    yearly, seasonally, monthly, then finally daily.
-
-You can keep your orders automatically sorted by adding the following command to
-your ``onMapLoad.init`` file::
-
-    repeat -name orders-sort -time 1 -timeUnits days -command [ orders sort ]
-
-
-The orders library
-------------------
-
-DFHack comes with a library of useful manager orders that are ready for import:
-
-:source:`basic.json <data/orders/basic.json>`
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-This collection of orders handles basic fort necessities:
-
-- prepared meals and food products (and by-products like oil)
-- booze/mead
-- thread/cloth/dye
-- pots/jugs/buckets/mugs
-- bags of leather, cloth, silk, and yarn
-- crafts and totems from otherwise unusable by-products
-- mechanisms/cages
-- splints/crutches
-- lye/soap
-- ash/potash
-- beds/wheelbarrows/minecarts
-- scrolls
-
-You should import it as soon as you have enough dwarves to perform the tasks.
-Right after the first migration wave is usually a good time.
-
-:source:`furnace.json <data/orders/furnace.json>`
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-This collection creates basic items that require heat. It is separated out from
-``basic.json`` to give players the opportunity to set up magma furnaces first in
-order to save resources. It handles:
-
-- charcoal (including smelting of bituminous coal and lignite)
-- pearlash
-- sand
-- green/clear/crystal glass
-- adamantine processing
-- item melting
-
-Orders are missing for plaster powder until DF :bug:`11803` is fixed.
-
-:source:`military.json <data/orders/military.json>`
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-This collection adds high-volume smelting jobs for military-grade metal ores and
-produces weapons and armor:
-
-- leather backpacks/waterskins/cloaks/quivers/armor
-- bone/wooden bolts
-- smelting for platinum, silver, steel, bronze, bismuth bronze, and copper (and
-  their dependencies)
-- bronze/bismuth bronze/copper bolts
-- platinum/silver/steel/iron/bismuth bronze/bronze/copper weapons and armor,
-  with checks to ensure only the best available materials are being used
-
-If you set a stockpile to take weapons and armor of less than masterwork quality
-and turn on `automelt` (like what `dreamfort` provides on its industry level),
-these orders will automatically upgrade your military equipment to masterwork.
-Make sure you have a lot of fuel (or magma forges and furnaces) before you turn
-``automelt`` on, though!
-
-This file should only be imported, of course, if you need to equip a military.
-
-:source:`smelting.json <data/orders/smelting.json>`
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-This collection adds smelting jobs for all ores. It includes handling the ores
-already managed by ``military.json``, but has lower limits. This ensures all
-ores will be covered if a player imports ``smelting`` but not ``military``, but
-the higher-volume ``military`` orders will take priority if both are imported.
-
-:source:`rockstock.json <data/orders/rockstock.json>`
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-This collection of orders keeps a small stock of all types of rock furniture.
-This allows you to do ad-hoc furnishings of guildhalls, libraries, temples, or
-other rooms with `buildingplan` and your masons will make sure there is always
-stock on hand to fulfill the plans.
-
-:source:`glassstock.json <data/orders/glassstock.json>`
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-Similar to ``rockstock`` above, this collection keeps a small stock of all types
-of glass furniture. If you have a functioning glass industry, this is more
-sustainable than ``rockstock`` since you can never run out of sand. If you have
-plenty of rock and just want the variety, you can import both ``rockstock`` and
-``glassstock`` to get a mixture of rock and glass furnishings in your fort.
-
-There are a few items that ``glassstock`` produces that ``rockstock`` does not,
-since there are some items that can not be made out of rock, for example:
-
-- tubes and corkscrews for building magma-safe screw pumps
-- windows
-- terrariums (as an alternative to wooden cages)
-
-.. _seedwatch:
-
-seedwatch
-=========
-Watches the numbers of seeds available and enables/disables seed and plant cooking.
-
-Each plant type can be assigned a limit. If their number falls below that limit,
-the plants and seeds of that type will be excluded from cookery.
-If the number rises above the limit + 20, then cooking will be allowed.
-
-The plugin needs a fortress to be loaded and will deactivate automatically otherwise.
-You have to reactivate with 'seedwatch start' after you load the game.
-
-Options:
-
-:all:       Adds all plants from the abbreviation list to the watch list.
-:start:     Start watching.
-:stop:      Stop watching.
-:info:      Display whether seedwatch is watching, and the watch list.
-:clear:     Clears the watch list.
-
-Examples:
-
-``seedwatch MUSHROOM_HELMET_PLUMP 30``
-    add ``MUSHROOM_HELMET_PLUMP`` to the watch list, limit = 30
-``seedwatch MUSHROOM_HELMET_PLUMP``
-    removes ``MUSHROOM_HELMET_PLUMP`` from the watch list.
-``seedwatch all 30``
-    adds all plants from the abbreviation list to the watch list, the limit being 30.
-
-.. _spotclean:
-
-spotclean
-=========
-Works like ``clean map snow mud``, but only for the tile under the cursor. Ideal
-if you want to keep that bloody entrance ``clean map`` would clean up.
-
-:dfhack-keybind:`spotclean`
-
-.. _stockflow:
-
-stockflow
-=========
-Allows the fortress bookkeeper to queue jobs through the manager,
-based on space or items available in stockpiles.
-
-Inspired by `workflow`.
-
-Usage:
-
-``stockflow enable``
-    Enable the plugin.
-``stockflow disable``
-    Disable the plugin.
-``stockflow fast``
-    Enable the plugin in fast mode.
-``stockflow list``
-    List any work order settings for your stockpiles.
-``stockflow status``
-    Display whether the plugin is enabled.
-
-While enabled, the :kbd:`q` menu of each stockpile will have two new options:
-
-* :kbd:`j`:  Select a job to order, from an interface like the manager's screen.
-* :kbd:`J`:  Cycle between several options for how many such jobs to order.
-
-Whenever the bookkeeper updates stockpile records, new work orders will
-be placed on the manager's queue for each such selection, reduced by the
-number of identical orders already in the queue.
-
-In fast mode, new work orders will be enqueued once per day, instead of
-waiting for the bookkeeper.
-
-.. _tailor:
-
-tailor
-======
-
-Whenever the bookkeeper updates stockpile records, this plugin will scan every unit in the fort,
-count up the number that are worn, and then order enough more made to replace all worn items.
-If there are enough replacement items in inventory to replace all worn items, the units wearing them
-will have the worn items confiscated (in the same manner as the `cleanowned` plugin) so that they'll
-reeequip with replacement items.
-
-Use the `enable` and `disable <disable>` commands to toggle this plugin's status, or run
-``tailor status`` to check its current status.
-
-.. _workflow:
-
-workflow
-========
-Manage control of repeat jobs.  `gui/workflow` provides a simple
-front-end integrated in the game UI.
-
-Usage:
-
-``workflow enable [option...], workflow disable [option...]``
-   If no options are specified, enables or disables the plugin.
-   Otherwise, enables or disables any of the following options:
-
-   - drybuckets: Automatically empty abandoned water buckets.
-   - auto-melt: Resume melt jobs when there are objects to melt.
-``workflow jobs``
-   List workflow-controlled jobs (if in a workshop, filtered by it).
-``workflow list``
-   List active constraints, and their job counts.
-``workflow list-commands``
-   List active constraints as workflow commands that re-create them;
-   this list can be copied to a file, and then reloaded using the
-   ``script`` built-in command.
-``workflow count <constraint-spec> <cnt-limit> [cnt-gap]``
-   Set a constraint, counting every stack as 1 item.
-``workflow amount <constraint-spec> <cnt-limit> [cnt-gap]``
-   Set a constraint, counting all items within stacks.
-``workflow unlimit <constraint-spec>``
-   Delete a constraint.
-``workflow unlimit-all``
-   Delete all constraints.
-
-Function
---------
-When the plugin is enabled, it protects all repeat jobs from removal.
-If they do disappear due to any cause, they are immediately re-added to their
-workshop and suspended.
-
-In addition, when any constraints on item amounts are set, repeat jobs that
-produce that kind of item are automatically suspended and resumed as the item
-amount goes above or below the limit. The gap specifies how much below the limit
-the amount has to drop before jobs are resumed; this is intended to reduce
-the frequency of jobs being toggled.
-
-Constraint format
------------------
-The constraint spec consists of 4 parts, separated with ``/`` characters::
-
-    ITEM[:SUBTYPE]/[GENERIC_MAT,...]/[SPECIFIC_MAT:...]/[LOCAL,<quality>]
-
-The first part is mandatory and specifies the item type and subtype,
-using the raw tokens for items (the same syntax used custom reaction inputs).
-For more information, see :wiki:`this wiki page <Material_token>`.
-
-The subsequent parts are optional:
-
-- A generic material spec constrains the item material to one of
-  the hard-coded generic classes, which currently include::
-
-    PLANT WOOD CLOTH SILK LEATHER BONE SHELL SOAP TOOTH HORN PEARL YARN
-    METAL STONE SAND GLASS CLAY MILK
-
-- A specific material spec chooses the material exactly, using the
-  raw syntax for reaction input materials, e.g. ``INORGANIC:IRON``,
-  although for convenience it also allows just ``IRON``, or ``ACACIA:WOOD`` etc.
-  See the link above for more details on the unabbreviated raw syntax.
-
-- A comma-separated list of miscellaneous flags, which currently can
-  be used to ignore imported items or items below a certain quality.
-
-Constraint examples
--------------------
-Keep metal bolts within 900-1000, and wood/bone within 150-200::
-
-    workflow amount AMMO:ITEM_AMMO_BOLTS/METAL 1000 100
-    workflow amount AMMO:ITEM_AMMO_BOLTS/WOOD,BONE 200 50
-
-Keep the number of prepared food & drink stacks between 90 and 120::
-
-    workflow count FOOD 120 30
-    workflow count DRINK 120 30
-
-Make sure there are always 25-30 empty bins/barrels/bags::
-
-    workflow count BIN 30
-    workflow count BARREL 30
-    workflow count BOX/CLOTH,SILK,YARN 30
-
-Make sure there are always 15-20 coal and 25-30 copper bars::
-
-    workflow count BAR//COAL 20
-    workflow count BAR//COPPER 30
-
-Produce 15-20 gold crafts::
-
-    workflow count CRAFTS//GOLD 20
-
-Collect 15-20 sand bags and clay boulders::
-
-    workflow count POWDER_MISC/SAND 20
-    workflow count BOULDER/CLAY 20
-
-Make sure there are always 80-100 units of dimple dye::
-
-    workflow amount POWDER_MISC//MUSHROOM_CUP_DIMPLE:MILL 100 20
-
-.. note::
-
-  In order for this to work, you have to set the material of the PLANT input
-  on the Mill Plants job to MUSHROOM_CUP_DIMPLE using the `job item-material <job>`
-  command. Otherwise the plugin won't be able to deduce the output material.
-
-Maintain 10-100 locally-made crafts of exceptional quality::
-
-    workflow count CRAFTS///LOCAL,EXCEPTIONAL 100 90
-
-.. _workNow:
-
-workNow
-=======
-Don't allow dwarves to idle if any jobs are available.
-
-When workNow is active, every time the game pauses, DF will make dwarves
-perform any appropriate available jobs.  This includes when you one step
-through the game using the pause menu.  Usage:
-
-:workNow:       print workNow status
-:workNow 0:     deactivate workNow
-:workNow 1:     activate workNow (look for jobs on pause, and only then)
-:workNow 2:     make dwarves look for jobs whenever a job completes
-
-.. _zone:
-
-zone
-====
-Helps a bit with managing activity zones (pens, pastures and pits) and cages.
-
-:dfhack-keybind:`zone`
-
-Options:
-
-:set:         Set zone or cage under cursor as default for future assigns.
-:assign:      Assign unit(s) to the pen or pit marked with the 'set' command.
-              If no filters are set a unit must be selected in the in-game ui.
-              Can also be followed by a valid zone id which will be set
-              instead.
-:unassign:    Unassign selected creature from it's zone.
-:nick:        Mass-assign nicknames, must be followed by the name you want
-              to set.
-:remnick:     Mass-remove nicknames.
-:enumnick:    Assign enumerated nicknames (e.g. "Hen 1", "Hen 2"...). Must be
-              followed by the prefix to use in nicknames.
-:tocages:     Assign unit(s) to cages inside a pasture.
-:uinfo:       Print info about unit(s). If no filters are set a unit must
-              be selected in the in-game ui.
-:zinfo:       Print info about zone(s). If no filters are set zones under
-              the cursor are listed.
-:verbose:     Print some more info.
-:filters:     Print list of valid filter options.
-:examples:    Print some usage examples.
-:not:         Negates the next filter keyword.
-
-Filters:
-
-:all:           Process all units (to be used with additional filters).
-:count:         Must be followed by a number. Process only n units (to be used
-                with additional filters).
-:unassigned:    Not assigned to zone, chain or built cage.
-:minage:        Minimum age. Must be followed by number.
-:maxage:        Maximum age. Must be followed by number.
-:race:          Must be followed by a race RAW ID (e.g. BIRD_TURKEY, ALPACA,
-                etc). Negatable.
-:caged:         In a built cage. Negatable.
-:own:           From own civilization. Negatable.
-:merchant:      Is a merchant / belongs to a merchant. Should only be used for
-                pitting, not for stealing animals (slaughter should work).
-:war:           Trained war creature. Negatable.
-:hunting:       Trained hunting creature. Negatable.
-:tamed:         Creature is tame. Negatable.
-:trained:       Creature is trained. Finds war/hunting creatures as well as
-                creatures who have a training level greater than 'domesticated'.
-                If you want to specifically search for war/hunting creatures use
-                'war' or 'hunting' Negatable.
-:trainablewar:  Creature can be trained for war (and is not already trained for
-                war/hunt). Negatable.
-:trainablehunt: Creature can be trained for hunting (and is not already trained
-                for war/hunt). Negatable.
-:male:          Creature is male. Negatable.
-:female:        Creature is female. Negatable.
-:egglayer:      Race lays eggs. Negatable.
-:grazer:        Race is a grazer. Negatable.
-:milkable:      Race is milkable. Negatable.
-
-Usage with single units
------------------------
-One convenient way to use the zone tool is to bind the command 'zone assign' to
-a hotkey, maybe also the command 'zone set'. Place the in-game cursor over
-a pen/pasture or pit, use 'zone set' to mark it. Then you can select units
-on the map (in 'v' or 'k' mode), in the unit list or from inside cages
-and use 'zone assign' to assign them to their new home. Allows pitting your
-own dwarves, by the way.
-
-Usage with filters
-------------------
-All filters can be used together with the 'assign' command.
-
-Restrictions: It's not possible to assign units who are inside built cages
-or chained because in most cases that won't be desirable anyways.
-It's not possible to cage owned pets because in that case the owner
-uncages them after a while which results in infinite hauling back and forth.
-
-Usually you should always use the filter 'own' (which implies tame) unless you
-want to use the zone tool for pitting hostiles. 'own' ignores own dwarves unless
-you specify 'race DWARF' (so it's safe to use 'assign all own' to one big
-pasture if you want to have all your animals at the same place). 'egglayer' and
-'milkable' should be used together with 'female' unless you have a mod with
-egg-laying male elves who give milk or whatever. Merchants and their animals are
-ignored unless you specify 'merchant' (pitting them should be no problem,
-but stealing and pasturing their animals is not a good idea since currently they
-are not properly added to your own stocks; slaughtering them should work).
-
-Most filters can be negated (e.g. 'not grazer' -> race is not a grazer).
-
-Mass-renaming
--------------
-Using the 'nick' command you can set the same nickname for multiple units.
-If used without 'assign', 'all' or 'count' it will rename all units in the
-current default target zone. Combined with 'assign', 'all' or 'count' (and
-further optional filters) it will rename units matching the filter conditions.
-
-Cage zones
-----------
-Using the 'tocages' command you can assign units to a set of cages, for example
-a room next to your butcher shop(s). They will be spread evenly among available
-cages to optimize hauling to and butchering from them. For this to work you need
-to build cages and then place one pen/pasture activity zone above them, covering
-all cages you want to use. Then use 'zone set' (like with 'assign') and use
-'zone tocages filter1 filter2 ...'. 'tocages' overwrites 'assign' because it
-would make no sense, but can be used together with 'nick' or 'remnick' and all
-the usual filters.
-
-Examples
---------
-``zone assign all own ALPACA minage 3 maxage 10``
-   Assign all own alpacas who are between 3 and 10 years old to the selected
-   pasture.
-``zone assign all own caged grazer nick ineedgrass``
-   Assign all own grazers who are sitting in cages on stockpiles (e.g. after
-   buying them from merchants) to the selected pasture and give them
-   the nickname 'ineedgrass'.
-``zone assign all own not grazer not race CAT``
-   Assign all own animals who are not grazers, excluding cats.
-``zone assign count 5 own female milkable``
-   Assign up to 5 own female milkable creatures to the selected pasture.
-``zone assign all own race DWARF maxage 2``
-   Throw all useless kids into a pit :)
-``zone nick donttouchme``
-   Nicknames all units in the current default zone or cage to 'donttouchme'.
-   Mostly intended to be used for special pastures or cages which are not marked
-   as rooms you want to protect from autobutcher.
-``zone tocages count 50 own tame male not grazer``
-   Stuff up to 50 owned tame male animals who are not grazers into cages built
-   on the current default zone.
-
-================
-Map modification
-================
-
-.. contents::
-   :local:
-
-.. _3dveins:
-
-3dveins
-=======
-Removes all existing veins from the map and generates new ones using
-3D Perlin noise, in order to produce a layout that smoothly flows between
-Z levels. The vein distribution is based on the world seed, so running
-the command for the second time should produce no change. It is best to
-run it just once immediately after embark.
-
-This command is intended as only a cosmetic change, so it takes
-care to exactly preserve the mineral counts reported by `prospect` ``all``.
-The amounts of different layer stones may slightly change in some cases
-if vein mass shifts between Z layers.
-
-The only undo option is to restore your save from backup.
-
-.. _alltraffic:
-
-alltraffic
-==========
-Set traffic designations for every single tile of the map - useful for resetting
-traffic designations.  See also `filltraffic`, `restrictice`, and `restrictliquids`.
-
-Options:
-
-:H:     High Traffic
-:N:     Normal Traffic
-:L:     Low Traffic
-:R:     Restricted Traffic
-
-.. _burrows:
-
-burrows
-=======
-Miscellaneous burrow control. Allows manipulating burrows and automated burrow
-expansion while digging.
-
-Options:
-
-:enable feature ...:
-    Enable features of the plugin.
-:disable feature ...:
-    Disable features of the plugin.
-:clear-unit burrow burrow ...:
-    Remove all units from the burrows.
-:clear-tiles burrow burrow ...:
-    Remove all tiles from the burrows.
-:set-units target-burrow src-burrow ...:
-    Clear target, and adds units from source burrows.
-:add-units target-burrow src-burrow ...:
-    Add units from the source burrows to the target.
-:remove-units target-burrow src-burrow ...:
-    Remove units in source burrows from the target.
-:set-tiles target-burrow src-burrow ...:
-    Clear target and adds tiles from the source burrows.
-:add-tiles target-burrow src-burrow ...:
-    Add tiles from the source burrows to the target.
-:remove-tiles target-burrow src-burrow ...:
-    Remove tiles in source burrows from the target.
-
-    For these three options, in place of a source burrow it is
-    possible to use one of the following keywords: ABOVE_GROUND,
-    SUBTERRANEAN, INSIDE, OUTSIDE, LIGHT, DARK, HIDDEN, REVEALED
-
-Features:
-
-:auto-grow: When a wall inside a burrow with a name ending in '+' is dug
-            out, the burrow is extended to newly-revealed adjacent walls.
-            This final '+' may be omitted in burrow name args of commands above.
-            Digging 1-wide corridors with the miner inside the burrow is SLOW.
-
-.. _changeitem:
-
-changeitem
-==========
-Allows changing item material and base quality. By default the item currently
-selected in the UI will be changed (you can select items in the 'k' list
-or inside containers/inventory). By default change is only allowed if materials
-is of the same subtype (for example wood<->wood, stone<->stone etc). But since
-some transformations work pretty well and may be desired you can override this
-with 'force'. Note that some attributes will not be touched, possibly resulting
-in weirdness. To get an idea how the RAW id should look like, check some items
-with 'info'. Using 'force' might create items which are not touched by
-crafters/haulers.
-
-Options:
-
-:info:         Don't change anything, print some info instead.
-:here:         Change all items at the cursor position. Requires in-game cursor.
-:material, m:  Change material. Must be followed by valid material RAW id.
-:quality, q:   Change base quality. Must be followed by number (0-5).
-:force:        Ignore subtypes, force change to new material.
-
-Examples:
-
-``changeitem m INORGANIC:GRANITE here``
-   Change material of all items under the cursor to granite.
-``changeitem q 5``
-   Change currently selected item to masterpiece quality.
-
-.. _changelayer:
-
-changelayer
-===========
-Changes material of the geology layer under cursor to the specified inorganic
-RAW material. Can have impact on all surrounding regions, not only your embark!
-By default changing stone to soil and vice versa is not allowed. By default
-changes only the layer at the cursor position. Note that one layer can stretch
-across lots of z levels. By default changes only the geology which is linked
-to the biome under the cursor. That geology might be linked to other biomes
-as well, though. Mineral veins and gem clusters will stay on the map. Use
-`changevein` for them.
-
-tl;dr: You will end up with changing quite big areas in one go, especially if
-you use it in lower z levels. Use with care.
-
-Options:
-
-:all_biomes:       Change selected layer for all biomes on your map.
-                   Result may be undesirable since the same layer can AND WILL
-                   be on different z-levels for different biomes. Use the tool
-                   'probe' to get an idea how layers and biomes are distributed
-                   on your map.
-:all_layers:       Change all layers on your map (only for the selected biome
-                   unless 'all_biomes' is added).
-                   Candy mountain, anyone? Will make your map quite boring,
-                   but tidy.
-:force:            Allow changing stone to soil and vice versa. !!THIS CAN HAVE
-                   WEIRD EFFECTS, USE WITH CARE!!
-                   Note that soil will not be magically replaced with stone.
-                   You will, however, get a stone floor after digging so it
-                   will allow the floor to be engraved.
-                   Note that stone will not be magically replaced with soil.
-                   You will, however, get a soil floor after digging so it
-                   could be helpful for creating farm plots on maps with no
-                   soil.
-:verbose:          Give some details about what is being changed.
-:trouble:          Give some advice about known problems.
-
-Examples:
-
-``changelayer GRANITE``
-   Convert layer at cursor position into granite.
-``changelayer SILTY_CLAY force``
-   Convert layer at cursor position into clay even if it's stone.
-``changelayer MARBLE all_biomes all_layers``
-   Convert all layers of all biomes which are not soil into marble.
-
-.. note::
-
-    * If you use changelayer and nothing happens, try to pause/unpause the game
-      for a while and try to move the cursor to another tile. Then try again.
-      If that doesn't help try temporarily changing some other layer, undo your
-      changes and try again for the layer you want to change. Saving
-      and reloading your map might also help.
-    * You should be fine if you only change single layers without the use
-      of 'force'. Still it's advisable to save your game before messing with
-      the map.
-    * When you force changelayer to convert soil to stone you might experience
-      weird stuff (flashing tiles, tiles changed all over place etc).
-      Try reverting the changes manually or even better use an older savegame.
-      You did save your game, right?
-
-.. _changevein:
-
-changevein
-==========
-Changes material of the vein under cursor to the specified inorganic RAW
-material. Only affects tiles within the current 16x16 block - for veins and
-large clusters, you will need to use this command multiple times.
-
-Example:
-
-``changevein NATIVE_PLATINUM``
-   Convert vein at cursor position into platinum ore.
-
-.. _cleanconst:
-
-cleanconst
-==========
-Cleans up construction materials.
-
-This utility alters all constructions on the map so that they spawn their
-building component when they are disassembled, allowing their actual
-build items to be safely deleted.  This can improve FPS in extreme situations.
-
-.. _deramp:
-
-deramp
-======
-Removes all ramps designated for removal from the map. This is useful for
-replicating the old channel digging designation.  It also removes any and
-all 'down ramps' that can remain after a cave-in (you don't have to designate
-anything for that to happen).
-
-.. _dig:
-.. _digv:
-.. _digvx:
-.. _digl:
-.. _diglx:
-
-dig
-===
-This plugin makes many automated or complicated dig patterns easy.
-
-Basic commands:
-
-:digv:      Designate all of the selected vein for digging.
-:digvx:     Also cross z-levels, digging stairs as needed.  Alias for ``digv x``.
-:digl:      Like ``digv``, for layer stone.  Also supports an ``undo`` option
-            to remove designations, for if you accidentally set 50 levels at once.
-:diglx:     Also cross z-levels, digging stairs as needed.  Alias for ``digl x``.
-
-:dfhack-keybind:`digv`
-
-.. note::
-
-    All commands implemented by the `dig` plugin (listed by ``ls dig``) support
-    specifying the designation priority with ``-p#``, ``-p #``, or ``p=#``,
-    where ``#`` is a number from 1 to 7. If a priority is not specified, the
-    priority selected in-game is used as the default.
-
-.. _digcircle:
-
-digcircle
-=========
-A command for easy designation of filled and hollow circles.
-It has several types of options.
-
-Shape:
-
-:hollow:   Set the circle to hollow (default)
-:filled:   Set the circle to filled
-:#:        Diameter in tiles (default = 0, does nothing)
-
-Action:
-
-:set:      Set designation (default)
-:unset:    Unset current designation
-:invert:   Invert designations already present
-
-Designation types:
-
-:dig:      Normal digging designation (default)
-:ramp:     Ramp digging
-:ustair:   Staircase up
-:dstair:   Staircase down
-:xstair:   Staircase up/down
-:chan:     Dig channel
-
-After you have set the options, the command called with no options
-repeats with the last selected parameters.
-
-Examples:
-
-``digcircle filled 3``
-        Dig a filled circle with diameter = 3.
-``digcircle``
-        Do it again.
-
-.. _digexp:
-
-digexp
-======
-This command is for :wiki:`exploratory mining <Exploratory_mining>`.
-
-There are two variables that can be set: pattern and filter.
-
-Patterns:
-
-:diag5:            diagonals separated by 5 tiles
-:diag5r:           diag5 rotated 90 degrees
-:ladder:           A 'ladder' pattern
-:ladderr:          ladder rotated 90 degrees
-:clear:            Just remove all dig designations
-:cross:            A cross, exactly in the middle of the map.
-
-Filters:
-
-:all:              designate whole z-level
-:hidden:           designate only hidden tiles of z-level (default)
-:designated:       Take current designation and apply pattern to it.
-
-After you have a pattern set, you can use ``expdig`` to apply it again.
-
-Examples:
-
-``expdig diag5 hidden``
-  Designate the diagonal 5 patter over all hidden tiles
-``expdig``
-  Apply last used pattern and filter
-``expdig ladder designated``
-  Take current designations and replace them with the ladder pattern
-
-.. _digFlood:
-
-digFlood
-========
-Automatically digs out specified veins as they are discovered. It runs once
-every time a dwarf finishes a dig job. It will only dig out appropriate tiles
-that are adjacent to the finished dig job. To add a vein type, use ``digFlood 1 [type]``.
-This will also enable the plugin. To remove a vein type, use ``digFlood 0 [type] 1``
-to disable, then remove, then re-enable.
-
-Usage:
-
-:help digflood:     detailed help message
-:digFlood 0:        disable the plugin
-:digFlood 1:        enable the plugin
-:digFlood 0 MICROCLINE COAL_BITUMINOUS 1:
-                    disable plugin, remove microcline and bituminous coal from monitoring, then re-enable the plugin
-:digFlood CLEAR:    remove all inorganics from monitoring
-:digFlood digAll1:  ignore the monitor list and dig any vein
-:digFlood digAll0:  disable digAll mode
-
-.. _digtype:
-
-digtype
-=======
-For every tile on the map of the same vein type as the selected tile,
-this command designates it to have the same designation as the
-selected tile. If the selected tile has no designation, they will be
-dig designated.
-If an argument is given, the designation of the selected tile is
-ignored, and all appropriate tiles are set to the specified
-designation.
-
-Options:
-
-:dig:
-:channel:
-:ramp:
-:updown: up/down stairs
-:up:     up stairs
-:down:   down stairs
-:clear:  clear designation
-
-.. _filltraffic:
-
-filltraffic
-===========
-Set traffic designations using flood-fill starting at the cursor.
-See also `alltraffic`, `restrictice`, and `restrictliquids`.  Options:
-
-:H:     High Traffic
-:N:     Normal Traffic
-:L:     Low Traffic
-:R:     Restricted Traffic
-:X:     Fill across z-levels.
-:B:     Include buildings and stockpiles.
-:P:     Include empty space.
-
-Example:
-
-``filltraffic H``
-  When used in a room with doors, it will set traffic to HIGH in just that room.
-
-.. _getplants:
-
-getplants
-=========
-This tool allows plant gathering and tree cutting by RAW ID. Specify the types
-of trees to cut down and/or shrubs to gather by their plant names, separated
-by spaces.
-
-Options:
-
-:``-t``: Tree: Select trees only (exclude shrubs)
-:``-s``: Shrub: Select shrubs only (exclude trees)
-:``-f``: Farming: Designate only shrubs that yield seeds for farming. Implies -s
-:``-c``: Clear: Clear designations instead of setting them
-:``-x``: eXcept: Apply selected action to all plants except those specified (invert
-     selection)
-:``-a``: All: Select every type of plant (obeys ``-t``/``-s``/``-f``)
-:``-v``: Verbose: Lists the number of (un)designations per plant
-:``-n *``: Number: Designate up to * (an integer number) plants of each species
-
-Specifying both ``-t`` and ``-s`` or ``-f`` will have no effect. If no plant IDs are
-specified, all valid plant IDs will be listed, with ``-t``, ``-s``, and ``-f``
-restricting the list to trees, shrubs, and farmable shrubs, respectively.
-
-.. note::
-
-    DF is capable of determining that a shrub has already been picked, leaving
-    an unusable structure part behind. This plugin does not perform such a check
-    (as the location of the required information has not yet been identified).
-    This leads to some shrubs being designated when they shouldn't be, causing a
-    plant gatherer to walk there and do nothing (except clearing the
-    designation). See :issue:`1479` for details.
-
-    The implementation another known deficiency: it's incapable of detecting that
-    raw definitions that specify a seed extraction reaction for the structural part
-    but has no other use for it cannot actually yield any seeds, as the part is
-    never used (parts of :bug:`6940`, e.g. Red Spinach), even though DF
-    collects it, unless there's a workshop reaction to do it (which there isn't
-    in vanilla).
-
-.. _infiniteSky:
-
-infiniteSky
-===========
-Automatically allocates new z-levels of sky at the top of the map as you build up,
-or on request allocates many levels all at once.
-
-Usage:
-
-``infiniteSky n``
-  Raise the sky by n z-levels.
-``infiniteSky enable/disable``
-  Enables/disables monitoring of constructions. If you build anything in the second to highest z-level, it will allocate one more sky level. This is so you can continue to build stairs upward.
-
-.. warning::
-
-    :issue:`Sometimes <254>` new z-levels disappear and cause cave-ins.
-    Saving and loading after creating new z-levels should fix the problem.
-
-.. _liquids:
-
-liquids
-=======
-Allows adding magma, water and obsidian to the game. It replaces the normal
-dfhack command line and can't be used from a hotkey. Settings will be remembered
-as long as dfhack runs. Intended for use in combination with the command
-``liquids-here`` (which can be bound to a hotkey).  See also :issue:`80`.
-
-.. warning::
-
-    Spawning and deleting liquids can mess up pathing data and
-    temperatures (creating heat traps). You've been warned.
-
-.. note::
-
-    `gui/liquids` is an in-game UI for this script.
-
-Settings will be remembered until you quit DF. You can call `liquids-here` to execute
-the last configured action, which is useful in combination with keybindings.
-
-Usage: point the DF cursor at a tile you want to modify and use the commands.
-
-If you only want to add or remove water or magma from one tile,
-`source` may be easier to use.
-
-Commands
---------
-Misc commands:
-
-:q:                 quit
-:help, ?:           print this list of commands
-:<empty line>:      put liquid
-
-Modes:
-
-:m:         switch to magma
-:w:         switch to water
-:o:         make obsidian wall instead
-:of:        make obsidian floors
-:rs:        make a river source
-:f:         flow bits only
-:wclean:    remove salt and stagnant flags from tiles
-
-Set-Modes and flow properties (only for magma/water):
-
-:s+:    only add mode
-:s.:    set mode
-:s-:    only remove mode
-:f+:    make the spawned liquid flow
-:f.:    don't change flow state (read state in flow mode)
-:f-:    make the spawned liquid static
-
-Permaflow (only for water):
-
-:pf.:           don't change permaflow state
-:pf-:           make the spawned liquid static
-:pf[NS][EW]:    make the spawned liquid permanently flow
-:0-7:           set liquid amount
-
-Brush size and shape:
-
-:p, point:      Single tile
-:r, range:      Block with cursor at bottom north-west (any place, any size)
-:block:         DF map block with cursor in it (regular spaced 16x16x1 blocks)
-:column:        Column from cursor, up through free space
-:flood:         Flood-fill water tiles from cursor (only makes sense with wclean)
-
-.. _liquids-here:
-
-liquids-here
-------------
-Run the liquid spawner with the current/last settings made in liquids (if no
-settings in liquids were made it paints a point of 7/7 magma by default).
-
-Intended to be used as keybinding. Requires an active in-game cursor.
-
-.. _plant:
-
-plant
-=====
-A tool for creating shrubs, growing, or getting rid of them.
-
-Subcommands:
-
-:create:      Creates a new sapling under the cursor. Takes a raw ID as argument
-              (e.g. TOWER_CAP). The cursor must be located on a dirt or grass floor tile.
-:grow:        Turns saplings into trees; under the cursor if a sapling is selected,
-              or every sapling on the map if the cursor is hidden.
-
-For mass effects, use one of the additional options:
-
-:shrubs:    affect all shrubs on the map
-:trees:     affect all trees on the map
-:all:       affect every plant!
-
-.. _regrass:
-
-regrass
-=======
-Regrows all the grass. Not much to it ;)
-
-.. _restrictice:
-
-restrictice
-===========
-Restrict traffic on all tiles on top of visible ice.
-See also `alltraffic`, `filltraffic`, and `restrictliquids`.
-
-.. _restrictliquids:
-
-restrictliquids
-===============
-Restrict traffic on all visible tiles with liquid.
-See also `alltraffic`, `filltraffic`, and `restrictice`.
-
-.. _tiletypes:
-
-tiletypes
-=========
-Can be used for painting map tiles and is an interactive command, much like
-`liquids`. Some properties of existing tiles can be looked up with `probe`. If
-something goes wrong, `fixveins` may help.
-
-The tool works with two set of options and a brush. The brush determines which
-tiles will be processed. First set of options is the filter, which can exclude
-some of the tiles from the brush by looking at the tile properties. The second
-set of options is the paint - this determines how the selected tiles are
-changed.
-
-Both paint and filter can have many different properties including things like
-general shape (WALL, FLOOR, etc.), general material (SOIL, STONE, MINERAL,
-etc.), state of 'designated', 'hidden' and 'light' flags.
-
-The properties of filter and paint can be partially defined. This means that
-you can for example turn all stone fortifications into floors, preserving the
-material::
-
-        filter material STONE
-        filter shape FORTIFICATION
-        paint shape FLOOR
-
-Or turn mineral vein floors back into walls::
-
-        filter shape FLOOR
-        filter material MINERAL
-        paint shape WALL
-
-The tool also allows tweaking some tile flags::
-
-        paint hidden 1
-        paint hidden 0
-
-This will hide previously revealed tiles (or show hidden with the 0 option).
-
-More recently, the tool supports changing the base material of the tile to
-an arbitrary stone from the raws, by creating new veins as required. Note
-that this mode paints under ice and constructions, instead of overwriting
-them. To enable, use::
-
-        paint stone MICROCLINE
-
-This mode is incompatible with the regular ``material`` setting, so changing
-it cancels the specific stone selection::
-
-        paint material ANY
-
-Since different vein types have different drop rates, it is possible to choose
-which one to use in painting::
-
-        paint veintype CLUSTER_SMALL
-
-When the chosen type is ``CLUSTER`` (the default), the tool may automatically
-choose to use layer stone or lava stone instead of veins if its material matches
-the desired one.
-
-Any paint or filter option (or the entire paint or filter) can be disabled entirely by using the ANY keyword::
-
-        paint hidden ANY
-        paint shape ANY
-        filter material any
-        filter shape any
-        filter any
-
-You can use several different brushes for painting tiles:
-
-:point:     a single tile
-:range:     a rectangular range
-:column:    a column ranging from current cursor to the first solid tile above
-:block:     a DF map block - 16x16 tiles, in a regular grid
-
-Example::
-
-    range 10 10 1
-
-This will change the brush to a rectangle spanning 10x10 tiles on one z-level.
-The range starts at the position of the cursor and goes to the east, south and
-up.
-
-For more details, use ``tiletypes help``.
-
-.. _tiletypes-command:
-
-tiletypes-command
------------------
-Runs tiletypes commands, separated by ``;``. This makes it possible to change
-tiletypes modes from a hotkey or via dfhack-run.
-
-Example::
-
-    tiletypes-command p any ; p s wall ; p sp normal
-
-This resets the paint filter to unsmoothed walls.
-
-.. _tiletypes-here:
-
-tiletypes-here
---------------
-Apply the current tiletypes options at the in-game cursor position, including
-the brush. Can be used from a hotkey.
-
-Options:
-
-:``-c``, ``--cursor <x>,<y>,<z>``:
-    Use the specified map coordinates instead of the current cursor position. If
-    this option is specified, then an active game map cursor is not necessary.
-:``-h``, ``--help``:
-    Show command help text.
-:``-q``, ``--quiet``:
-    Suppress non-error status output.
-
-.. _tiletypes-here-point:
-
-tiletypes-here-point
---------------------
-Apply the current tiletypes options at the in-game cursor position to a single
-tile. Can be used from a hotkey.
-
-This command supports the same options as `tiletypes-here` above.
-
-.. _tubefill:
-
-tubefill
-========
-Fills all the adamantine veins again. Veins that were hollow will be left
-alone.
-
-Options:
-
-:hollow:            fill in naturally hollow veins too
-
-Beware that filling in hollow veins will trigger a demon invasion on top of
-your miner when you dig into the region that used to be hollow.
-
-
-
-=================
-Mods and Cheating
-=================
-
-.. contents::
-   :local:
-
-.. _add-spatter:
-
-add-spatter
-===========
-This plugin makes reactions with names starting with ``SPATTER_ADD_``
-produce contaminants on the items instead of improvements.  The plugin is
-intended to give some use to all those poisons that can be bought from caravans,
-so they're immune to being washed away by water or destroyed by `clean`.
-
-.. _adv-bodyswap:
-
-adv-bodyswap
-============
-This allows taking control over your followers and other creatures in adventure
-mode. For example, you can make them pick up new arms and armor and equip them
-properly.
-
-Usage:
-
-* When viewing unit details, body-swaps into that unit.
-* In the main adventure mode screen, reverts transient swap.
-
-:dfhack-keybind:`adv-bodyswap`
-
-.. _createitem:
-
-createitem
-==========
-Allows creating new items of arbitrary types and made of arbitrary materials. A
-unit must be selected in-game to use this command. By default, items created are
-spawned at the feet of the selected unit.
-
-Specify the item and material information as you would indicate them in
-custom reaction raws, with the following differences:
-
-* Separate the item and material with a space rather than a colon
-* If the item has no subtype, the ``:NONE`` can be omitted
-* If the item is ``REMAINS``, ``FISH``, ``FISH_RAW``, ``VERMIN``, ``PET``, or ``EGG``,
-  specify a ``CREATURE:CASTE`` pair instead of a material token.
-* If the item is a ``PLANT_GROWTH``, specify a ``PLANT_ID:GROWTH_ID`` pair
-  instead of a material token.
-
-Corpses, body parts, and prepared meals cannot be created using this tool.
-
-To obtain the item and material tokens of an existing item, run
-``createitem inspect``. Its output can be passed directly as arguments to
-``createitem`` to create new matching items, as long as the item type is
-supported.
-
-Examples:
-
-* Create 2 pairs of steel gauntlets::
-
-    createitem GLOVES:ITEM_GLOVES_GAUNTLETS INORGANIC:STEEL 2
-
-* Create tower-cap logs::
-
-    createitem WOOD PLANT_MAT:TOWER_CAP:WOOD
-
-* Create bilberries::
-
-    createitem PLANT_GROWTH BILBERRY:FRUIT
-
-For more examples, :wiki:`see this wiki page <Utility:DFHack/createitem>`.
-
-To change where new items are placed, first run the command with a
-destination type while an appropriate destination is selected.
-
-Options:
-
-:floor:     Subsequent items will be placed on the floor beneath the selected unit's feet.
-:item:      Subsequent items will be stored inside the currently selected item.
-:building:  Subsequent items will become part of the currently selected building.
-            Good for loading traps; do not use with workshops (or deconstruct to use the item).
-
-.. _dig-now:
-
-dig-now
-=======
-
-Instantly completes non-marker dig designations, modifying tile shapes and
-creating boulders, ores, and gems as if a miner were doing the mining or
-engraving. By default, the entire map is processed and boulder generation
-follows standard game rules, but the behavior is configurable.
-
-Note that no units will get mining or engraving experience for the dug/engraved
-tiles.
-
-Trees and roots are not currently handled by this plugin and will be skipped.
-Requests for engravings are also skipped since they would depend on the skill
-and creative choices of individual engravers. Other types of engraving (i.e.
-smoothing and track carving) are handled.
-
-Usage::
-
-    dig-now [<pos> [<pos>]] [<options>]
-
-Where the optional ``<pos>`` pair can be used to specify the coordinate bounds
-within which ``dig-now`` will operate. If they are not specified, ``dig-now``
-will scan the entire map. If only one ``<pos>`` is specified, only the tile at
-that coordinate is processed.
-
-Any ``<pos>`` parameters can either be an ``<x>,<y>,<z>`` triple (e.g.
-``35,12,150``) or the string ``here``, which means the position of the active
-game cursor should be used.
-
-Examples:
-
-``dig-now``
-    Dig designated tiles according to standard game rules.
-
-``dig-now --clean``
-    Dig designated tiles, but don't generate any boulders, ores, or gems.
-
-``dig-now --dump here``
-    Dig tiles and dump all generated boulders, ores, and gems at the tile under
-    the game cursor.
-
-Options:
-
-:``-c``, ``--clean``:
-    Don't generate any boulders, ores, or gems. Equivalent to
-    ``--percentages 0,0,0,0``.
-:``-d``, ``--dump <pos>``:
-    Dump any generated items at the specified coordinates. If the tile at those
-    coordinates is open space or is a wall, items will be generated on the
-    closest walkable tile below.
-:``-e``, ``--everywhere``:
-    Generate a boulder, ore, or gem for every tile that can produce one.
-    Equivalent to ``--percentages 100,100,100,100``.
-:``-h``, ``--help``:
-    Show quick usage help text.
-:``-p``, ``--percentages <layer>,<vein>,<small cluster>,<deep>``:
-    Set item generation percentages for each of the tile categories. The
-    ``vein`` category includes both the large oval clusters and the long stringy
-    mineral veins. Default is ``25,33,100,100``.
-:``-z``, ``--cur-zlevel``:
-    Restricts the bounds to the currently visible z-level.
-
-.. _diggingInvaders:
-
-diggingInvaders
-===============
-Makes invaders dig or destroy constructions to get to your dwarves.
-
-To enable/disable the pluging, use: ``diggingInvaders (1|enable)|(0|disable)``
-
-Basic usage:
-
-:add GOBLIN:        registers the race GOBLIN as a digging invader. Case-sensitive.
-:remove GOBLIN:     unregisters the race GOBLIN as a digging invader. Case-sensitive.
-:now:               makes invaders try to dig now, if plugin is enabled
-:clear:             clears all digging invader races
-:edgesPerTick n:    makes the pathfinding algorithm work on at most n edges per tick.
-                    Set to 0 or lower to make it unlimited.
-
-You can also use ``diggingInvaders setCost (race) (action) n`` to set the
-pathing cost of particular action, or ``setDelay`` to set how long it takes.
-Costs and delays are per-tile, and the table shows default values.
-
-============================== ======= ====== =================================
-Action                         Cost    Delay  Notes
-============================== ======= ====== =================================
-``walk``                       1       0      base cost in the path algorithm
-``destroyBuilding``            2       1,000  delay adds to the job_completion_timer of destroy building jobs that are assigned to invaders
-``dig``                        10,000  1,000  digging soil or natural stone
-``destroyRoughConstruction``   1,000   1,000  constructions made from boulders
-``destroySmoothConstruction``  100     100    constructions made from blocks or bars
-============================== ======= ====== =================================
-
-
-.. _fastdwarf:
-
-fastdwarf
-=========
-Controls speedydwarf and teledwarf. Speedydwarf makes dwarves move quickly
-and perform tasks quickly. Teledwarf makes dwarves move instantaneously,
-but do jobs at the same speed.
-
-:fastdwarf 0:   disables both (also ``0 0``)
-:fastdwarf 1:   enables speedydwarf and disables teledwarf (also ``1 0``)
-:fastdwarf 2:   sets a native debug flag in the game memory that implements an
-                even more aggressive version of speedydwarf.
-:fastdwarf 0 1: disables speedydwarf and enables teledwarf
-:fastdwarf 1 1: enables both
-
-See `superdwarf` for a per-creature version.
-
-.. _forceequip:
-
-forceequip
-==========
-Forceequip moves local items into a unit's inventory.  It is typically used to
-equip specific clothing/armor items onto a dwarf, but can also be used to put
-armor onto a war animal or to add unusual items (such as crowns) to any unit.
-
-For more information run ``forceequip help``.  See also `modtools/equip-item`.
-
-.. _generated-creature-renamer:
-
-generated-creature-renamer
-==========================
-Automatically renames generated creatures, such as forgotten beasts, titans,
-etc, to have raw token names that match the description given in-game.
-
-The ``list-generated`` command can be used to list the token names of all
-generated creatures in a given save, with an optional ``detailed`` argument
-to show the accompanying description.
-
-The ``save-generated-raws`` command will save a sample creature graphics file in
-the Dwarf Fortress root directory, to use as a start for making a graphics set
-for generated creatures using the new names that they get with this plugin.
-
-The new names are saved with the save, and the plugin, when enabled, only runs once
-per save, unless there's an update.
-
-.. _lair:
-
-lair
-====
-This command allows you to mark the map as a monster lair, preventing item
-scatter on abandon. When invoked as ``lair reset``, it does the opposite.
-
-Unlike `reveal`, this command doesn't save the information about tiles - you
-won't be able to restore state of real monster lairs using ``lair reset``.
-
-Options:
-
-:lair:          Mark the map as monster lair
-:lair reset:    Mark the map as ordinary (not lair)
-
-.. _misery:
-
-misery
-======
-When enabled, fake bad thoughts will be added to all dwarves.
-
-Usage:
-
-:misery enable n:  enable misery with optional magnitude n. If specified, n must
-    be positive.
-:misery n:         same as "misery enable n"
-:misery enable:    same as "misery enable 1"
-:misery disable:   stop adding new negative thoughts. This will not remove
-                   existing negative thoughts. Equivalent to "misery 0".
-:misery clear:     remove fake thoughts, even after saving and reloading. Does
-    not change factor.
-
-.. _mode:
-
-mode
-====
-This command lets you see and change the game mode directly.
-
-.. warning::
-
-    Only use ``mode`` after making a backup of your save!
-
-    Not all combinations are good for every situation and most of them will
-    produce undesirable results. There are a few good ones though.
-
-Examples:
-
-  * You are in fort game mode, managing your fortress and paused.
-  * You switch to the arena game mode, *assume control of a creature* and then
-  * switch to adventure game mode(1).
-    You just lost a fortress and gained an adventurer.  Alternatively:
-
-  * You are in fort game mode, managing your fortress and paused at the esc menu.
-  * You switch to the adventure game mode, assume control of a creature, then save or retire.
-  * You just created a returnable mountain home and gained an adventurer.
-
-.. _power-meter:
-
-power-meter
-===========
-The power-meter plugin implements a modified pressure plate that detects power being
-supplied to gear boxes built in the four adjacent N/S/W/E tiles.
-
-The configuration front-end is implemented by `gui/power-meter`.
-
-.. _siege-engine:
-
-siege-engine
-============
-Siege engines in DF haven't been updated since the game was 2D, and can
-only aim in four directions.  To make them useful above-ground,
-this plugin allows you to:
-
-* link siege engines to stockpiles
-* restrict operator skill levels (like workshops)
-* load any object into a catapult, not just stones
-* aim at a rectangular area in any direction, and across Z-levels
-
-The front-end is implemented by `gui/siege-engine`.
-
-.. _steam-engine:
-
-steam-engine
-============
-The steam-engine plugin detects custom workshops with STEAM_ENGINE in
-their token, and turns them into real steam engines.
-
-The vanilla game contains only water wheels and windmills as sources of
-power, but windmills give relatively little power, and water wheels require
-flowing water, which must either be a real river and thus immovable and
-limited in supply, or actually flowing and thus laggy.
-
-Compared to the :wiki:`water reactor <Water_wheel#Dwarven_Water_Reactor>`
-exploit, steam engines make a lot of sense!
-
-Construction
-------------
-The workshop needs water as its input, which it takes via a
-passable floor tile below it, like usual magma workshops do.
-The magma version also needs magma.
-
-Due to DFHack limits, the workshop will collapse over true open space.
-However down stairs are passable but support machines, so you can use them.
-
-After constructing the building itself, machines can be connected
-to the edge tiles that look like gear boxes. Their exact position
-is extracted from the workshop raws.
-
-Like with collapse above, due to DFHack limits the workshop
-can only immediately connect to machine components built AFTER it.
-This also means that engines cannot be chained without intermediate
-axles built after both engines.
-
-Operation
----------
-In order to operate the engine, queue the Stoke Boiler job (optionally
-on repeat). A furnace operator will come, possibly bringing a bar of fuel,
-and perform it. As a result, a "boiling water" item will appear
-in the :kbd:`t` view of the workshop.
-
-.. note::
-
-    The completion of the job will actually consume one unit
-    of the appropriate liquids from below the workshop. This means
-    that you cannot just raise 7 units of magma with a piston and
-    have infinite power. However, liquid consumption should be slow
-    enough that water can be supplied by a pond zone bucket chain.
-
-Every such item gives 100 power, up to a limit of 300 for coal,
-and 500 for a magma engine. The building can host twice that
-amount of items to provide longer autonomous running. When the
-boiler gets filled to capacity, all queued jobs are suspended;
-once it drops back to 3+1 or 5+1 items, they are re-enabled.
-
-While the engine is providing power, steam is being consumed.
-The consumption speed includes a fixed 10% waste rate, and
-the remaining 90% are applied proportionally to the actual
-load in the machine. With the engine at nominal 300 power with
-150 load in the system, it will consume steam for actual
-300*(10% + 90%*150/300) = 165 power.
-
-Masterpiece mechanism and chain will decrease the mechanical
-power drawn by the engine itself from 10 to 5. Masterpiece
-barrel decreases waste rate by 4%. Masterpiece piston and pipe
-decrease it by further 4%, and also decrease the whole steam
-use rate by 10%.
-
-Explosions
-----------
-The engine must be constructed using barrel, pipe and piston
-from fire-safe, or in the magma version magma-safe metals.
-
-During operation weak parts get gradually worn out, and
-eventually the engine explodes. It should also explode if
-toppled during operation by a building destroyer, or a
-tantruming dwarf.
-
-Save files
-----------
-It should be safe to load and view engine-using fortresses
-from a DF version without DFHack installed, except that in such
-case the engines won't work. However actually making modifications
-to them, or machines they connect to (including by pulling levers),
-can easily result in inconsistent state once this plugin is
-available again. The effects may be as weird as negative power
-being generated.
-
-.. _strangemood:
-
-strangemood
-===========
-Creates a strange mood job the same way the game itself normally does it.
-
-Options:
-
-:-force:        Ignore normal strange mood preconditions (no recent mood, minimum
-                moodable population, artifact limit not reached).
-:-unit:         Make the strange mood strike the selected unit instead of picking
-                one randomly. Unit eligibility is still enforced.
-:-type <T>:     Force the mood to be of a particular type instead of choosing randomly based on happiness.
-                Valid values for T are "fey", "secretive", "possessed", "fell", and "macabre".
-:-skill S:      Force the mood to use a specific skill instead of choosing the highest moodable skill.
-                Valid values are "miner", "carpenter", "engraver", "mason", "tanner", "weaver",
-                "clothier", "weaponsmith",  "armorsmith", "metalsmith", "gemcutter", "gemsetter",
-                "woodcrafter", "stonecrafter", "metalcrafter", "glassmaker", "leatherworker",
-                "bonecarver", "bowyer", and "mechanic".
-
-Known limitations: if the selected unit is currently performing a job, the mood will not be started.
-
-==============
-Plugin Lua API
-==============
-
-Some plugins consist solely of native libraries exposed to Lua. They are listed
-in the `lua-api` file under `lua-plugins`:
-
-* `building-hacks`
-* `cxxrandom`
-* `eventful`
-* `luasocket`
-* `map-render`
-* `pathable`
-* `xlsxreader`
-
-===========
-UI Upgrades
-===========
-
-.. note::
-    In order to avoid user confusion, as a matter of policy all GUI tools
-    display the word :guilabel:`DFHack` on the screen somewhere while active.
-
-    When that is not appropriate because they merely add keybinding hints to
-    existing DF screens, they deliberately use red instead of green for the key.
-
-.. contents::
-   :local:
-
-
-.. _automaterial:
-
-automaterial
-============
-This makes building constructions (walls, floors, fortifications, etc) a little bit
-easier by saving you from having to trawl through long lists of materials each time
-you place one.
-
-Firstly, it moves the last used material for a given construction type to the top of
-the list, if there are any left. So if you build a wall with chalk blocks, the next
-time you place a wall the chalk blocks will be at the top of the list, regardless of
-distance (it only does this in "grouped" mode, as individual item lists could be huge).
-This should mean you can place most constructions without having to search for your
-preferred material type.
-
-.. image:: images/automaterial-mat.png
-
-Pressing :kbd:`a` while highlighting any material will enable that material for "auto select"
-for this construction type. You can enable multiple materials as autoselect. Now the next
-time you place this type of construction, the plugin will automatically choose materials
-for you from the kinds you enabled. If there is enough to satisfy the whole placement,
-you won't be prompted with the material screen - the construction will be placed and you
-will be back in the construction menu as if you did it manually.
-
-When choosing the construction placement, you will see a couple of options:
-
-.. image:: images/automaterial-pos.png
-
-Use :kbd:`a` here to temporarily disable the material autoselection, e.g. if you need
-to go to the material selection screen so you can toggle some materials on or off.
-
-The other option (auto type selection, off by default) can be toggled on with :kbd:`t`. If you
-toggle this option on, instead of returning you to the main construction menu after selecting
-materials, it returns you back to this screen. If you use this along with several autoselect
-enabled materials, you should be able to place complex constructions more conveniently.
-
-.. _automelt:
-
-automelt
-========
-When automelt is enabled for a stockpile, any meltable items placed
-in it will be designated to be melted.
-This plugin adds an option to the :kbd:`q` menu when `enabled <enable>`.
-
-.. _autotrade:
-
-autotrade
-=========
-When autotrade is enabled for a stockpile, any items placed in it will be
-designated to be taken to the Trade Depot whenever merchants are on the map.
-This plugin adds an option to the :kbd:`q` menu when `enabled <enable>`.
-
-.. _buildingplan:
-
-buildingplan
-============
-When active (via ``enable buildingplan``), this plugin adds a planning mode for
-building placement. You can then place furniture, constructions, and other buildings
-before the required materials are available, and they will be created in a suspended
-state. Buildingplan will periodically scan for appropriate items, and the jobs will
-be unsuspended when the items are available.
-
-This is very useful when combined with `workflow` - you can set a constraint
-to always have one or two doors/beds/tables/chairs/etc available, and place
-as many as you like. The plugins then take over and fulfill the orders,
-with minimal space dedicated to stockpiles.
-
-.. _buildingplan-filters:
-
-Item filtering
---------------
-
-While placing a building, you can set filters for what materials you want the building made
-out of, what quality you want the component items to be, and whether you want the items to
-be decorated.
-
-If a building type takes more than one item to construct, use :kbd:`Ctrl`:kbd:`Left` and
-:kbd:`Ctrl`:kbd:`Right` to select the item that you want to set filters for. Any filters that
-you set will be used for all buildings of the selected type placed from that point onward
-(until you set a new filter or clear the current one). Buildings placed before the filters
-were changed will keep the filter values that were set when the building was placed.
-
-For example, you can be sure that all your constructed walls are the same color by setting
-a filter to accept only certain types of stone.
-
-Quickfort mode
---------------
-
-If you use the external Python Quickfort to apply building blueprints instead of the native
-DFHack `quickfort` script, you must enable Quickfort mode. This temporarily enables
-buildingplan for all building types and adds an extra blank screen after every building
-placement. This "dummy" screen is needed for Python Quickfort to interact successfully with
-Dwarf Fortress.
-
-Note that Quickfort mode is only for compatibility with the legacy Python Quickfort. The
-DFHack `quickfort` script does not need Quickfort mode to be enabled. The `quickfort` script
-will successfully integrate with buildingplan as long as the buildingplan plugin is enabled.
-
-.. _buildingplan-settings:
-
-Global settings
----------------
-
-The buildingplan plugin has several global settings that can be set from the UI (:kbd:`G`
-from any building placement screen, for example: :kbd:`b`:kbd:`a`:kbd:`G`). These settings
-can also be set from the ``DFHack#`` prompt once a map is loaded (or from your
-``onMapLoad.init`` file) with the syntax::
-
-    buildingplan set <setting> <true|false>
-
-and displayed with::
-
-    buildingplan set
-
-The available settings are:
-
-+----------------+---------+-----------+---------------------------------------+
-| Setting        | Default | Persisted | Description                           |
-+================+=========+===========+=======================================+
-| all_enabled    | false   | no        | Enable planning mode for all building |
-|                |         |           | types.                                |
-+----------------+---------+-----------+---------------------------------------+
-| blocks         | true    | yes       | Allow blocks, boulders, logs, or bars |
-+----------------+---------+           | to be matched for generic "building   |
-| boulders       | true    |           | material" items                       |
-+----------------+---------+           |                                       |
-| logs           | true    |           |                                       |
-+----------------+---------+           |                                       |
-| bars           | false   |           |                                       |
-+----------------+---------+-----------+---------------------------------------+
-| quickfort_mode | false   | no        | Enable compatibility mode for the     |
-|                |         |           | legacy Python Quickfort (not required |
-|                |         |           | for DFHack quickfort)                 |
-+----------------+---------+-----------+---------------------------------------+
-
-For example, to ensure you only use blocks when a "building material" item is required, you
-could add this to your ``onMapLoad.init`` file::
-
-    on-new-fortress buildingplan set boulders false; buildingplan set logs false
-
-Persisted settings (i.e. ``blocks``, ``boulders``, ``logs``, and ``bars``) are saved with
-your game, so you only need to set them to the values you want once.
-
-.. _command-prompt:
-
-command-prompt
-==============
-An in-game DFHack terminal, where you can enter other commands.
-
-:dfhack-keybind:`command-prompt`
-
-Usage: ``command-prompt [entry]``
-
-If called with an entry, it starts with that text filled in.
-Most useful for developers, who can set a keybinding to open
-a laungage interpreter for lua or Ruby by starting with the
-`:lua <lua>` or `:rb <rb>` commands.
-
-Otherwise somewhat similar to `gui/quickcmd`.
-
-.. image:: images/command-prompt.png
-
-.. _confirm:
-
-confirm
-=======
-Implements several confirmation dialogs for potentially destructive actions
-(for example, seizing goods from traders or deleting hauling routes).
-
-Usage:
-
-:enable confirm:    Enable all confirmations; alias ``confirm enable all``.
-                    Replace with ``disable`` to disable.
-:confirm help:      List available confirmation dialogues.
-:confirm enable option1 [option2...]:
-                    Enable (or disable) specific confirmation dialogues.
-
-.. _debug:
-
-debug
-=====
-Manager for DFHack runtime debug prints. Debug prints are grouped by plugin name,
-category name and print level. Levels are ``trace``, ``debug``, ``info``,
-``warning`` and ``error``.
-
-The runtime message printing is controlled using filters. Filters set the
-visible messages of all matching categories. Matching uses regular expression syntax,
-which allows listing multiple alternative matches or partial name matches.
-This syntax is a C++ version of the ECMA-262 grammar (Javascript regular expressions).
-Details of differences can be found at
-https://en.cppreference.com/w/cpp/regex/ecmascript
-
-Persistent filters are stored in ``dfhack-config/runtime-debug.json``.
-Oldest filters are applied first. That means a newer filter can override the
-older printing level selection.
-
-Usage: ``debugfilter [subcommand] [parameters...]``
-
-The following subcommands are supported:
-
-help
-----
-Give overall help or a detailed help for a subcommand.
-
-Usage: ``debugfilter help [subcommand]``
-
-category
---------
-List available debug plugin and category names.
-
-Usage: ``debugfilter category [plugin regex] [category regex]``
-
-The list can be filtered using optional regex parameters. If filters aren't
-given then the it uses ``"."`` regex which matches any character. The regex
-parameters are good way to test regex before passing them to ``set``.
-
-filter
-------
-List active and passive debug print level changes.
-
-Usage: ``debugfilter filter [id]``
-
-Optional ``id`` parameter is the id listed as first column in the filter list.
-If id is given then the command shows information for the given filter only in
-multi line format that is better format if filter has long regex.
-
-set
----
-Creates a new debug filter to set category printing levels.
-
-Usage: ``debugfilter set [level] [plugin regex] [category regex]``
-
-Adds a filter that will be deleted when DF process exists or plugin is unloaded.
-
-Usage: ``debugfilter set persistent [level] [plugin regex] [category regex]``
-
-Stores the filter in the configuration file to until ``unset`` is used to remove
-it.
-
-Level is the minimum debug printing level to show in log.
-
-* ``trace``: Possibly very noisy messages which can be printed many times per second
-
-* ``debug``: Messages that happen often but they should happen only a couple of times per second
-
-* ``info``: Important state changes that happen rarely during normal execution
-
-* ``warning``: Enabled by default. Shows warnings about unexpected events which code managed to handle correctly.
-
-* ``error``: Enabled by default. Shows errors which code can't handle without user intervention.
-
-unset
------
-Delete a space separated list of filters
-
-Usage: ``debugfilter unset [id...]``
-
-disable
--------
-Disable a space separated list of filters but keep it in the filter list
-
-Usage: ``debugfilter disable [id...]``
-
-enable
-------
-Enable a space sperate list of filters
-
-Usage: ``debugfilter enable [id...]``
-
-.. _embark-assistant:
-
-embark-assistant
-================
-
-This plugin provides embark site selection help. It has to be run with the
-``embark-assistant`` command while the pre-embark screen is displayed and shows
-extended (and correct(?)) resource information for the embark rectangle as well
-as normally undisplayed sites in the current embark region. It also has a site
-selection tool with more options than DF's vanilla search tool. For detailed
-help invoke the in game info screen.
-
-.. _embark-tools:
-
-embark-tools
-============
-A collection of embark-related tools. Usage and available tools::
-
-    embark-tools enable/disable tool [tool]...
-
-:anywhere:      Allows embarking anywhere (including sites, mountain-only biomes,
-                and oceans). Use with caution.
-:mouse:         Implements mouse controls (currently in the local embark region only)
-:sand:          Displays an indicator when sand is present in the currently-selected
-                area, similar to the default clay/stone indicators.
-:sticky:        Maintains the selected local area while navigating the world map
-
-.. _follow:
-
-follow
-======
-Makes the game view follow the currently highlighted unit after you exit from the
-current menu or cursor mode. Handy for watching dwarves running around. Deactivated
-by moving the view manually.
-
-.. _hotkeys:
-
-hotkeys
-=======
-Opens an in-game screen showing which DFHack keybindings are
-active in the current context.  See also `hotkey-notes`.
-
-.. image:: images/hotkeys.png
-
-:dfhack-keybind:`hotkeys`
-
-.. _manipulator:
-
-manipulator
-===========
-An in-game equivalent to the popular program Dwarf Therapist.
-
-To activate, open the unit screen and press :kbd:`l`.
-
-.. image:: images/manipulator.png
-
-The far left column displays the unit's Happiness (color-coded based on its
-value), Name, Profession/Squad, and the right half of the screen displays each
-dwarf's labor settings and skill levels (0-9 for Dabbling through Professional,
-A-E for Great through Grand Master, and U-Z for Legendary through Legendary+5).
-
-Cells with teal backgrounds denote skills not controlled by labors, e.g.
-military and social skills.
-
-.. image:: images/manipulator2.png
-
-Press :kbd:`t` to toggle between Profession, Squad, and Job views.
-
-.. image:: images/manipulator3.png
-
-Use the arrow keys or number pad to move the cursor around, holding :kbd:`Shift` to
-move 10 tiles at a time.
-
-Press the Z-Up (:kbd:`<`) and Z-Down (:kbd:`>`) keys to move quickly between labor/skill
-categories. The numpad Z-Up and Z-Down keys seek to the first or last unit
-in the list. :kbd:`Backspace` seeks to the top left corner.
-
-Press Enter to toggle the selected labor for the selected unit, or Shift+Enter
-to toggle all labors within the selected category.
-
-Press the :kbd:`+`:kbd:`-` keys to sort the unit list according to the currently selected
-skill/labor, and press the :kbd:`*`:kbd:`/` keys to sort the unit list by Name, Profession/Squad,
-Happiness, or Arrival order (using :kbd:`Tab` to select which sort method to use here).
-
-With a unit selected, you can press the :kbd:`v` key to view its properties (and
-possibly set a custom nickname or profession) or the :kbd:`c` key to exit
-Manipulator and zoom to its position within your fortress.
-
-The following mouse shortcuts are also available:
-
-* Click on a column header to sort the unit list. Left-click to sort it in one
-  direction (descending for happiness or labors/skills, ascending for name,
-  profession or squad) and right-click to sort it in the opposite direction.
-* Left-click on a labor cell to toggle that labor. Right-click to move the
-  cursor onto that cell instead of toggling it.
-* Left-click on a unit's name, profession or squad to view its properties.
-* Right-click on a unit's name, profession or squad to zoom to it.
-
-Pressing :kbd:`Esc` normally returns to the unit screen, but :kbd:`Shift`:kbd:`Esc` would exit
-directly to the main dwarf mode screen.
-
-Professions
------------
-
-The manipulator plugin supports saving professions: a named set of labors that can be
-quickly applied to one or multiple dwarves.
-
-To save a profession, highlight a dwarf and press :kbd:`P`. The profession will be saved using
-the custom profession name of the dwarf, or the default for that dwarf if no custom profession
-name has been set.
-
-To apply a profession, either highlight a single dwarf or select multiple with
-:kbd:`x`, and press :kbd:`p` to select the profession to apply. All labors for
-the selected dwarves will be reset to the labors of the chosen profession.
-
-Professions are saved as human-readable text files in the
-``dfhack-config/professions`` folder within the DF folder, and can be edited or
-deleted there.
-
-The professions library
-~~~~~~~~~~~~~~~~~~~~~~~
-
-The manipulator plugin comes with a library of professions that you can assign
-to your dwarves.
-
-If you'd rather use Dwarf Therapist to manage your labors, it is easy to import
-these professions to DT and use them there. Simply assign the professions you
-want to import to a dwarf. Once you have assigned a profession to at least one
-dwarf, you can select "Import Professions from DF" in the DT "File" menu. The
-professions will then be available for use in DT.
-
-In the charts below, the "At Start" and "Max" columns indicate the approximate
-number of dwarves of each profession that you are likely to need at the start of
-the game and how many you are likely to need in a mature fort. These are just
-approximations. Your playstyle may demand more or fewer of each profession.
-
-=============  ========  ===== =================================================
-Profession     At Start  Max   Description
-=============  ========  ===== =================================================
-Chef           0         3     Buchery, Tanning, and Cooking. It is important to
-                               focus just a few dwarves on cooking since
-                               well-crafted meals make dwarves very happy. They
-                               are also an excellent trade good.
-Craftsdwarf    0         4-6   All labors used at Craftsdwarf's workshops,
-                               Glassmaker's workshops, and kilns.
-Doctor         0         2-4   The full suite of medical labors, plus Animal
-                               Caretaking for those using the dwarfvet plugin.
-Farmer         1         4     Food- and animal product-related labors. This
-                               profession also has the ``Alchemist`` labor
-                               enabled since they need to focus on food-related
-                               jobs, though you might want to disable
-                               ``Alchemist`` for your first farmer until there
-                               are actual farming duties to perform.
-Fisherdwarf    0         0-1   Fishing and fish cleaning. If you assign this
-                               profession to any dwarf, be prepared to be
-                               inundated with fish. Fisherdwarves *never stop
-                               fishing*. Be sure to also run ``prioritize -a
-                               PrepareRawFish ExtractFromRawFish`` or else
-                               caught fish will just be left to rot.
-Hauler         0         >20   All hauling labors plus Siege Operating, Mechanic
-                               (so haulers can assist in reloading traps) and
-                               Architecture (so haulers can help build massive
-                               windmill farms and pump stacks). As you
-                               accumulate enough Haulers, you can turn off
-                               hauling labors for other dwarves so they can
-                               focus on their skilled tasks. You may also want
-                               to restrict your Mechanic's workshops to only
-                               skilled mechanics so your haulers don't make
-                               low-quality mechanisms.
-Laborer        0         10-12 All labors that don't improve quality with skill,
-                               such as Soapmaking and furnace labors.
-Marksdwarf     0         10-30 Similar to Hauler. See the description for
-                               Meleedwarf below for more details.
-Mason          2         2-4   Masonry and Gem Cutting/Encrusting. In the early
-                               game, you may need to run "`prioritize`
-                               ConstructBuilding" to get your masons to build
-                               wells and bridges if they are too busy crafting
-                               stone furniture.
-Meleedwarf     0         20-50 Similar to Hauler, but without most civilian
-                               labors. This profession is separate from Hauler
-                               so you can find your military dwarves easily.
-                               Meleedwarves and Marksdwarves have Mechanics and
-                               hauling labors enabled so you can temporarily
-                               deactivate your military after sieges and allow
-                               your military dwarves to help clean up.
-Migrant        0         0     You can assign this profession to new migrants
-                               temporarily while you sort them into professions.
-                               Like Marksdwarf and Meleedwarf, the purpose of
-                               this profession is so you can find your new
-                               dwarves more easily.
-Miner          2         2-10  Mining and Engraving. This profession also has
-                               the ``Alchemist`` labor enabled, which disables
-                               hauling for those using the `autohauler` plugin.
-                               Once the need for Miners tapers off in the late
-                               game, dwarves with this profession make good
-                               military dwarves, wielding their picks as
-                               weapons.
-Outdoorsdwarf  1         2-4   Carpentry, Bowyery, Woodcutting, Animal Training,
-                               Trapping, Plant Gathering, Beekeeping, and Siege
-                               Engineering.
-Smith          0         2-4   Smithing labors. You may want to specialize your
-                               Smiths to focus on a single smithing skill to
-                               maximize equipment quality.
-StartManager   1         0     All skills not covered by the other starting
-                               professions (Miner, Mason, Outdoorsdwarf, and
-                               Farmer), plus a few overlapping skills to
-                               assist in critical tasks at the beginning of the
-                               game. Individual labors should be turned off as
-                               migrants are assigned more specialized
-                               professions that cover them, and the StartManager
-                               dwarf can eventually convert to some other
-                               profession.
-Tailor         0         2     Textile industry labors: Dying, Leatherworking,
-                               Weaving, and Clothesmaking.
-=============  ========  ===== =================================================
-
-A note on autohauler
-~~~~~~~~~~~~~~~~~~~~
-
-These profession definitions are designed to work well with or without the
-`autohauler` plugin (which helps to keep your dwarves focused on skilled labors
-instead of constantly being distracted by hauling). If you do want to use
-autohauler, adding the following lines to your ``onMapLoad.init`` file will
-configure it to let the professions manage the "Feed water to civilians" and
-"Recover wounded" labors instead of enabling those labors for all hauling
-dwarves::
-
-    on-new-fortress enable autohauler
-    on-new-fortress autohauler FEED_WATER_CIVILIANS allow
-    on-new-fortress autohauler RECOVER_WOUNDED allow
-
-.. _mousequery:
-
-mousequery
-==========
-Adds mouse controls to the DF interface, e.g. click-and-drag designations.
-
-Options:
-
-:plugin:    enable/disable the entire plugin
-:rbutton:   enable/disable right mouse button
-:track:     enable/disable moving cursor in build and designation mode
-:edge:      enable/disable active edge scrolling (when on, will also enable tracking)
-:live:      enable/disable query view when unpaused
-:delay:     Set delay when edge scrolling in tracking mode. Omit amount to display current setting.
-
-Usage::
-
-    mousequery [plugin] [rbutton] [track] [edge] [live] [enable|disable]
-
-.. _nopause:
-
-nopause
-=======
-Disables pausing (both manual and automatic) with the exception of pause forced
-by `reveal` ``hell``. This is nice for digging under rivers.
-
-.. _rename:
-
-rename
-======
-Allows renaming various things.  Use `gui/rename` for an in-game interface.
-
-Options:
-
-``rename squad <index> "name"``
-  Rename squad by index to 'name'.
-``rename hotkey <index> \"name\"``
-  Rename hotkey by index. This allows assigning
-  longer commands to the DF hotkeys.
-``rename unit "nickname"``
-  Rename a unit/creature highlighted in the DF user interface.
-``rename unit-profession "custom profession"``
-  Change proffession name of the highlighted unit/creature.
-``rename building "name"``
-  Set a custom name for the selected building.
-  The building must be one of stockpile, workshop, furnace, trap,
-  siege engine or an activity zone.
-
-.. _rendermax:
-
-rendermax
-=========
-A collection of renderer replacing/enhancing filters. For better effect try changing the
-black color in palette to non totally black. See :forums:`128487` for more info.
-
-Options:
-
-:trippy:                        Randomizes the color of each tiles. Used for fun, or testing.
-:light:                         Enable lighting engine.
-:light reload:                  Reload the settings file.
-:light sun <x>|cycle:           Set time to <x> (in hours) or set it to df time cycle.
-:occlusionON, occlusionOFF:     Show debug occlusion info.
-:disable:                       Disable any filter that is enabled.
-
-An image showing lava and dragon breath. Not pictured here: sunlight, shining items/plants,
-materials that color the light etc...
-
-.. image:: images/rendermax.png
-
-.. _resume:
-
-resume
-======
-Allows automatic resumption of suspended constructions, along with colored
-UI hints for construction status.
-
-.. _rb:
-.. _ruby:
-
-ruby
-====
-Ruby language plugin, which evaluates the following arguments as a ruby string.
-Best used as ``:rb [string]``, for the special parsing mode.  Alias ``rb_eval``.
-
-.. comment - the link target "search" is reserved for the Sphinx search page
-.. _search-plugin:
-
-search
-======
-The search plugin adds search to the Stocks, Animals, Trading, Stockpile,
-Noble (assignment candidates), Military (position candidates), Burrows
-(unit list), Rooms, Announcements, Job List and Unit List screens.
-
-.. image:: images/search.png
-
-Searching works the same way as the search option in :guilabel:`Move to Depot`.
-You will see the Search option displayed on screen with a hotkey (usually :kbd:`s`).
-Pressing it lets you start typing a query and the relevant list will start
-filtering automatically.
-
-Pressing :kbd:`Enter`, :kbd:`Esc` or the arrow keys will return you to browsing the now
-filtered list, which still functions as normal. You can clear the filter
-by either going back into search mode and backspacing to delete it, or
-pressing the "shifted" version of the search hotkey while browsing the
-list (e.g. if the hotkey is :kbd:`s`, then hitting :kbd:`Shift`:kbd:`s` will clear any
-filter).
-
-Leaving any screen automatically clears the filter.
-
-In the Trade screen, the actual trade will always only act on items that
-are actually visible in the list; the same effect applies to the Trade
-Value numbers displayed by the screen. Because of this, the :kbd:`t` key is
-blocked while search is active, so you have to reset the filters first.
-Pressing :kbd:`Alt`:kbd:`C` will clear both search strings.
-
-In the stockpile screen the option only appears if the cursor is in the
-rightmost list:
-
-.. image:: images/search-stockpile.png
-
-Note that the 'Permit XXX'/'Forbid XXX' keys conveniently operate only
-on items actually shown in the rightmost list, so it is possible to select
-only fat or tallow by forbidding fats, then searching for fat/tallow, and
-using Permit Fats again while the list is filtered.
-
-.. _sort:
-.. _sort-items:
-
-sort-items
-==========
-Sort the visible item list::
-
-    sort-items order [order...]
-
-Sort the item list using the given sequence of comparisons.
-The ``<`` prefix for an order makes undefined values sort first.
-The ``>`` prefix reverses the sort order for defined values.
-
-Item order examples::
-
-    description material wear type quality
-
-The orderings are defined in ``hack/lua/plugins/sort/*.lua``
-
-.. _sort-units:
-
-sort-units
-==========
-Sort the visible unit list::
-
-    sort-units order [order...]
-
-Sort the unit list using the given sequence of comparisons.
-The ``<`` prefix for an order makes undefined values sort first.
-The ``>`` prefix reverses the sort order for defined values.
-
-Unit order examples::
-
-    name age arrival squad squad_position profession
-
-The orderings are defined in ``hack/lua/plugins/sort/*.lua``
-
-:dfhack-keybind:`sort-units`
-
-.. _stocksettings:
-.. _stockpiles:
-
-stockpiles
-==========
-Offers the following commands to save and load stockpile settings.
-See `gui/stockpiles` for an in-game interface.
-
-:copystock:     Copies the parameters of the currently highlighted stockpile to the custom
-                stockpile settings and switches to custom stockpile placement mode, effectively
-                allowing you to copy/paste stockpiles easily.
-                :dfhack-keybind:`copystock`
-
-:savestock:     Saves the currently highlighted stockpile's settings to a file in your Dwarf
-                Fortress folder. This file can be used to copy settings between game saves or
-                players.  e.g.:  ``savestock food_settings.dfstock``
-
-:loadstock:     Loads a saved stockpile settings file and applies it to the currently selected
-                stockpile.  e.g.:  ``loadstock food_settings.dfstock``
-
-To use savestock and loadstock, use the :kbd:`q` command to highlight a stockpile.
-Then run savestock giving it a descriptive filename. Then, in a different (or
-the same!) gameworld, you can highlight any stockpile with :kbd:`q` then execute the
-``loadstock`` command passing it the name of that file. The settings will be
-applied to that stockpile.
-
-Note that files are relative to the DF folder, so put your files there or in a
-subfolder for easy access. Filenames should not have spaces.  Generated materials,
-divine metals, etc are not saved as they are different in every world.
-
-.. _stocks:
-
-stocks
-======
-Replaces the DF stocks screen with an improved version.
-
-:dfhack-keybind:`stocks`
-
-
-.. _title-folder:
-
-title-folder
-=============
-Displays the DF folder name in the window title bar when enabled.
-
-.. _title-version:
-
-title-version
-=============
-Displays the DFHack version on DF's title screen when enabled.
-
-.. _trackstop:
-
-trackstop
-=========
-Adds a :kbd:`q` menu for track stops, which is completely blank by default.
-This allows you to view and/or change the track stop's friction and dump
-direction settings, using the keybindings from the track stop building interface.
diff --git a/docs/Removed.rst b/docs/Removed.rst
index e94b04cf8..3dbe26820 100644
--- a/docs/Removed.rst
+++ b/docs/Removed.rst
@@ -59,6 +59,14 @@ script instead. You can use your existing .csv files. Just move them to the
 ``blueprints`` folder in your DF installation, and instead of
 ``fortplan file.csv`` run ``quickfort run file.csv``.
 
+.. _gui/no-dfhack-init:
+
+gui/no-dfhack-init
+==================
+Tool that warned the user when the ``dfhack.init`` file did not exist. Now that
+``dfhack.init`` is autogenerated in ``dfhack-config/init``, this warning is no
+longer necessary.
+
 .. _warn-stuck-trees:
 
 warn-stuck-trees
diff --git a/docs/Scripts.rst b/docs/Scripts.rst
deleted file mode 100644
index 419385582..000000000
--- a/docs/Scripts.rst
+++ /dev/null
@@ -1,19 +0,0 @@
-.. _scripts-index:
-
-##############
-DFHack Scripts
-##############
-
-Lua or ruby scripts placed in the :file:`hack/scripts/` directory
-are considered for execution as if they were native DFHack commands.
-
-The following pages document all the scripts in the DFHack standard library.
-
-.. toctree::
-   :maxdepth: 2
-
-   /docs/_auto/base
-   /docs/_auto/devel
-   /docs/_auto/fix
-   /docs/_auto/gui
-   /docs/_auto/modtools
diff --git a/docs/Tools.rst b/docs/Tools.rst
deleted file mode 100644
index 15c5f878e..000000000
--- a/docs/Tools.rst
+++ /dev/null
@@ -1,13 +0,0 @@
-.. _tools-index:
-
-############
-DFHack Tools
-############
-
-These are the DFHack commands you can run.
-
-.. toctree::
-   :titlesonly:
-   :glob:
-
-   /docs/tools/*
diff --git a/docs/_auto/.gitignore b/docs/_auto/.gitignore
deleted file mode 100644
index 30d85567b..000000000
--- a/docs/_auto/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-*.rst
diff --git a/docs/build-pdf.sh b/docs/build-pdf.sh
index 76908b49b..735ef2faa 100755
--- a/docs/build-pdf.sh
+++ b/docs/build-pdf.sh
@@ -11,13 +11,4 @@
 cd $(dirname "$0")
 cd ..
 
-sphinx=sphinx-build
-if [ -n "$SPHINX" ]; then
-    sphinx=$SPHINX
-fi
-
-if [ -z "$JOBS" ]; then
-    JOBS=2
-fi
-
-"$sphinx" -M latexpdf . ./docs/pdf -w ./docs/_sphinx-warnings.txt -j "$JOBS" "$@"
+"${SPHINX:-sphinx-build}" -M latexpdf -d build/docs/pdf . docs/pdf -w build/docs/pdf/_sphinx-warnings.txt -j "${JOBS:-auto}" "$@"
diff --git a/docs/build.sh b/docs/build.sh
index 95a97e539..c696d5fbe 100755
--- a/docs/build.sh
+++ b/docs/build.sh
@@ -11,13 +11,5 @@
 cd $(dirname "$0")
 cd ..
 
-sphinx=sphinx-build
-if [ -n "$SPHINX" ]; then
-    sphinx=$SPHINX
-fi
-
-if [ -z "$JOBS" ]; then
-    JOBS=2
-fi
-
-"$sphinx" -a -b html . ./docs/html -w ./docs/_sphinx-warnings.txt -j "$JOBS" "$@"
+"${SPHINX:-sphinx-build}" -b html -d build/docs/html . docs/html -w build/docs/html/_sphinx-warnings.txt -j "${JOBS:-auto}" "$@"
+"${SPHINX:-sphinx-build}" -b text -d build/docs/text . docs/text -w build/docs/text/_sphinx-warnings.txt -j "${JOBS:-auto}" "$@"
diff --git a/docs/_changelogs/.gitignore b/docs/changelogs/.gitignore
similarity index 50%
rename from docs/_changelogs/.gitignore
rename to docs/changelogs/.gitignore
index 2211df63d..90de5c70d 100644
--- a/docs/_changelogs/.gitignore
+++ b/docs/changelogs/.gitignore
@@ -1 +1,2 @@
 *.txt
+*.rst
diff --git a/docs/guides/examples-guide.rst b/docs/guides/examples-guide.rst
index b699b8204..f61ada4d7 100644
--- a/docs/guides/examples-guide.rst
+++ b/docs/guides/examples-guide.rst
@@ -28,8 +28,8 @@ it is useful (and customizable) for any fort. It includes the following config:
 - Calls `ban-cooking` for items that have important alternate uses and should
   not be cooked. This configuration is only set when a fortress is first
   started, so later manual changes will not be overridden.
-- Automates calling of various fort maintenance and `scripts-fix`, like
-  `cleanowned` and `fix/stuckdoors`.
+- Automates calling of various fort maintenance scripts, like `cleanowned` and
+  `fix/stuckdoors`.
 - Keeps your manager orders intelligently ordered with `orders` ``sort`` so no
   orders block other orders from ever getting completed.
 - Periodically enqueues orders to shear and milk shearable and milkable pets.
diff --git a/docs/index-tools.rst b/docs/index-tools.rst
new file mode 100644
index 000000000..dca14ae3b
--- /dev/null
+++ b/docs/index-tools.rst
@@ -0,0 +1,24 @@
+.. _tools-index:
+
+============
+DFHack Tools
+============
+
+These pages contain information about the plugins, scripts, and built-in
+commands distributed with DFHack.
+
+.. note::
+    In order to avoid user confusion, as a matter of policy all GUI tools
+    display the word :guilabel:`DFHack` on the screen somewhere while active.
+
+    When that is not appropriate because they merely add keybinding hints to
+    existing DF screens, they deliberately use red instead of green for the key.
+
+.. toctree::
+   :titlesonly:
+   :glob:
+
+   /docs/Tags
+   /docs/Builtin
+   /docs/tools/*
+   /docs/tools/*/*
diff --git a/docs/tools/cromulate.rst b/docs/plugins/cromulate.rst
similarity index 100%
rename from docs/tools/cromulate.rst
rename to docs/plugins/cromulate.rst
diff --git a/docs/sphinx_extensions/dfhack/changelog.py b/docs/sphinx_extensions/dfhack/changelog.py
index f7405d8b1..629d6b6de 100644
--- a/docs/sphinx_extensions/dfhack/changelog.py
+++ b/docs/sphinx_extensions/dfhack/changelog.py
@@ -238,8 +238,8 @@ def generate_changelog(all=False):
     consolidate_changelog(stable_entries)
     consolidate_changelog(dev_entries)
 
-    print_changelog(versions, stable_entries, os.path.join(DOCS_ROOT, '_auto/news.rst'))
-    print_changelog(versions, dev_entries, os.path.join(DOCS_ROOT, '_auto/news-dev.rst'))
+    print_changelog(versions, stable_entries, os.path.join(DOCS_ROOT, 'changelogs/news.rst'))
+    print_changelog(versions, dev_entries, os.path.join(DOCS_ROOT, 'changelogs/news-dev.rst'))
 
     if all:
         for version in versions:
@@ -251,10 +251,10 @@ def generate_changelog(all=False):
             else:
                 version_entries = {version: dev_entries[version]}
             print_changelog([version], version_entries,
-                os.path.join(DOCS_ROOT, '_changelogs/%s-github.txt' % version),
+                os.path.join(DOCS_ROOT, 'changelogs/%s-github.txt' % version),
                 replace=False)
             print_changelog([version], version_entries,
-                os.path.join(DOCS_ROOT, '_changelogs/%s-reddit.txt' % version),
+                os.path.join(DOCS_ROOT, 'changelogs/%s-reddit.txt' % version),
                 replace=False,
                 prefix='> ')
 
@@ -264,7 +264,7 @@ def cli_entrypoint():
     import argparse
     parser = argparse.ArgumentParser()
     parser.add_argument('-a', '--all', action='store_true',
-        help='Print changelogs for all versions to docs/_changelogs')
+        help='Print changelogs for all versions to docs/changelogs')
     parser.add_argument('-c', '--check', action='store_true',
         help='Check that all entries are printed')
     args = parser.parse_args()
@@ -272,9 +272,9 @@ def cli_entrypoint():
     entries = generate_changelog(all=args.all)
 
     if args.check:
-        with open(os.path.join(DOCS_ROOT, '_auto/news.rst')) as f:
+        with open(os.path.join(DOCS_ROOT, 'changelogs/news.rst')) as f:
             content_stable = f.read()
-        with open(os.path.join(DOCS_ROOT, '_auto/news-dev.rst')) as f:
+        with open(os.path.join(DOCS_ROOT, 'changelogs/news-dev.rst')) as f:
             content_dev = f.read()
         for entry in entries:
             for description in entry.children:
diff --git a/index.rst b/index.rst
index 3b46699a7..29ac3c129 100644
--- a/index.rst
+++ b/index.rst
@@ -30,11 +30,7 @@ User Manual
    /docs/Installing
    /docs/Support
    /docs/Core
-   /docs/Builtin
-   /docs/Plugins
-   /docs/Scripts
-   /docs/Tags
-   /docs/Tools
+   /docs/index-tools
    /docs/guides/index
    /docs/index-about
    /docs/index-dev

From 3e2320aa607154642cbefad116f92a5ef35c4974 Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Sat, 9 Jul 2022 23:01:46 -0700
Subject: [PATCH 185/854] split the plugin docs into individual files

---
 docs/plugins/3dveins.rst                    |  14 ++
 docs/plugins/add-spatter.rst                |   6 +
 docs/plugins/adv-bodyswap.rst               |  12 ++
 docs/plugins/alltraffic.rst                 |  11 ++
 docs/plugins/autobutcher.rst                |  91 ++++++++++
 docs/plugins/autochop.rst                   |  16 ++
 docs/plugins/autoclothing.rst               |  14 ++
 docs/plugins/autodump.rst                   |  29 ++++
 docs/plugins/autofarm.rst                   |  21 +++
 docs/plugins/autogems.rst                   |   7 +
 docs/plugins/autohauler.rst                 |  20 +++
 docs/plugins/autolabor.rst                  |  70 ++++++++
 docs/plugins/automaterial.rst               |  33 ++++
 docs/plugins/automelt.rst                   |   5 +
 docs/plugins/autonestbox.rst                |  19 ++
 docs/plugins/autotrade.rst                  |   5 +
 docs/plugins/blueprint.rst                  | 112 ++++++++++++
 docs/plugins/buildingplan.rst               |  88 ++++++++++
 docs/plugins/burrows.rst                    |  38 ++++
 docs/plugins/changeitem.rst                 |  26 +++
 docs/plugins/changelayer.rst                |  60 +++++++
 docs/plugins/changevein.rst                 |  10 ++
 docs/plugins/clean.rst                      |  16 ++
 docs/plugins/cleanconst.rst                 |   7 +
 docs/plugins/cleanowned.rst                 |  19 ++
 docs/plugins/command-prompt.rst             |  16 ++
 docs/plugins/confirm.rst                    |  12 ++
 docs/plugins/createitem.rst                 |  48 ++++++
 docs/plugins/cursecheck.rst                 |  42 +++++
 docs/plugins/debug.rst                      |  89 ++++++++++
 docs/plugins/deramp.rst                     |   6 +
 docs/plugins/dig-now.rst                    |  61 +++++++
 docs/plugins/dig.rst                        |  20 +++
 docs/plugins/digFlood.rst                   |  18 ++
 docs/plugins/digcircle.rst                  |  35 ++++
 docs/plugins/digexp.rst                     |  31 ++++
 docs/plugins/diggingInvaders.rst            |  29 ++++
 docs/plugins/digl.rst                       |  20 +++
 docs/plugins/diglx.rst                      |  20 +++
 docs/plugins/digtype.rst                    |  19 ++
 docs/plugins/digv.rst                       |  20 +++
 docs/plugins/digvx.rst                      |  20 +++
 docs/plugins/dwarfmonitor.rst               |  78 +++++++++
 docs/plugins/dwarfvet.rst                   |  19 ++
 docs/plugins/embark-assistant.rst           |   9 +
 docs/plugins/embark-tools.rst               |  12 ++
 docs/plugins/fastdwarf.rst                  |  14 ++
 docs/plugins/filltraffic.rst                |  17 ++
 docs/plugins/fix-armory.rst                 |   4 +
 docs/plugins/fix-job-postings.rst           |   5 +
 docs/plugins/fix-unit-occupancy.rst         |  12 ++
 docs/plugins/fixveins.rst                   |   5 +
 docs/plugins/flows.rst                      |   5 +
 docs/plugins/follow.rst                     |   5 +
 docs/plugins/forceequip.rst                 |   7 +
 docs/plugins/generated-creature-renamer.rst |  15 ++
 docs/plugins/getplants.rst                  |  37 ++++
 docs/plugins/hotkeys.rst                    |   8 +
 docs/plugins/infiniteSky.rst                |  16 ++
 docs/plugins/isoworldremote.rst             |   3 +
 docs/plugins/job-duplicate.rst              |   6 +
 docs/plugins/job-material.rst               |  15 ++
 docs/plugins/job.rst                        |  15 ++
 docs/plugins/labormanager.rst               | 105 +++++++++++
 docs/plugins/lair.rst                       |  12 ++
 docs/plugins/liquids-here.rst               |   6 +
 docs/plugins/liquids.rst                    |  65 +++++++
 docs/plugins/manipulator.rst                | 182 ++++++++++++++++++++
 docs/plugins/misery.rst                     |  14 ++
 docs/plugins/mode.rst                       |  21 +++
 docs/plugins/mousequery.rst                 |  16 ++
 docs/plugins/nestboxes.rst                  |   5 +
 docs/plugins/nopause.rst                    |   4 +
 docs/plugins/orders.rst                     | 116 +++++++++++++
 docs/plugins/petcapRemover.rst              |  19 ++
 docs/plugins/plant.rst                      |  16 ++
 docs/plugins/power-meter.rst                |   6 +
 docs/plugins/probe.rst                      |  13 ++
 docs/plugins/prospect.rst                   |  51 ++++++
 docs/plugins/prospector.rst                 |  51 ++++++
 docs/plugins/rb.rst                         |   4 +
 docs/plugins/regrass.rst                    |   3 +
 docs/plugins/remotefortressreader.rst       |   4 +
 docs/plugins/rename.rst                     |  19 ++
 docs/plugins/rendermax.rst                  |  18 ++
 docs/plugins/restrictice.rst                |   4 +
 docs/plugins/restrictliquids.rst            |   4 +
 docs/plugins/resume.rst                     |   4 +
 docs/plugins/reveal.rst                     |  23 +++
 docs/plugins/revflood.rst                   |  23 +++
 docs/plugins/revforget.rst                  |  23 +++
 docs/plugins/revtoggle.rst                  |  23 +++
 docs/plugins/ruby.rst                       |   4 +
 docs/plugins/search.rst                     |  40 +++++
 docs/plugins/seedwatch.rst                  |  27 +++
 docs/plugins/showmood.rst                   |   3 +
 docs/plugins/siege-engine.rst               |  12 ++
 docs/plugins/sort-items.rst                 |  17 ++
 docs/plugins/sort-units.rst                 |  17 ++
 docs/plugins/spectate.rst                   |   5 +
 docs/plugins/spotclean.rst                  |   6 +
 docs/plugins/steam-engine.rst               |  84 +++++++++
 docs/plugins/stockflow.rst                  |  31 ++++
 docs/plugins/stockpiles.rst                 |  28 +++
 docs/plugins/stocks.rst                     |   6 +
 docs/plugins/stonesense.rst                 |  10 ++
 docs/plugins/strangemood.rst                |  19 ++
 docs/plugins/tailor.rst                     |  11 ++
 docs/plugins/tiletypes-command.rst          |  10 ++
 docs/plugins/tiletypes-here-point.rst       |   6 +
 docs/plugins/tiletypes-here.rst             |  14 ++
 docs/plugins/tiletypes.rst                  |  82 +++++++++
 docs/plugins/title-folder.rst               |   3 +
 docs/plugins/title-version.rst              |   3 +
 docs/plugins/trackstop.rst                  |   5 +
 docs/plugins/tubefill.rst                   |  11 ++
 docs/plugins/tweak.rst                      |  91 ++++++++++
 docs/plugins/unreveal.rst                   |  23 +++
 docs/plugins/workNow.rst                    |  12 ++
 docs/plugins/workflow.rst                   | 113 ++++++++++++
 docs/plugins/zone.rst                       | 130 ++++++++++++++
 121 files changed, 3239 insertions(+)
 create mode 100644 docs/plugins/3dveins.rst
 create mode 100644 docs/plugins/add-spatter.rst
 create mode 100644 docs/plugins/adv-bodyswap.rst
 create mode 100644 docs/plugins/alltraffic.rst
 create mode 100644 docs/plugins/autobutcher.rst
 create mode 100644 docs/plugins/autochop.rst
 create mode 100644 docs/plugins/autoclothing.rst
 create mode 100644 docs/plugins/autodump.rst
 create mode 100644 docs/plugins/autofarm.rst
 create mode 100644 docs/plugins/autogems.rst
 create mode 100644 docs/plugins/autohauler.rst
 create mode 100644 docs/plugins/autolabor.rst
 create mode 100644 docs/plugins/automaterial.rst
 create mode 100644 docs/plugins/automelt.rst
 create mode 100644 docs/plugins/autonestbox.rst
 create mode 100644 docs/plugins/autotrade.rst
 create mode 100644 docs/plugins/blueprint.rst
 create mode 100644 docs/plugins/buildingplan.rst
 create mode 100644 docs/plugins/burrows.rst
 create mode 100644 docs/plugins/changeitem.rst
 create mode 100644 docs/plugins/changelayer.rst
 create mode 100644 docs/plugins/changevein.rst
 create mode 100644 docs/plugins/clean.rst
 create mode 100644 docs/plugins/cleanconst.rst
 create mode 100644 docs/plugins/cleanowned.rst
 create mode 100644 docs/plugins/command-prompt.rst
 create mode 100644 docs/plugins/confirm.rst
 create mode 100644 docs/plugins/createitem.rst
 create mode 100644 docs/plugins/cursecheck.rst
 create mode 100644 docs/plugins/debug.rst
 create mode 100644 docs/plugins/deramp.rst
 create mode 100644 docs/plugins/dig-now.rst
 create mode 100644 docs/plugins/dig.rst
 create mode 100644 docs/plugins/digFlood.rst
 create mode 100644 docs/plugins/digcircle.rst
 create mode 100644 docs/plugins/digexp.rst
 create mode 100644 docs/plugins/diggingInvaders.rst
 create mode 100644 docs/plugins/digl.rst
 create mode 100644 docs/plugins/diglx.rst
 create mode 100644 docs/plugins/digtype.rst
 create mode 100644 docs/plugins/digv.rst
 create mode 100644 docs/plugins/digvx.rst
 create mode 100644 docs/plugins/dwarfmonitor.rst
 create mode 100644 docs/plugins/dwarfvet.rst
 create mode 100644 docs/plugins/embark-assistant.rst
 create mode 100644 docs/plugins/embark-tools.rst
 create mode 100644 docs/plugins/fastdwarf.rst
 create mode 100644 docs/plugins/filltraffic.rst
 create mode 100644 docs/plugins/fix-armory.rst
 create mode 100644 docs/plugins/fix-job-postings.rst
 create mode 100644 docs/plugins/fix-unit-occupancy.rst
 create mode 100644 docs/plugins/fixveins.rst
 create mode 100644 docs/plugins/flows.rst
 create mode 100644 docs/plugins/follow.rst
 create mode 100644 docs/plugins/forceequip.rst
 create mode 100644 docs/plugins/generated-creature-renamer.rst
 create mode 100644 docs/plugins/getplants.rst
 create mode 100644 docs/plugins/hotkeys.rst
 create mode 100644 docs/plugins/infiniteSky.rst
 create mode 100644 docs/plugins/isoworldremote.rst
 create mode 100644 docs/plugins/job-duplicate.rst
 create mode 100644 docs/plugins/job-material.rst
 create mode 100644 docs/plugins/job.rst
 create mode 100644 docs/plugins/labormanager.rst
 create mode 100644 docs/plugins/lair.rst
 create mode 100644 docs/plugins/liquids-here.rst
 create mode 100644 docs/plugins/liquids.rst
 create mode 100644 docs/plugins/manipulator.rst
 create mode 100644 docs/plugins/misery.rst
 create mode 100644 docs/plugins/mode.rst
 create mode 100644 docs/plugins/mousequery.rst
 create mode 100644 docs/plugins/nestboxes.rst
 create mode 100644 docs/plugins/nopause.rst
 create mode 100644 docs/plugins/orders.rst
 create mode 100644 docs/plugins/petcapRemover.rst
 create mode 100644 docs/plugins/plant.rst
 create mode 100644 docs/plugins/power-meter.rst
 create mode 100644 docs/plugins/probe.rst
 create mode 100644 docs/plugins/prospect.rst
 create mode 100644 docs/plugins/prospector.rst
 create mode 100644 docs/plugins/rb.rst
 create mode 100644 docs/plugins/regrass.rst
 create mode 100644 docs/plugins/remotefortressreader.rst
 create mode 100644 docs/plugins/rename.rst
 create mode 100644 docs/plugins/rendermax.rst
 create mode 100644 docs/plugins/restrictice.rst
 create mode 100644 docs/plugins/restrictliquids.rst
 create mode 100644 docs/plugins/resume.rst
 create mode 100644 docs/plugins/reveal.rst
 create mode 100644 docs/plugins/revflood.rst
 create mode 100644 docs/plugins/revforget.rst
 create mode 100644 docs/plugins/revtoggle.rst
 create mode 100644 docs/plugins/ruby.rst
 create mode 100644 docs/plugins/search.rst
 create mode 100644 docs/plugins/seedwatch.rst
 create mode 100644 docs/plugins/showmood.rst
 create mode 100644 docs/plugins/siege-engine.rst
 create mode 100644 docs/plugins/sort-items.rst
 create mode 100644 docs/plugins/sort-units.rst
 create mode 100644 docs/plugins/spectate.rst
 create mode 100644 docs/plugins/spotclean.rst
 create mode 100644 docs/plugins/steam-engine.rst
 create mode 100644 docs/plugins/stockflow.rst
 create mode 100644 docs/plugins/stockpiles.rst
 create mode 100644 docs/plugins/stocks.rst
 create mode 100644 docs/plugins/stonesense.rst
 create mode 100644 docs/plugins/strangemood.rst
 create mode 100644 docs/plugins/tailor.rst
 create mode 100644 docs/plugins/tiletypes-command.rst
 create mode 100644 docs/plugins/tiletypes-here-point.rst
 create mode 100644 docs/plugins/tiletypes-here.rst
 create mode 100644 docs/plugins/tiletypes.rst
 create mode 100644 docs/plugins/title-folder.rst
 create mode 100644 docs/plugins/title-version.rst
 create mode 100644 docs/plugins/trackstop.rst
 create mode 100644 docs/plugins/tubefill.rst
 create mode 100644 docs/plugins/tweak.rst
 create mode 100644 docs/plugins/unreveal.rst
 create mode 100644 docs/plugins/workNow.rst
 create mode 100644 docs/plugins/workflow.rst
 create mode 100644 docs/plugins/zone.rst

diff --git a/docs/plugins/3dveins.rst b/docs/plugins/3dveins.rst
new file mode 100644
index 000000000..0e6841792
--- /dev/null
+++ b/docs/plugins/3dveins.rst
@@ -0,0 +1,14 @@
+3dveins
+=======
+Removes all existing veins from the map and generates new ones using
+3D Perlin noise, in order to produce a layout that smoothly flows between
+Z levels. The vein distribution is based on the world seed, so running
+the command for the second time should produce no change. It is best to
+run it just once immediately after embark.
+
+This command is intended as only a cosmetic change, so it takes
+care to exactly preserve the mineral counts reported by `prospect` ``all``.
+The amounts of different layer stones may slightly change in some cases
+if vein mass shifts between Z layers.
+
+The only undo option is to restore your save from backup.
diff --git a/docs/plugins/add-spatter.rst b/docs/plugins/add-spatter.rst
new file mode 100644
index 000000000..15b99ff52
--- /dev/null
+++ b/docs/plugins/add-spatter.rst
@@ -0,0 +1,6 @@
+add-spatter
+===========
+This plugin makes reactions with names starting with ``SPATTER_ADD_``
+produce contaminants on the items instead of improvements.  The plugin is
+intended to give some use to all those poisons that can be bought from caravans,
+so they're immune to being washed away by water or destroyed by `clean`.
diff --git a/docs/plugins/adv-bodyswap.rst b/docs/plugins/adv-bodyswap.rst
new file mode 100644
index 000000000..46b961517
--- /dev/null
+++ b/docs/plugins/adv-bodyswap.rst
@@ -0,0 +1,12 @@
+adv-bodyswap
+============
+This allows taking control over your followers and other creatures in adventure
+mode. For example, you can make them pick up new arms and armor and equip them
+properly.
+
+Usage:
+
+* When viewing unit details, body-swaps into that unit.
+* In the main adventure mode screen, reverts transient swap.
+
+:dfhack-keybind:`adv-bodyswap`
diff --git a/docs/plugins/alltraffic.rst b/docs/plugins/alltraffic.rst
new file mode 100644
index 000000000..1e9116954
--- /dev/null
+++ b/docs/plugins/alltraffic.rst
@@ -0,0 +1,11 @@
+alltraffic
+==========
+Set traffic designations for every single tile of the map - useful for resetting
+traffic designations.  See also `filltraffic`, `restrictice`, and `restrictliquids`.
+
+Options:
+
+:H:     High Traffic
+:N:     Normal Traffic
+:L:     Low Traffic
+:R:     Restricted Traffic
diff --git a/docs/plugins/autobutcher.rst b/docs/plugins/autobutcher.rst
new file mode 100644
index 000000000..d761cbdbe
--- /dev/null
+++ b/docs/plugins/autobutcher.rst
@@ -0,0 +1,91 @@
+autobutcher
+===========
+Assigns lifestock for slaughter once it reaches a specific count. Requires that
+you add the target race(s) to a watch list. Only tame units will be processed.
+
+Units will be ignored if they are:
+
+* Nicknamed (for custom protection; you can use the `rename` ``unit`` tool
+  individually, or `zone` ``nick`` for groups)
+* Caged, if and only if the cage is defined as a room (to protect zoos)
+* Trained for war or hunting
+
+Creatures who will not reproduce (because they're not interested in the
+opposite sex or have been gelded) will be butchered before those who will.
+Older adults and younger children will be butchered first if the population
+is above the target (default 1 male, 5 female kids and adults).  Note that
+you may need to set a target above 1 to have a reliable breeding population
+due to asexuality etc.  See `fix-ster` if this is a problem.
+
+Options:
+
+:example:      Print some usage examples.
+:start:        Start running every X frames (df simulation ticks).
+               Default: X=6000, which would be every 60 seconds at 100fps.
+:stop:         Stop running automatically.
+:sleep <x>:    Changes the timer to sleep X frames between runs.
+:watch R:      Start watching a race. R can be a valid race RAW id (ALPACA,
+               BIRD_TURKEY, etc) or a list of ids seperated by spaces or
+               the keyword 'all' which affects all races on your current
+               watchlist.
+:unwatch R:    Stop watching race(s). The current target settings will be
+               remembered. R can be a list of ids or the keyword 'all'.
+:forget R:     Stop watching race(s) and forget it's/their target settings.
+               R can be a list of ids or the keyword 'all'.
+:autowatch:    Automatically adds all new races (animals you buy from merchants,
+               tame yourself or get from migrants) to the watch list using
+               default target count.
+:noautowatch:  Stop auto-adding new races to the watchlist.
+:list:         Print the current status and watchlist.
+:list_export:  Print the commands needed to set up status and watchlist,
+               which can be used to import them to another save (see notes).
+:target <fk> <mk> <fa> <ma> <R>:
+               Set target count for specified race(s).  The first four arguments
+               are the number of female and male kids, and female and male adults.
+               R can be a list of spceies ids, or the keyword ``all`` or ``new``.
+               ``R = 'all'``: change target count for all races on watchlist
+               and set the new default for the future. ``R = 'new'``: don't touch
+               current settings on the watchlist, only set the new default
+               for future entries.
+:list_export:  Print the commands required to rebuild your current settings.
+
+.. note::
+
+    Settings and watchlist are stored in the savegame, so that you can have
+    different settings for each save. If you want to copy your watchlist to
+    another savegame you must export the commands required to recreate your settings.
+
+    To export, open an external terminal in the DF directory, and run
+    ``dfhack-run autobutcher list_export > filename.txt``.  To import, load your
+    new save and run ``script filename.txt`` in the DFHack terminal.
+
+
+Examples:
+
+You want to keep max 7 kids (4 female, 3 male) and max 3 adults (2 female,
+1 male) of the race alpaca. Once the kids grow up the oldest adults will get
+slaughtered. Excess kids will get slaughtered starting with the youngest
+to allow that the older ones grow into adults. Any unnamed cats will
+be slaughtered as soon as possible. ::
+
+     autobutcher target 4 3 2 1 ALPACA BIRD_TURKEY
+     autobutcher target 0 0 0 0 CAT
+     autobutcher watch ALPACA BIRD_TURKEY CAT
+     autobutcher start
+
+Automatically put all new races onto the watchlist and mark unnamed tame units
+for slaughter as soon as they arrive in your fort. Settings already made
+for specific races will be left untouched. ::
+
+     autobutcher target 0 0 0 0 new
+     autobutcher autowatch
+     autobutcher start
+
+Stop watching the races alpaca and cat, but remember the target count
+settings so that you can use 'unwatch' without the need to enter the
+values again. Note: 'autobutcher unwatch all' works, but only makes sense
+if you want to keep the plugin running with the 'autowatch' feature or manually
+add some new races with 'watch'. If you simply want to stop it completely use
+'autobutcher stop' instead. ::
+
+    autobutcher unwatch ALPACA CAT
diff --git a/docs/plugins/autochop.rst b/docs/plugins/autochop.rst
new file mode 100644
index 000000000..4a669480f
--- /dev/null
+++ b/docs/plugins/autochop.rst
@@ -0,0 +1,16 @@
+autochop
+========
+Automatically manage tree cutting designation to keep available logs withing given
+quotas.
+
+Open the dashboard by running::
+
+    enable autochop
+
+The plugin must be activated (with :kbd:`d`-:kbd:`t`-:kbd:`c`-:kbd:`a`) before
+it can be used. You can then set logging quotas and restrict designations to
+specific burrows (with 'Enter') if desired. The plugin's activity cycle runs
+once every in game day.
+
+If you add ``enable autochop`` to your dfhack.init there will be a hotkey to
+open the dashboard from the chop designation menu.
diff --git a/docs/plugins/autoclothing.rst b/docs/plugins/autoclothing.rst
new file mode 100644
index 000000000..7169844dd
--- /dev/null
+++ b/docs/plugins/autoclothing.rst
@@ -0,0 +1,14 @@
+autoclothing
+============
+
+Automatically manage clothing work orders, allowing the user to set how many of
+each clothing type every citizen should have. Usage::
+
+    autoclothing <material> <item> [number]
+
+Examples:
+
+* ``autoclothing cloth "short skirt" 10``:
+    Sets the desired number of cloth short skirts available per citizen to 10.
+* ``autoclothing cloth dress``:
+    Displays the currently set number of cloth dresses chosen per citizen.
diff --git a/docs/plugins/autodump.rst b/docs/plugins/autodump.rst
new file mode 100644
index 000000000..9bd74cff7
--- /dev/null
+++ b/docs/plugins/autodump.rst
@@ -0,0 +1,29 @@
+autodump
+========
+This plugin adds an option to the :kbd:`q` menu for stckpiles when `enabled <enable>`.
+When autodump is enabled for a stockpile, any items placed in the stockpile will
+automatically be designated to be dumped.
+
+Alternatively, you can use it to quickly move all items designated to be dumped.
+Items are instantly moved to the cursor position, the dump flag is unset,
+and the forbid flag is set, as if it had been dumped normally.
+Be aware that any active dump item tasks still point at the item.
+
+Cursor must be placed on a floor tile so the items can be dumped there.
+
+Options:
+
+:destroy:            Destroy instead of dumping. Doesn't require a cursor.
+                     If called again before the game is resumed, cancels destroy.
+:destroy-here:       As ``destroy``, but only the selected item in the :kbd:`k` list,
+                     or inside a container.
+                     Alias ``autodump-destroy-here``, for keybindings.
+                     :dfhack-keybind:`autodump-destroy-here`
+:visible:            Only process items that are not hidden.
+:hidden:             Only process hidden items.
+:forbidden:          Only process forbidden items (default: only unforbidden).
+
+``autodump-destroy-item`` destroys the selected item, which may be selected
+in the :kbd:`k` list, or inside a container. If called again before the game
+is resumed, cancels destruction of the item.
+:dfhack-keybind:`autodump-destroy-item`
diff --git a/docs/plugins/autofarm.rst b/docs/plugins/autofarm.rst
new file mode 100644
index 000000000..b330517d0
--- /dev/null
+++ b/docs/plugins/autofarm.rst
@@ -0,0 +1,21 @@
+autofarm
+========
+
+Automatically handles crop selection in farm plots based on current plant
+stocks, and selects crops for planting if current stock is below a threshold.
+Selected crops are dispatched on all farmplots. (Note that this plugin replaces
+an older Ruby script of the same name.)
+
+Use the `enable` or `disable <disable>` commands to change whether this plugin is
+enabled.
+
+Usage:
+
+* ``autofarm runonce``:
+    Updates all farm plots once, without enabling the plugin
+* ``autofarm status``:
+    Prints status information, including any applied limits
+* ``autofarm default 30``:
+    Sets the default threshold
+* ``autofarm threshold 150 helmet_plump tail_pig``:
+    Sets thresholds of individual plants
diff --git a/docs/plugins/autogems.rst b/docs/plugins/autogems.rst
new file mode 100644
index 000000000..59800e1b9
--- /dev/null
+++ b/docs/plugins/autogems.rst
@@ -0,0 +1,7 @@
+autogems
+========
+Creates a new Workshop Order setting, automatically cutting rough gems
+when `enabled <enable>`.
+
+See `gui/autogems` for a configuration UI. If necessary, the ``autogems-reload``
+command reloads the configuration file produced by that script.
diff --git a/docs/plugins/autohauler.rst b/docs/plugins/autohauler.rst
new file mode 100644
index 000000000..289874f94
--- /dev/null
+++ b/docs/plugins/autohauler.rst
@@ -0,0 +1,20 @@
+autohauler
+==========
+Autohauler is an autolabor fork.
+
+Rather than the all-of-the-above means of autolabor, autohauler will instead
+only manage hauling labors and leave skilled labors entirely to the user, who
+will probably use Dwarf Therapist to do so.
+
+Idle dwarves will be assigned the hauling labors; everyone else (including
+those currently hauling) will have the hauling labors removed. This is to
+encourage every dwarf to do their assigned skilled labors whenever possible,
+but resort to hauling when those jobs are not available. This also implies
+that the user will have a very tight skill assignment, with most skilled
+labors only being assigned to just one dwarf, no dwarf having more than two
+active skilled labors, and almost every non-military dwarf having at least
+one skilled labor assigned.
+
+Autohauler allows skills to be flagged as to prevent hauling labors from
+being assigned when the skill is present. By default this is the unused
+ALCHEMIST labor but can be changed by the user.
diff --git a/docs/plugins/autolabor.rst b/docs/plugins/autolabor.rst
new file mode 100644
index 000000000..b63b9102b
--- /dev/null
+++ b/docs/plugins/autolabor.rst
@@ -0,0 +1,70 @@
+autolabor
+=========
+Automatically manage dwarf labors to efficiently complete jobs.
+Autolabor tries to keep as many dwarves as possible busy but
+also tries to have dwarves specialize in specific skills.
+
+The key is that, for almost all labors, once a dwarf begins a job it will finish that
+job even if the associated labor is removed. Autolabor therefore frequently checks
+which dwarf or dwarves should take new jobs for that labor, and sets labors accordingly.
+Labors with equipment (mining, hunting, and woodcutting), which are abandoned
+if labors change mid-job, are handled slightly differently to minimise churn.
+
+.. warning::
+
+    *autolabor will override any manual changes you make to labors while
+    it is enabled, including through other tools such as Dwarf Therapist*
+
+Simple usage:
+
+:enable autolabor:      Enables the plugin with default settings.  (Persistent per fortress)
+:disable autolabor:     Disables the plugin.
+
+Anything beyond this is optional - autolabor works well on the default settings.
+
+By default, each labor is assigned to between 1 and 200 dwarves (2-200 for mining).
+By default 33% of the workforce become haulers, who handle all hauling jobs as well
+as cleaning, pulling levers, recovering wounded, removing constructions, and filling ponds.
+Other jobs are automatically assigned as described above.  Each of these settings can be adjusted.
+
+Jobs are rarely assigned to nobles with responsibilities for meeting diplomats or merchants,
+never to the chief medical dwarf, and less often to the bookeeper and manager.
+
+Hunting is never assigned without a butchery, and fishing is never assigned without a fishery.
+
+For each labor a preference order is calculated based on skill, biased against masters of other
+trades and excluding those who can't do the job.  The labor is then added to the best <minimum>
+dwarves for that labor.  We assign at least the minimum number of dwarfs, in order of preference,
+and then assign additional dwarfs that meet any of these conditions:
+
+* The dwarf is idle and there are no idle dwarves assigned to this labor
+* The dwarf has non-zero skill associated with the labor
+* The labor is mining, hunting, or woodcutting and the dwarf currently has it enabled.
+
+We stop assigning dwarfs when we reach the maximum allowed.
+
+Advanced usage:
+
+:autolabor <labor> <minimum> [<maximum>]:
+                                Set number of dwarves assigned to a labor.
+:autolabor <labor> haulers:     Set a labor to be handled by hauler dwarves.
+:autolabor <labor> disable:     Turn off autolabor for a specific labor.
+:autolabor <labor> reset:       Return a labor to the default handling.
+:autolabor reset-all:           Return all labors to the default handling.
+:autolabor list:                List current status of all labors.
+:autolabor status:              Show basic status information.
+
+See `autolabor-artisans` for a differently-tuned setup.
+
+Examples:
+
+``autolabor MINE``
+        Keep at least 5 dwarves with mining enabled.
+``autolabor CUT_GEM 1 1``
+        Keep exactly 1 dwarf with gemcutting enabled.
+``autolabor COOK 1 1 3``
+        Keep 1 dwarf with cooking enabled, selected only from the top 3.
+``autolabor FEED_WATER_CIVILIANS haulers``
+        Have haulers feed and water wounded dwarves.
+``autolabor CUTWOOD disable``
+        Turn off autolabor for wood cutting.
diff --git a/docs/plugins/automaterial.rst b/docs/plugins/automaterial.rst
new file mode 100644
index 000000000..81de0cb3d
--- /dev/null
+++ b/docs/plugins/automaterial.rst
@@ -0,0 +1,33 @@
+automaterial
+============
+This makes building constructions (walls, floors, fortifications, etc) a little bit
+easier by saving you from having to trawl through long lists of materials each time
+you place one.
+
+Firstly, it moves the last used material for a given construction type to the top of
+the list, if there are any left. So if you build a wall with chalk blocks, the next
+time you place a wall the chalk blocks will be at the top of the list, regardless of
+distance (it only does this in "grouped" mode, as individual item lists could be huge).
+This should mean you can place most constructions without having to search for your
+preferred material type.
+
+.. image:: ../images/automaterial-mat.png
+
+Pressing :kbd:`a` while highlighting any material will enable that material for "auto select"
+for this construction type. You can enable multiple materials as autoselect. Now the next
+time you place this type of construction, the plugin will automatically choose materials
+for you from the kinds you enabled. If there is enough to satisfy the whole placement,
+you won't be prompted with the material screen - the construction will be placed and you
+will be back in the construction menu as if you did it manually.
+
+When choosing the construction placement, you will see a couple of options:
+
+.. image:: ../images/automaterial-pos.png
+
+Use :kbd:`a` here to temporarily disable the material autoselection, e.g. if you need
+to go to the material selection screen so you can toggle some materials on or off.
+
+The other option (auto type selection, off by default) can be toggled on with :kbd:`t`. If you
+toggle this option on, instead of returning you to the main construction menu after selecting
+materials, it returns you back to this screen. If you use this along with several autoselect
+enabled materials, you should be able to place complex constructions more conveniently.
diff --git a/docs/plugins/automelt.rst b/docs/plugins/automelt.rst
new file mode 100644
index 000000000..73f8ba502
--- /dev/null
+++ b/docs/plugins/automelt.rst
@@ -0,0 +1,5 @@
+automelt
+========
+When automelt is enabled for a stockpile, any meltable items placed
+in it will be designated to be melted.
+This plugin adds an option to the :kbd:`q` menu when `enabled <enable>`.
diff --git a/docs/plugins/autonestbox.rst b/docs/plugins/autonestbox.rst
new file mode 100644
index 000000000..f19cad42c
--- /dev/null
+++ b/docs/plugins/autonestbox.rst
@@ -0,0 +1,19 @@
+autonestbox
+===========
+Assigns unpastured female egg-layers to nestbox zones. Requires that you create
+pen/pasture zones above nestboxes. If the pen is bigger than 1x1 the nestbox
+must be in the top left corner. Only 1 unit will be assigned per pen, regardless
+of the size. The age of the units is currently not checked, most birds grow up
+quite fast. Egglayers who are also grazers will be ignored, since confining them
+to a 1x1 pasture is not a good idea. Only tame and domesticated own units are
+processed since pasturing half-trained wild egglayers could destroy your neat
+nestbox zones when they revert to wild. When called without options autonestbox
+will instantly run once.
+
+Options:
+
+:start:        Start running every X frames (df simulation ticks).
+               Default: X=6000, which would be every 60 seconds at 100fps.
+:stop:         Stop running automatically.
+:sleep:        Must be followed by number X. Changes the timer to sleep X
+               frames between runs.
diff --git a/docs/plugins/autotrade.rst b/docs/plugins/autotrade.rst
new file mode 100644
index 000000000..4f0d95efd
--- /dev/null
+++ b/docs/plugins/autotrade.rst
@@ -0,0 +1,5 @@
+autotrade
+=========
+When autotrade is enabled for a stockpile, any items placed in it will be
+designated to be taken to the Trade Depot whenever merchants are on the map.
+This plugin adds an option to the :kbd:`q` menu when `enabled <enable>`.
diff --git a/docs/plugins/blueprint.rst b/docs/plugins/blueprint.rst
new file mode 100644
index 000000000..6d5e306d1
--- /dev/null
+++ b/docs/plugins/blueprint.rst
@@ -0,0 +1,112 @@
+blueprint
+=========
+The ``blueprint`` command exports the structure of a portion of your fortress in
+a blueprint file that you (or anyone else) can later play back with `quickfort`.
+
+Blueprints are ``.csv`` or ``.xlsx`` files created in the ``blueprints``
+subdirectory of your DF folder. The map area to turn into a blueprint is either
+selected interactively with the ``blueprint gui`` command or, if the GUI is not
+used, starts at the active cursor location and extends right and down for the
+requested width and height.
+
+**Usage:**
+
+    ``blueprint <width> <height> [<depth>] [<name> [<phases>]] [<options>]``
+
+    ``blueprint gui [<name> [<phases>]] [<options>]``
+
+**Examples:**
+
+``blueprint gui``
+    Runs `gui/blueprint`, the interactive frontend, where all configuration for
+    a ``blueprint`` command can be set visually and interactively.
+
+``blueprint 30 40 bedrooms``
+    Generates blueprints for an area 30 tiles wide by 40 tiles tall, starting
+    from the active cursor on the current z-level. Blueprints are written
+    sequentially to ``bedrooms.csv`` in the ``blueprints`` directory.
+
+``blueprint 30 40 bedrooms dig --cursor 108,100,150``
+    Generates only the ``#dig`` blueprint in the ``bedrooms.csv`` file, and
+    the start of the blueprint area is set to a specific value instead of using
+    the in-game cursor position.
+
+**Positional Parameters:**
+
+:``width``:   Width of the area (in tiles) to translate.
+:``height``:  Height of the area (in tiles) to translate.
+:``depth``:   Number of z-levels to translate. Positive numbers go *up* from the
+    cursor and negative numbers go *down*. Defaults to 1 if not specified,
+    indicating that the blueprint should only include the current z-level.
+:``name``:    Base name for blueprint files created in the ``blueprints``
+    directory. If no name is specified, "blueprint" is used by default. The
+    string must contain some characters other than numbers so the name won't be
+    confused with the optional ``depth`` parameter.
+
+**Phases:**
+
+If you want to generate blueprints only for specific phases, add their names to
+the commandline, anywhere after the blueprint base name. You can list multiple
+phases; just separate them with a space.
+
+:``dig``:    Generate quickfort ``#dig`` blueprints for digging natural stone.
+:``carve``:  Generate quickfort ``#dig`` blueprints for smoothing and carving.
+:``build``:  Generate quickfort ``#build`` blueprints for constructions and
+    buildings.
+:``place``:  Generate quickfort ``#place`` blueprints for placing stockpiles.
+:``zone``:   Generate quickfort ``#zone`` blueprints for designating zones.
+:``query``:  Generate quickfort ``#query`` blueprints for configuring rooms.
+
+If no phases are specified, phases are autodetected. For example, a ``#place``
+blueprint will be created only if there are stockpiles in the blueprint area.
+
+**Options:**
+
+``-c``, ``--cursor <x>,<y>,<z>``:
+    Use the specified map coordinates instead of the current cursor position for
+    the upper left corner of the blueprint range. If this option is specified,
+    then an active game map cursor is not necessary.
+``-e``, ``--engrave``:
+    Record engravings in the ``carve`` phase. If this option is not specified,
+    engravings are ignored.
+``-f``, ``--format <format>``:
+    Select the output format of the generated files. See the ``Output formats``
+    section below for options. If not specified, the output format defaults to
+    "minimal", which will produce a small, fast ``.csv`` file.
+``-h``, ``--help``:
+    Show command help text.
+``-s``, ``--playback-start <x>,<y>,<comment>``:
+    Specify the column and row offsets (relative to the upper-left corner of the
+    blueprint, which is ``1,1``) where the player should put the cursor when the
+    blueprint is played back with `quickfort`, in
+    `quickfort start marker <quickfort-start>` format, for example:
+    ``10,10,central stairs``. If there is a space in the comment, you will need
+    to surround the parameter string in double quotes: ``"-s10,10,central stairs"`` or
+    ``--playback-start "10,10,central stairs"`` or
+    ``"--playback-start=10,10,central stairs"``.
+``-t``, ``--splitby <strategy>``:
+    Split blueprints into multiple files. See the ``Splitting output into
+    multiple files`` section below for details. If not specified, defaults to
+    "none", which will create a standard quickfort
+    `multi-blueprint <quickfort-packaging>` file.
+
+**Output formats:**
+
+Here are the values that can be passed to the ``--format`` flag:
+
+:``minimal``:
+    Creates ``.csv`` files with minimal file size that are fast to read and
+    write. This is the default.
+:``pretty``:
+    Makes the blueprints in the ``.csv`` files easier to read and edit with a text
+    editor by adding extra spacing and alignment markers.
+
+**Splitting output into multiple files:**
+
+The ``--splitby`` flag can take any of the following values:
+
+:``none``:
+    Writes all blueprints into a single file. This is the standard format for
+    quickfort fortress blueprint bundles and is the default.
+:``phase``:
+    Creates a separate file for each phase.
diff --git a/docs/plugins/buildingplan.rst b/docs/plugins/buildingplan.rst
new file mode 100644
index 000000000..ca6273d10
--- /dev/null
+++ b/docs/plugins/buildingplan.rst
@@ -0,0 +1,88 @@
+buildingplan
+============
+When active (via ``enable buildingplan``), this plugin adds a planning mode for
+building placement. You can then place furniture, constructions, and other buildings
+before the required materials are available, and they will be created in a suspended
+state. Buildingplan will periodically scan for appropriate items, and the jobs will
+be unsuspended when the items are available.
+
+This is very useful when combined with `workflow` - you can set a constraint
+to always have one or two doors/beds/tables/chairs/etc available, and place
+as many as you like. The plugins then take over and fulfill the orders,
+with minimal space dedicated to stockpiles.
+
+.. _buildingplan-filters:
+
+Item filtering
+--------------
+
+While placing a building, you can set filters for what materials you want the building made
+out of, what quality you want the component items to be, and whether you want the items to
+be decorated.
+
+If a building type takes more than one item to construct, use :kbd:`Ctrl`:kbd:`Left` and
+:kbd:`Ctrl`:kbd:`Right` to select the item that you want to set filters for. Any filters that
+you set will be used for all buildings of the selected type placed from that point onward
+(until you set a new filter or clear the current one). Buildings placed before the filters
+were changed will keep the filter values that were set when the building was placed.
+
+For example, you can be sure that all your constructed walls are the same color by setting
+a filter to accept only certain types of stone.
+
+Quickfort mode
+--------------
+
+If you use the external Python Quickfort to apply building blueprints instead of the native
+DFHack `quickfort` script, you must enable Quickfort mode. This temporarily enables
+buildingplan for all building types and adds an extra blank screen after every building
+placement. This "dummy" screen is needed for Python Quickfort to interact successfully with
+Dwarf Fortress.
+
+Note that Quickfort mode is only for compatibility with the legacy Python Quickfort. The
+DFHack `quickfort` script does not need Quickfort mode to be enabled. The `quickfort` script
+will successfully integrate with buildingplan as long as the buildingplan plugin is enabled.
+
+.. _buildingplan-settings:
+
+Global settings
+---------------
+
+The buildingplan plugin has several global settings that can be set from the UI (:kbd:`G`
+from any building placement screen, for example: :kbd:`b`:kbd:`a`:kbd:`G`). These settings
+can also be set from the ``DFHack#`` prompt once a map is loaded (or from your
+``onMapLoad.init`` file) with the syntax::
+
+    buildingplan set <setting> <true|false>
+
+and displayed with::
+
+    buildingplan set
+
+The available settings are:
+
++----------------+---------+-----------+---------------------------------------+
+| Setting        | Default | Persisted | Description                           |
++================+=========+===========+=======================================+
+| all_enabled    | false   | no        | Enable planning mode for all building |
+|                |         |           | types.                                |
++----------------+---------+-----------+---------------------------------------+
+| blocks         | true    | yes       | Allow blocks, boulders, logs, or bars |
++----------------+---------+           | to be matched for generic "building   |
+| boulders       | true    |           | material" items                       |
++----------------+---------+           |                                       |
+| logs           | true    |           |                                       |
++----------------+---------+           |                                       |
+| bars           | false   |           |                                       |
++----------------+---------+-----------+---------------------------------------+
+| quickfort_mode | false   | no        | Enable compatibility mode for the     |
+|                |         |           | legacy Python Quickfort (not required |
+|                |         |           | for DFHack quickfort)                 |
++----------------+---------+-----------+---------------------------------------+
+
+For example, to ensure you only use blocks when a "building material" item is required, you
+could add this to your ``onMapLoad.init`` file::
+
+    on-new-fortress buildingplan set boulders false; buildingplan set logs false
+
+Persisted settings (i.e. ``blocks``, ``boulders``, ``logs``, and ``bars``) are saved with
+your game, so you only need to set them to the values you want once.
diff --git a/docs/plugins/burrows.rst b/docs/plugins/burrows.rst
new file mode 100644
index 000000000..787b3ff37
--- /dev/null
+++ b/docs/plugins/burrows.rst
@@ -0,0 +1,38 @@
+burrows
+=======
+Miscellaneous burrow control. Allows manipulating burrows and automated burrow
+expansion while digging.
+
+Options:
+
+:enable feature ...:
+    Enable features of the plugin.
+:disable feature ...:
+    Disable features of the plugin.
+:clear-unit burrow burrow ...:
+    Remove all units from the burrows.
+:clear-tiles burrow burrow ...:
+    Remove all tiles from the burrows.
+:set-units target-burrow src-burrow ...:
+    Clear target, and adds units from source burrows.
+:add-units target-burrow src-burrow ...:
+    Add units from the source burrows to the target.
+:remove-units target-burrow src-burrow ...:
+    Remove units in source burrows from the target.
+:set-tiles target-burrow src-burrow ...:
+    Clear target and adds tiles from the source burrows.
+:add-tiles target-burrow src-burrow ...:
+    Add tiles from the source burrows to the target.
+:remove-tiles target-burrow src-burrow ...:
+    Remove tiles in source burrows from the target.
+
+    For these three options, in place of a source burrow it is
+    possible to use one of the following keywords: ABOVE_GROUND,
+    SUBTERRANEAN, INSIDE, OUTSIDE, LIGHT, DARK, HIDDEN, REVEALED
+
+Features:
+
+:auto-grow: When a wall inside a burrow with a name ending in '+' is dug
+            out, the burrow is extended to newly-revealed adjacent walls.
+            This final '+' may be omitted in burrow name args of commands above.
+            Digging 1-wide corridors with the miner inside the burrow is SLOW.
diff --git a/docs/plugins/changeitem.rst b/docs/plugins/changeitem.rst
new file mode 100644
index 000000000..c6da2516f
--- /dev/null
+++ b/docs/plugins/changeitem.rst
@@ -0,0 +1,26 @@
+changeitem
+==========
+Allows changing item material and base quality. By default the item currently
+selected in the UI will be changed (you can select items in the 'k' list
+or inside containers/inventory). By default change is only allowed if materials
+is of the same subtype (for example wood<->wood, stone<->stone etc). But since
+some transformations work pretty well and may be desired you can override this
+with 'force'. Note that some attributes will not be touched, possibly resulting
+in weirdness. To get an idea how the RAW id should look like, check some items
+with 'info'. Using 'force' might create items which are not touched by
+crafters/haulers.
+
+Options:
+
+:info:         Don't change anything, print some info instead.
+:here:         Change all items at the cursor position. Requires in-game cursor.
+:material, m:  Change material. Must be followed by valid material RAW id.
+:quality, q:   Change base quality. Must be followed by number (0-5).
+:force:        Ignore subtypes, force change to new material.
+
+Examples:
+
+``changeitem m INORGANIC:GRANITE here``
+   Change material of all items under the cursor to granite.
+``changeitem q 5``
+   Change currently selected item to masterpiece quality.
diff --git a/docs/plugins/changelayer.rst b/docs/plugins/changelayer.rst
new file mode 100644
index 000000000..87c27921c
--- /dev/null
+++ b/docs/plugins/changelayer.rst
@@ -0,0 +1,60 @@
+changelayer
+===========
+Changes material of the geology layer under cursor to the specified inorganic
+RAW material. Can have impact on all surrounding regions, not only your embark!
+By default changing stone to soil and vice versa is not allowed. By default
+changes only the layer at the cursor position. Note that one layer can stretch
+across lots of z levels. By default changes only the geology which is linked
+to the biome under the cursor. That geology might be linked to other biomes
+as well, though. Mineral veins and gem clusters will stay on the map. Use
+`changevein` for them.
+
+tl;dr: You will end up with changing quite big areas in one go, especially if
+you use it in lower z levels. Use with care.
+
+Options:
+
+:all_biomes:       Change selected layer for all biomes on your map.
+                   Result may be undesirable since the same layer can AND WILL
+                   be on different z-levels for different biomes. Use the tool
+                   'probe' to get an idea how layers and biomes are distributed
+                   on your map.
+:all_layers:       Change all layers on your map (only for the selected biome
+                   unless 'all_biomes' is added).
+                   Candy mountain, anyone? Will make your map quite boring,
+                   but tidy.
+:force:            Allow changing stone to soil and vice versa. !!THIS CAN HAVE
+                   WEIRD EFFECTS, USE WITH CARE!!
+                   Note that soil will not be magically replaced with stone.
+                   You will, however, get a stone floor after digging so it
+                   will allow the floor to be engraved.
+                   Note that stone will not be magically replaced with soil.
+                   You will, however, get a soil floor after digging so it
+                   could be helpful for creating farm plots on maps with no
+                   soil.
+:verbose:          Give some details about what is being changed.
+:trouble:          Give some advice about known problems.
+
+Examples:
+
+``changelayer GRANITE``
+   Convert layer at cursor position into granite.
+``changelayer SILTY_CLAY force``
+   Convert layer at cursor position into clay even if it's stone.
+``changelayer MARBLE all_biomes all_layers``
+   Convert all layers of all biomes which are not soil into marble.
+
+.. note::
+
+    * If you use changelayer and nothing happens, try to pause/unpause the game
+      for a while and try to move the cursor to another tile. Then try again.
+      If that doesn't help try temporarily changing some other layer, undo your
+      changes and try again for the layer you want to change. Saving
+      and reloading your map might also help.
+    * You should be fine if you only change single layers without the use
+      of 'force'. Still it's advisable to save your game before messing with
+      the map.
+    * When you force changelayer to convert soil to stone you might experience
+      weird stuff (flashing tiles, tiles changed all over place etc).
+      Try reverting the changes manually or even better use an older savegame.
+      You did save your game, right?
diff --git a/docs/plugins/changevein.rst b/docs/plugins/changevein.rst
new file mode 100644
index 000000000..ad7ab3d54
--- /dev/null
+++ b/docs/plugins/changevein.rst
@@ -0,0 +1,10 @@
+changevein
+==========
+Changes material of the vein under cursor to the specified inorganic RAW
+material. Only affects tiles within the current 16x16 block - for veins and
+large clusters, you will need to use this command multiple times.
+
+Example:
+
+``changevein NATIVE_PLATINUM``
+   Convert vein at cursor position into platinum ore.
diff --git a/docs/plugins/clean.rst b/docs/plugins/clean.rst
new file mode 100644
index 000000000..f2d0c361d
--- /dev/null
+++ b/docs/plugins/clean.rst
@@ -0,0 +1,16 @@
+clean
+=====
+Cleans all the splatter that get scattered all over the map, items and
+creatures. In an old fortress, this can significantly reduce FPS lag. It can
+also spoil your !!FUN!!, so think before you use it.
+
+Options:
+
+:map:          Clean the map tiles. By default, it leaves mud and snow alone.
+:units:        Clean the creatures. Will also clean hostiles.
+:items:        Clean all the items. Even a poisoned blade.
+
+Extra options for ``map``:
+
+:mud:          Remove mud in addition to the normal stuff.
+:snow:         Also remove snow coverings.
diff --git a/docs/plugins/cleanconst.rst b/docs/plugins/cleanconst.rst
new file mode 100644
index 000000000..a8169d83b
--- /dev/null
+++ b/docs/plugins/cleanconst.rst
@@ -0,0 +1,7 @@
+cleanconst
+==========
+Cleans up construction materials.
+
+This utility alters all constructions on the map so that they spawn their
+building component when they are disassembled, allowing their actual
+build items to be safely deleted.  This can improve FPS in extreme situations.
diff --git a/docs/plugins/cleanowned.rst b/docs/plugins/cleanowned.rst
new file mode 100644
index 000000000..7f80e35cf
--- /dev/null
+++ b/docs/plugins/cleanowned.rst
@@ -0,0 +1,19 @@
+cleanowned
+==========
+Confiscates items owned by dwarfs. By default, owned food on the floor
+and rotten items are confistacted and dumped.
+
+Options:
+
+:all:          confiscate all owned items
+:scattered:    confiscated and dump all items scattered on the floor
+:x:            confiscate/dump items with wear level 'x' and more
+:X:            confiscate/dump items with wear level 'X' and more
+:dryrun:       a dry run. combine with other options to see what will happen
+               without it actually happening.
+
+Example:
+
+``cleanowned scattered X``
+    This will confiscate rotten and dropped food, garbage on the floors and any
+    worn items with 'X' damage and above.
diff --git a/docs/plugins/command-prompt.rst b/docs/plugins/command-prompt.rst
new file mode 100644
index 000000000..061b405ef
--- /dev/null
+++ b/docs/plugins/command-prompt.rst
@@ -0,0 +1,16 @@
+command-prompt
+==============
+An in-game DFHack terminal, where you can enter other commands.
+
+:dfhack-keybind:`command-prompt`
+
+Usage: ``command-prompt [entry]``
+
+If called with an entry, it starts with that text filled in.
+Most useful for developers, who can set a keybinding to open
+a laungage interpreter for lua or Ruby by starting with the
+`:lua <lua>` or `:rb <rb>` commands.
+
+Otherwise somewhat similar to `gui/quickcmd`.
+
+.. image:: ../images/command-prompt.png
diff --git a/docs/plugins/confirm.rst b/docs/plugins/confirm.rst
new file mode 100644
index 000000000..c7fb89bb0
--- /dev/null
+++ b/docs/plugins/confirm.rst
@@ -0,0 +1,12 @@
+confirm
+=======
+Implements several confirmation dialogs for potentially destructive actions
+(for example, seizing goods from traders or deleting hauling routes).
+
+Usage:
+
+:enable confirm:    Enable all confirmations; alias ``confirm enable all``.
+                    Replace with ``disable`` to disable.
+:confirm help:      List available confirmation dialogues.
+:confirm enable option1 [option2...]:
+                    Enable (or disable) specific confirmation dialogues.
diff --git a/docs/plugins/createitem.rst b/docs/plugins/createitem.rst
new file mode 100644
index 000000000..f37154f80
--- /dev/null
+++ b/docs/plugins/createitem.rst
@@ -0,0 +1,48 @@
+createitem
+==========
+Allows creating new items of arbitrary types and made of arbitrary materials. A
+unit must be selected in-game to use this command. By default, items created are
+spawned at the feet of the selected unit.
+
+Specify the item and material information as you would indicate them in
+custom reaction raws, with the following differences:
+
+* Separate the item and material with a space rather than a colon
+* If the item has no subtype, the ``:NONE`` can be omitted
+* If the item is ``REMAINS``, ``FISH``, ``FISH_RAW``, ``VERMIN``, ``PET``, or ``EGG``,
+  specify a ``CREATURE:CASTE`` pair instead of a material token.
+* If the item is a ``PLANT_GROWTH``, specify a ``PLANT_ID:GROWTH_ID`` pair
+  instead of a material token.
+
+Corpses, body parts, and prepared meals cannot be created using this tool.
+
+To obtain the item and material tokens of an existing item, run
+``createitem inspect``. Its output can be passed directly as arguments to
+``createitem`` to create new matching items, as long as the item type is
+supported.
+
+Examples:
+
+* Create 2 pairs of steel gauntlets::
+
+    createitem GLOVES:ITEM_GLOVES_GAUNTLETS INORGANIC:STEEL 2
+
+* Create tower-cap logs::
+
+    createitem WOOD PLANT_MAT:TOWER_CAP:WOOD
+
+* Create bilberries::
+
+    createitem PLANT_GROWTH BILBERRY:FRUIT
+
+For more examples, :wiki:`see this wiki page <Utility:DFHack/createitem>`.
+
+To change where new items are placed, first run the command with a
+destination type while an appropriate destination is selected.
+
+Options:
+
+:floor:     Subsequent items will be placed on the floor beneath the selected unit's feet.
+:item:      Subsequent items will be stored inside the currently selected item.
+:building:  Subsequent items will become part of the currently selected building.
+            Good for loading traps; do not use with workshops (or deconstruct to use the item).
diff --git a/docs/plugins/cursecheck.rst b/docs/plugins/cursecheck.rst
new file mode 100644
index 000000000..1bf1803fa
--- /dev/null
+++ b/docs/plugins/cursecheck.rst
@@ -0,0 +1,42 @@
+cursecheck
+==========
+Checks a single map tile or the whole map/world for cursed creatures (ghosts,
+vampires, necromancers, werebeasts, zombies).
+
+With an active in-game cursor only the selected tile will be observed.
+Without a cursor the whole map will be checked.
+
+By default cursed creatures will be only counted in case you just want to find
+out if you have any of them running around in your fort. Dead and passive
+creatures (ghosts who were put to rest, killed vampires, ...) are ignored.
+Undead skeletons, corpses, bodyparts and the like are all thrown into the curse
+category "zombie". Anonymous zombies and resurrected body parts will show
+as "unnamed creature".
+
+Options:
+
+:detail:      Print full name, date of birth, date of curse and some status
+              info (some vampires might use fake identities in-game, though).
+:ids:         Print the creature and race IDs.
+:nick:        Set the type of curse as nickname (does not always show up
+              in-game, some vamps don't like nicknames).
+:all:         Include dead and passive cursed creatures (can result in a quite
+              long list after having FUN with necromancers).
+:verbose:     Print all curse tags (if you really want to know it all).
+
+Examples:
+
+``cursecheck detail all``
+   Give detailed info about all cursed creatures including deceased ones (no
+   in-game cursor).
+``cursecheck nick``
+   Give a nickname all living/active cursed creatures on the map(no in-game
+   cursor).
+
+.. note::
+
+    If you do a full search (with the option "all") former ghosts will show up
+    with the cursetype "unknown" because their ghostly flag is not set.
+
+    Please report any living/active creatures with cursetype "unknown" -
+    this is most likely with mods which introduce new types of curses.
diff --git a/docs/plugins/debug.rst b/docs/plugins/debug.rst
new file mode 100644
index 000000000..2bef7d28a
--- /dev/null
+++ b/docs/plugins/debug.rst
@@ -0,0 +1,89 @@
+debug
+=====
+Manager for DFHack runtime debug prints. Debug prints are grouped by plugin name,
+category name and print level. Levels are ``trace``, ``debug``, ``info``,
+``warning`` and ``error``.
+
+The runtime message printing is controlled using filters. Filters set the
+visible messages of all matching categories. Matching uses regular expression syntax,
+which allows listing multiple alternative matches or partial name matches.
+This syntax is a C++ version of the ECMA-262 grammar (Javascript regular expressions).
+Details of differences can be found at
+https://en.cppreference.com/w/cpp/regex/ecmascript
+
+Persistent filters are stored in ``dfhack-config/runtime-debug.json``.
+Oldest filters are applied first. That means a newer filter can override the
+older printing level selection.
+
+Usage: ``debugfilter [subcommand] [parameters...]``
+
+The following subcommands are supported:
+
+help
+----
+Give overall help or a detailed help for a subcommand.
+
+Usage: ``debugfilter help [subcommand]``
+
+category
+--------
+List available debug plugin and category names.
+
+Usage: ``debugfilter category [plugin regex] [category regex]``
+
+The list can be filtered using optional regex parameters. If filters aren't
+given then the it uses ``"."`` regex which matches any character. The regex
+parameters are good way to test regex before passing them to ``set``.
+
+filter
+------
+List active and passive debug print level changes.
+
+Usage: ``debugfilter filter [id]``
+
+Optional ``id`` parameter is the id listed as first column in the filter list.
+If id is given then the command shows information for the given filter only in
+multi line format that is better format if filter has long regex.
+
+set
+---
+Creates a new debug filter to set category printing levels.
+
+Usage: ``debugfilter set [level] [plugin regex] [category regex]``
+
+Adds a filter that will be deleted when DF process exists or plugin is unloaded.
+
+Usage: ``debugfilter set persistent [level] [plugin regex] [category regex]``
+
+Stores the filter in the configuration file to until ``unset`` is used to remove
+it.
+
+Level is the minimum debug printing level to show in log.
+
+* ``trace``: Possibly very noisy messages which can be printed many times per second
+
+* ``debug``: Messages that happen often but they should happen only a couple of times per second
+
+* ``info``: Important state changes that happen rarely during normal execution
+
+* ``warning``: Enabled by default. Shows warnings about unexpected events which code managed to handle correctly.
+
+* ``error``: Enabled by default. Shows errors which code can't handle without user intervention.
+
+unset
+-----
+Delete a space separated list of filters
+
+Usage: ``debugfilter unset [id...]``
+
+disable
+-------
+Disable a space separated list of filters but keep it in the filter list
+
+Usage: ``debugfilter disable [id...]``
+
+enable
+------
+Enable a space sperate list of filters
+
+Usage: ``debugfilter enable [id...]``
diff --git a/docs/plugins/deramp.rst b/docs/plugins/deramp.rst
new file mode 100644
index 000000000..a6b944381
--- /dev/null
+++ b/docs/plugins/deramp.rst
@@ -0,0 +1,6 @@
+deramp
+======
+Removes all ramps designated for removal from the map. This is useful for
+replicating the old channel digging designation.  It also removes any and
+all 'down ramps' that can remain after a cave-in (you don't have to designate
+anything for that to happen).
diff --git a/docs/plugins/dig-now.rst b/docs/plugins/dig-now.rst
new file mode 100644
index 000000000..b6f4d64f7
--- /dev/null
+++ b/docs/plugins/dig-now.rst
@@ -0,0 +1,61 @@
+dig-now
+=======
+
+Instantly completes non-marker dig designations, modifying tile shapes and
+creating boulders, ores, and gems as if a miner were doing the mining or
+engraving. By default, the entire map is processed and boulder generation
+follows standard game rules, but the behavior is configurable.
+
+Note that no units will get mining or engraving experience for the dug/engraved
+tiles.
+
+Trees and roots are not currently handled by this plugin and will be skipped.
+Requests for engravings are also skipped since they would depend on the skill
+and creative choices of individual engravers. Other types of engraving (i.e.
+smoothing and track carving) are handled.
+
+Usage::
+
+    dig-now [<pos> [<pos>]] [<options>]
+
+Where the optional ``<pos>`` pair can be used to specify the coordinate bounds
+within which ``dig-now`` will operate. If they are not specified, ``dig-now``
+will scan the entire map. If only one ``<pos>`` is specified, only the tile at
+that coordinate is processed.
+
+Any ``<pos>`` parameters can either be an ``<x>,<y>,<z>`` triple (e.g.
+``35,12,150``) or the string ``here``, which means the position of the active
+game cursor should be used.
+
+Examples:
+
+``dig-now``
+    Dig designated tiles according to standard game rules.
+
+``dig-now --clean``
+    Dig designated tiles, but don't generate any boulders, ores, or gems.
+
+``dig-now --dump here``
+    Dig tiles and dump all generated boulders, ores, and gems at the tile under
+    the game cursor.
+
+Options:
+
+:``-c``, ``--clean``:
+    Don't generate any boulders, ores, or gems. Equivalent to
+    ``--percentages 0,0,0,0``.
+:``-d``, ``--dump <pos>``:
+    Dump any generated items at the specified coordinates. If the tile at those
+    coordinates is open space or is a wall, items will be generated on the
+    closest walkable tile below.
+:``-e``, ``--everywhere``:
+    Generate a boulder, ore, or gem for every tile that can produce one.
+    Equivalent to ``--percentages 100,100,100,100``.
+:``-h``, ``--help``:
+    Show quick usage help text.
+:``-p``, ``--percentages <layer>,<vein>,<small cluster>,<deep>``:
+    Set item generation percentages for each of the tile categories. The
+    ``vein`` category includes both the large oval clusters and the long stringy
+    mineral veins. Default is ``25,33,100,100``.
+:``-z``, ``--cur-zlevel``:
+    Restricts the bounds to the currently visible z-level.
diff --git a/docs/plugins/dig.rst b/docs/plugins/dig.rst
new file mode 100644
index 000000000..f09626d0c
--- /dev/null
+++ b/docs/plugins/dig.rst
@@ -0,0 +1,20 @@
+dig
+===
+This plugin makes many automated or complicated dig patterns easy.
+
+Basic commands:
+
+:digv:      Designate all of the selected vein for digging.
+:digvx:     Also cross z-levels, digging stairs as needed.  Alias for ``digv x``.
+:digl:      Like ``digv``, for layer stone.  Also supports an ``undo`` option
+            to remove designations, for if you accidentally set 50 levels at once.
+:diglx:     Also cross z-levels, digging stairs as needed.  Alias for ``digl x``.
+
+:dfhack-keybind:`digv`
+
+.. note::
+
+    All commands implemented by the `dig` plugin (listed by ``ls dig``) support
+    specifying the designation priority with ``-p#``, ``-p #``, or ``p=#``,
+    where ``#`` is a number from 1 to 7. If a priority is not specified, the
+    priority selected in-game is used as the default.
diff --git a/docs/plugins/digFlood.rst b/docs/plugins/digFlood.rst
new file mode 100644
index 000000000..dd957feb2
--- /dev/null
+++ b/docs/plugins/digFlood.rst
@@ -0,0 +1,18 @@
+digFlood
+========
+Automatically digs out specified veins as they are discovered. It runs once
+every time a dwarf finishes a dig job. It will only dig out appropriate tiles
+that are adjacent to the finished dig job. To add a vein type, use ``digFlood 1 [type]``.
+This will also enable the plugin. To remove a vein type, use ``digFlood 0 [type] 1``
+to disable, then remove, then re-enable.
+
+Usage:
+
+:help digflood:     detailed help message
+:digFlood 0:        disable the plugin
+:digFlood 1:        enable the plugin
+:digFlood 0 MICROCLINE COAL_BITUMINOUS 1:
+                    disable plugin, remove microcline and bituminous coal from monitoring, then re-enable the plugin
+:digFlood CLEAR:    remove all inorganics from monitoring
+:digFlood digAll1:  ignore the monitor list and dig any vein
+:digFlood digAll0:  disable digAll mode
diff --git a/docs/plugins/digcircle.rst b/docs/plugins/digcircle.rst
new file mode 100644
index 000000000..fc31b65df
--- /dev/null
+++ b/docs/plugins/digcircle.rst
@@ -0,0 +1,35 @@
+digcircle
+=========
+A command for easy designation of filled and hollow circles.
+It has several types of options.
+
+Shape:
+
+:hollow:   Set the circle to hollow (default)
+:filled:   Set the circle to filled
+:#:        Diameter in tiles (default = 0, does nothing)
+
+Action:
+
+:set:      Set designation (default)
+:unset:    Unset current designation
+:invert:   Invert designations already present
+
+Designation types:
+
+:dig:      Normal digging designation (default)
+:ramp:     Ramp digging
+:ustair:   Staircase up
+:dstair:   Staircase down
+:xstair:   Staircase up/down
+:chan:     Dig channel
+
+After you have set the options, the command called with no options
+repeats with the last selected parameters.
+
+Examples:
+
+``digcircle filled 3``
+        Dig a filled circle with diameter = 3.
+``digcircle``
+        Do it again.
diff --git a/docs/plugins/digexp.rst b/docs/plugins/digexp.rst
new file mode 100644
index 000000000..e4412d051
--- /dev/null
+++ b/docs/plugins/digexp.rst
@@ -0,0 +1,31 @@
+digexp
+======
+This command is for :wiki:`exploratory mining <Exploratory_mining>`.
+
+There are two variables that can be set: pattern and filter.
+
+Patterns:
+
+:diag5:            diagonals separated by 5 tiles
+:diag5r:           diag5 rotated 90 degrees
+:ladder:           A 'ladder' pattern
+:ladderr:          ladder rotated 90 degrees
+:clear:            Just remove all dig designations
+:cross:            A cross, exactly in the middle of the map.
+
+Filters:
+
+:all:              designate whole z-level
+:hidden:           designate only hidden tiles of z-level (default)
+:designated:       Take current designation and apply pattern to it.
+
+After you have a pattern set, you can use ``expdig`` to apply it again.
+
+Examples:
+
+``expdig diag5 hidden``
+  Designate the diagonal 5 patter over all hidden tiles
+``expdig``
+  Apply last used pattern and filter
+``expdig ladder designated``
+  Take current designations and replace them with the ladder pattern
diff --git a/docs/plugins/diggingInvaders.rst b/docs/plugins/diggingInvaders.rst
new file mode 100644
index 000000000..0557225fb
--- /dev/null
+++ b/docs/plugins/diggingInvaders.rst
@@ -0,0 +1,29 @@
+diggingInvaders
+===============
+Makes invaders dig or destroy constructions to get to your dwarves.
+
+To enable/disable the pluging, use: ``diggingInvaders (1|enable)|(0|disable)``
+
+Basic usage:
+
+:add GOBLIN:        registers the race GOBLIN as a digging invader. Case-sensitive.
+:remove GOBLIN:     unregisters the race GOBLIN as a digging invader. Case-sensitive.
+:now:               makes invaders try to dig now, if plugin is enabled
+:clear:             clears all digging invader races
+:edgesPerTick n:    makes the pathfinding algorithm work on at most n edges per tick.
+                    Set to 0 or lower to make it unlimited.
+
+You can also use ``diggingInvaders setCost (race) (action) n`` to set the
+pathing cost of particular action, or ``setDelay`` to set how long it takes.
+Costs and delays are per-tile, and the table shows default values.
+
+============================== ======= ====== =================================
+Action                         Cost    Delay  Notes
+============================== ======= ====== =================================
+``walk``                       1       0      base cost in the path algorithm
+``destroyBuilding``            2       1,000  delay adds to the job_completion_timer of destroy building jobs that are assigned to invaders
+``dig``                        10,000  1,000  digging soil or natural stone
+``destroyRoughConstruction``   1,000   1,000  constructions made from boulders
+``destroySmoothConstruction``  100     100    constructions made from blocks or bars
+============================== ======= ====== =================================
+
diff --git a/docs/plugins/digl.rst b/docs/plugins/digl.rst
new file mode 100644
index 000000000..f09626d0c
--- /dev/null
+++ b/docs/plugins/digl.rst
@@ -0,0 +1,20 @@
+dig
+===
+This plugin makes many automated or complicated dig patterns easy.
+
+Basic commands:
+
+:digv:      Designate all of the selected vein for digging.
+:digvx:     Also cross z-levels, digging stairs as needed.  Alias for ``digv x``.
+:digl:      Like ``digv``, for layer stone.  Also supports an ``undo`` option
+            to remove designations, for if you accidentally set 50 levels at once.
+:diglx:     Also cross z-levels, digging stairs as needed.  Alias for ``digl x``.
+
+:dfhack-keybind:`digv`
+
+.. note::
+
+    All commands implemented by the `dig` plugin (listed by ``ls dig``) support
+    specifying the designation priority with ``-p#``, ``-p #``, or ``p=#``,
+    where ``#`` is a number from 1 to 7. If a priority is not specified, the
+    priority selected in-game is used as the default.
diff --git a/docs/plugins/diglx.rst b/docs/plugins/diglx.rst
new file mode 100644
index 000000000..f09626d0c
--- /dev/null
+++ b/docs/plugins/diglx.rst
@@ -0,0 +1,20 @@
+dig
+===
+This plugin makes many automated or complicated dig patterns easy.
+
+Basic commands:
+
+:digv:      Designate all of the selected vein for digging.
+:digvx:     Also cross z-levels, digging stairs as needed.  Alias for ``digv x``.
+:digl:      Like ``digv``, for layer stone.  Also supports an ``undo`` option
+            to remove designations, for if you accidentally set 50 levels at once.
+:diglx:     Also cross z-levels, digging stairs as needed.  Alias for ``digl x``.
+
+:dfhack-keybind:`digv`
+
+.. note::
+
+    All commands implemented by the `dig` plugin (listed by ``ls dig``) support
+    specifying the designation priority with ``-p#``, ``-p #``, or ``p=#``,
+    where ``#`` is a number from 1 to 7. If a priority is not specified, the
+    priority selected in-game is used as the default.
diff --git a/docs/plugins/digtype.rst b/docs/plugins/digtype.rst
new file mode 100644
index 000000000..1c2d49eaa
--- /dev/null
+++ b/docs/plugins/digtype.rst
@@ -0,0 +1,19 @@
+digtype
+=======
+For every tile on the map of the same vein type as the selected tile,
+this command designates it to have the same designation as the
+selected tile. If the selected tile has no designation, they will be
+dig designated.
+If an argument is given, the designation of the selected tile is
+ignored, and all appropriate tiles are set to the specified
+designation.
+
+Options:
+
+:dig:
+:channel:
+:ramp:
+:updown: up/down stairs
+:up:     up stairs
+:down:   down stairs
+:clear:  clear designation
diff --git a/docs/plugins/digv.rst b/docs/plugins/digv.rst
new file mode 100644
index 000000000..f09626d0c
--- /dev/null
+++ b/docs/plugins/digv.rst
@@ -0,0 +1,20 @@
+dig
+===
+This plugin makes many automated or complicated dig patterns easy.
+
+Basic commands:
+
+:digv:      Designate all of the selected vein for digging.
+:digvx:     Also cross z-levels, digging stairs as needed.  Alias for ``digv x``.
+:digl:      Like ``digv``, for layer stone.  Also supports an ``undo`` option
+            to remove designations, for if you accidentally set 50 levels at once.
+:diglx:     Also cross z-levels, digging stairs as needed.  Alias for ``digl x``.
+
+:dfhack-keybind:`digv`
+
+.. note::
+
+    All commands implemented by the `dig` plugin (listed by ``ls dig``) support
+    specifying the designation priority with ``-p#``, ``-p #``, or ``p=#``,
+    where ``#`` is a number from 1 to 7. If a priority is not specified, the
+    priority selected in-game is used as the default.
diff --git a/docs/plugins/digvx.rst b/docs/plugins/digvx.rst
new file mode 100644
index 000000000..f09626d0c
--- /dev/null
+++ b/docs/plugins/digvx.rst
@@ -0,0 +1,20 @@
+dig
+===
+This plugin makes many automated or complicated dig patterns easy.
+
+Basic commands:
+
+:digv:      Designate all of the selected vein for digging.
+:digvx:     Also cross z-levels, digging stairs as needed.  Alias for ``digv x``.
+:digl:      Like ``digv``, for layer stone.  Also supports an ``undo`` option
+            to remove designations, for if you accidentally set 50 levels at once.
+:diglx:     Also cross z-levels, digging stairs as needed.  Alias for ``digl x``.
+
+:dfhack-keybind:`digv`
+
+.. note::
+
+    All commands implemented by the `dig` plugin (listed by ``ls dig``) support
+    specifying the designation priority with ``-p#``, ``-p #``, or ``p=#``,
+    where ``#`` is a number from 1 to 7. If a priority is not specified, the
+    priority selected in-game is used as the default.
diff --git a/docs/plugins/dwarfmonitor.rst b/docs/plugins/dwarfmonitor.rst
new file mode 100644
index 000000000..cbe3e8bdc
--- /dev/null
+++ b/docs/plugins/dwarfmonitor.rst
@@ -0,0 +1,78 @@
+dwarfmonitor
+============
+Records dwarf activity to measure fort efficiency.
+
+Options:
+
+:enable <mode>:     Start monitoring ``mode``. ``mode`` can be "work", "misery",
+                    "weather", or "all".  This will enable all corresponding widgets,
+                    if applicable.
+:disable <mode>:    Stop monitoring ``mode``, and disable corresponding widgets, if applicable.
+:stats:             Show statistics summary
+:prefs:             Show dwarf preferences summary
+:reload:            Reload configuration file (``dfhack-config/dwarfmonitor.json``)
+
+:dfhack-keybind:`dwarfmonitor`
+
+Widget configuration:
+
+The following types of widgets (defined in :file:`hack/lua/plugins/dwarfmonitor.lua`)
+can be displayed on the main fortress mode screen:
+
+:date:      Show the in-game date
+:misery:    Show overall happiness levels of all dwarves
+:weather:   Show current weather (rain/snow)
+:cursor:    Show the current mouse cursor position
+
+The file :file:`dfhack-config/dwarfmonitor.json` can be edited to control the
+positions and settings of all widgets displayed. This file should contain a
+JSON object with the key ``widgets`` containing an array of objects - see the
+included file in the ``dfhack-config`` folder for an example:
+
+.. code-block:: lua
+
+    {
+        "widgets": [
+            {
+                "type": "widget type (weather, misery, etc.)",
+                "x": X coordinate,
+                "y": Y coordinate
+                <...additional options...>
+            }
+        ]
+    }
+
+X and Y coordinates begin at zero (in the upper left corner of the screen).
+Negative coordinates will be treated as distances from the lower right corner,
+beginning at 1 - e.g. an x coordinate of 0 is the leftmost column, while an x
+coordinate of 1 is the rightmost column.
+
+By default, the x and y coordinates given correspond to the leftmost tile of
+the widget. Including an ``anchor`` option set to ``right`` will cause the
+rightmost tile of the widget to be located at this position instead.
+
+Some widgets support additional options:
+
+* ``date`` widget:
+
+  * ``format``: specifies the format of the date. The following characters
+    are replaced (all others, such as punctuation, are not modified)
+
+    * ``Y`` or ``y``: The current year
+    * ``M``: The current month, zero-padded if necessary
+    * ``m``: The current month, *not* zero-padded
+    * ``D``: The current day, zero-padded if necessary
+    * ``d``: The current day, *not* zero-padded
+
+    The default date format is ``Y-M-D``, per the ISO8601_ standard.
+
+    .. _ISO8601: https://en.wikipedia.org/wiki/ISO_8601
+
+* ``cursor`` widget:
+
+  * ``format``: Specifies the format. ``X``, ``x``, ``Y``, and ``y`` are
+    replaced with the corresponding cursor cordinates, while all other
+    characters are unmodified.
+  * ``show_invalid``: If set to ``true``, the mouse coordinates will both be
+    displayed as ``-1`` when the cursor is outside of the DF window; otherwise,
+    nothing will be displayed.
diff --git a/docs/plugins/dwarfvet.rst b/docs/plugins/dwarfvet.rst
new file mode 100644
index 000000000..1ceb1bc2f
--- /dev/null
+++ b/docs/plugins/dwarfvet.rst
@@ -0,0 +1,19 @@
+dwarfvet
+========
+Enables Animal Caretaker functionality
+
+Always annoyed your dragons become useless after a minor injury? Well, with
+dwarfvet, your animals become first rate members of your fort. It can also
+be used to train medical skills.
+
+Animals need to be treated in an animal hospital, which is simply a hospital
+that is also an animal training zone. The console will print out a list on game
+load, and whenever one is added or removed. Dwarfs must have the Animal Caretaker
+labor to treat animals. Normal medical skills are used (and no experience is given
+to the Animal Caretaker skill).
+
+Options:
+
+:enable:        Enables Animal Caretakers to treat and manage animals
+:disable:       Turns off the plguin
+:report:        Reports all zones that the game considers animal hospitals
diff --git a/docs/plugins/embark-assistant.rst b/docs/plugins/embark-assistant.rst
new file mode 100644
index 000000000..4500a919e
--- /dev/null
+++ b/docs/plugins/embark-assistant.rst
@@ -0,0 +1,9 @@
+embark-assistant
+================
+
+This plugin provides embark site selection help. It has to be run with the
+``embark-assistant`` command while the pre-embark screen is displayed and shows
+extended (and correct(?)) resource information for the embark rectangle as well
+as normally undisplayed sites in the current embark region. It also has a site
+selection tool with more options than DF's vanilla search tool. For detailed
+help invoke the in game info screen.
diff --git a/docs/plugins/embark-tools.rst b/docs/plugins/embark-tools.rst
new file mode 100644
index 000000000..fcab18fc7
--- /dev/null
+++ b/docs/plugins/embark-tools.rst
@@ -0,0 +1,12 @@
+embark-tools
+============
+A collection of embark-related tools. Usage and available tools::
+
+    embark-tools enable/disable tool [tool]...
+
+:anywhere:      Allows embarking anywhere (including sites, mountain-only biomes,
+                and oceans). Use with caution.
+:mouse:         Implements mouse controls (currently in the local embark region only)
+:sand:          Displays an indicator when sand is present in the currently-selected
+                area, similar to the default clay/stone indicators.
+:sticky:        Maintains the selected local area while navigating the world map
diff --git a/docs/plugins/fastdwarf.rst b/docs/plugins/fastdwarf.rst
new file mode 100644
index 000000000..65d2a3d45
--- /dev/null
+++ b/docs/plugins/fastdwarf.rst
@@ -0,0 +1,14 @@
+fastdwarf
+=========
+Controls speedydwarf and teledwarf. Speedydwarf makes dwarves move quickly
+and perform tasks quickly. Teledwarf makes dwarves move instantaneously,
+but do jobs at the same speed.
+
+:fastdwarf 0:   disables both (also ``0 0``)
+:fastdwarf 1:   enables speedydwarf and disables teledwarf (also ``1 0``)
+:fastdwarf 2:   sets a native debug flag in the game memory that implements an
+                even more aggressive version of speedydwarf.
+:fastdwarf 0 1: disables speedydwarf and enables teledwarf
+:fastdwarf 1 1: enables both
+
+See `superdwarf` for a per-creature version.
diff --git a/docs/plugins/filltraffic.rst b/docs/plugins/filltraffic.rst
new file mode 100644
index 000000000..6a9c57c9f
--- /dev/null
+++ b/docs/plugins/filltraffic.rst
@@ -0,0 +1,17 @@
+filltraffic
+===========
+Set traffic designations using flood-fill starting at the cursor.
+See also `alltraffic`, `restrictice`, and `restrictliquids`.  Options:
+
+:H:     High Traffic
+:N:     Normal Traffic
+:L:     Low Traffic
+:R:     Restricted Traffic
+:X:     Fill across z-levels.
+:B:     Include buildings and stockpiles.
+:P:     Include empty space.
+
+Example:
+
+``filltraffic H``
+  When used in a room with doors, it will set traffic to HIGH in just that room.
diff --git a/docs/plugins/fix-armory.rst b/docs/plugins/fix-armory.rst
new file mode 100644
index 000000000..f4b988420
--- /dev/null
+++ b/docs/plugins/fix-armory.rst
@@ -0,0 +1,4 @@
+fix-armory
+==========
+`This plugin requires a binpatch <binpatches/needs-patch>`, which has not
+been available since DF 0.34.11
diff --git a/docs/plugins/fix-job-postings.rst b/docs/plugins/fix-job-postings.rst
new file mode 100644
index 000000000..198dcd61d
--- /dev/null
+++ b/docs/plugins/fix-job-postings.rst
@@ -0,0 +1,5 @@
+fix-job-postings
+----------------
+This command fixes crashes caused by previous versions of workflow, mostly in
+DFHack 0.40.24-r4, and should be run automatically when loading a world (but can
+also be run manually if desired).
diff --git a/docs/plugins/fix-unit-occupancy.rst b/docs/plugins/fix-unit-occupancy.rst
new file mode 100644
index 000000000..bf999c8a3
--- /dev/null
+++ b/docs/plugins/fix-unit-occupancy.rst
@@ -0,0 +1,12 @@
+fix-unit-occupancy
+==================
+This plugin fixes issues with unit occupancy, notably phantom
+"unit blocking tile" messages (:bug:`3499`). It can be run manually, or
+periodically when enabled with the built-in enable/disable commands:
+
+:(no argument):         Run the plugin once immediately, for the whole map.
+:-h, here, cursor:      Run immediately, only operate on the tile at the cursor
+:-n, dry, dry-run:      Run immediately, do not write changes to map
+:interval <X>:          Run the plugin every ``X`` ticks (when enabled).
+                        The default is 1200 ticks, or 1 day.
+                        Ticks are only counted when the game is unpaused.
diff --git a/docs/plugins/fixveins.rst b/docs/plugins/fixveins.rst
new file mode 100644
index 000000000..58678d154
--- /dev/null
+++ b/docs/plugins/fixveins.rst
@@ -0,0 +1,5 @@
+fixveins
+========
+Removes invalid references to mineral inclusions and restores missing ones.
+Use this if you broke your embark with tools like `tiletypes`, or if you
+accidentally placed a construction on top of a valuable mineral floor.
diff --git a/docs/plugins/flows.rst b/docs/plugins/flows.rst
new file mode 100644
index 000000000..3df451195
--- /dev/null
+++ b/docs/plugins/flows.rst
@@ -0,0 +1,5 @@
+flows
+=====
+A tool for checking how many tiles contain flowing liquids. If you suspect that
+your magma sea leaks into HFS, you can use this tool to be sure without
+revealing the map.
diff --git a/docs/plugins/follow.rst b/docs/plugins/follow.rst
new file mode 100644
index 000000000..a91c14f73
--- /dev/null
+++ b/docs/plugins/follow.rst
@@ -0,0 +1,5 @@
+follow
+======
+Makes the game view follow the currently highlighted unit after you exit from the
+current menu or cursor mode. Handy for watching dwarves running around. Deactivated
+by moving the view manually.
diff --git a/docs/plugins/forceequip.rst b/docs/plugins/forceequip.rst
new file mode 100644
index 000000000..2278bca22
--- /dev/null
+++ b/docs/plugins/forceequip.rst
@@ -0,0 +1,7 @@
+forceequip
+==========
+Forceequip moves local items into a unit's inventory.  It is typically used to
+equip specific clothing/armor items onto a dwarf, but can also be used to put
+armor onto a war animal or to add unusual items (such as crowns) to any unit.
+
+For more information run ``forceequip help``.  See also `modtools/equip-item`.
diff --git a/docs/plugins/generated-creature-renamer.rst b/docs/plugins/generated-creature-renamer.rst
new file mode 100644
index 000000000..bb486a4ee
--- /dev/null
+++ b/docs/plugins/generated-creature-renamer.rst
@@ -0,0 +1,15 @@
+generated-creature-renamer
+==========================
+Automatically renames generated creatures, such as forgotten beasts, titans,
+etc, to have raw token names that match the description given in-game.
+
+The ``list-generated`` command can be used to list the token names of all
+generated creatures in a given save, with an optional ``detailed`` argument
+to show the accompanying description.
+
+The ``save-generated-raws`` command will save a sample creature graphics file in
+the Dwarf Fortress root directory, to use as a start for making a graphics set
+for generated creatures using the new names that they get with this plugin.
+
+The new names are saved with the save, and the plugin, when enabled, only runs once
+per save, unless there's an update.
diff --git a/docs/plugins/getplants.rst b/docs/plugins/getplants.rst
new file mode 100644
index 000000000..5a719b3ab
--- /dev/null
+++ b/docs/plugins/getplants.rst
@@ -0,0 +1,37 @@
+getplants
+=========
+This tool allows plant gathering and tree cutting by RAW ID. Specify the types
+of trees to cut down and/or shrubs to gather by their plant names, separated
+by spaces.
+
+Options:
+
+:``-t``: Tree: Select trees only (exclude shrubs)
+:``-s``: Shrub: Select shrubs only (exclude trees)
+:``-f``: Farming: Designate only shrubs that yield seeds for farming. Implies -s
+:``-c``: Clear: Clear designations instead of setting them
+:``-x``: eXcept: Apply selected action to all plants except those specified (invert
+     selection)
+:``-a``: All: Select every type of plant (obeys ``-t``/``-s``/``-f``)
+:``-v``: Verbose: Lists the number of (un)designations per plant
+:``-n *``: Number: Designate up to * (an integer number) plants of each species
+
+Specifying both ``-t`` and ``-s`` or ``-f`` will have no effect. If no plant IDs are
+specified, all valid plant IDs will be listed, with ``-t``, ``-s``, and ``-f``
+restricting the list to trees, shrubs, and farmable shrubs, respectively.
+
+.. note::
+
+    DF is capable of determining that a shrub has already been picked, leaving
+    an unusable structure part behind. This plugin does not perform such a check
+    (as the location of the required information has not yet been identified).
+    This leads to some shrubs being designated when they shouldn't be, causing a
+    plant gatherer to walk there and do nothing (except clearing the
+    designation). See :issue:`1479` for details.
+
+    The implementation another known deficiency: it's incapable of detecting that
+    raw definitions that specify a seed extraction reaction for the structural part
+    but has no other use for it cannot actually yield any seeds, as the part is
+    never used (parts of :bug:`6940`, e.g. Red Spinach), even though DF
+    collects it, unless there's a workshop reaction to do it (which there isn't
+    in vanilla).
diff --git a/docs/plugins/hotkeys.rst b/docs/plugins/hotkeys.rst
new file mode 100644
index 000000000..57c3b3af5
--- /dev/null
+++ b/docs/plugins/hotkeys.rst
@@ -0,0 +1,8 @@
+hotkeys
+=======
+Opens an in-game screen showing which DFHack keybindings are
+active in the current context.  See also `hotkey-notes`.
+
+.. image:: ../images/hotkeys.png
+
+:dfhack-keybind:`hotkeys`
diff --git a/docs/plugins/infiniteSky.rst b/docs/plugins/infiniteSky.rst
new file mode 100644
index 000000000..328ee83bd
--- /dev/null
+++ b/docs/plugins/infiniteSky.rst
@@ -0,0 +1,16 @@
+infiniteSky
+===========
+Automatically allocates new z-levels of sky at the top of the map as you build up,
+or on request allocates many levels all at once.
+
+Usage:
+
+``infiniteSky n``
+  Raise the sky by n z-levels.
+``infiniteSky enable/disable``
+  Enables/disables monitoring of constructions. If you build anything in the second to highest z-level, it will allocate one more sky level. This is so you can continue to build stairs upward.
+
+.. warning::
+
+    :issue:`Sometimes <254>` new z-levels disappear and cause cave-ins.
+    Saving and loading after creating new z-levels should fix the problem.
diff --git a/docs/plugins/isoworldremote.rst b/docs/plugins/isoworldremote.rst
new file mode 100644
index 000000000..7bacc2b57
--- /dev/null
+++ b/docs/plugins/isoworldremote.rst
@@ -0,0 +1,3 @@
+isoworldremote
+==============
+A plugin that implements a `remote API <remote>` used by Isoworld.
diff --git a/docs/plugins/job-duplicate.rst b/docs/plugins/job-duplicate.rst
new file mode 100644
index 000000000..a18d73df3
--- /dev/null
+++ b/docs/plugins/job-duplicate.rst
@@ -0,0 +1,6 @@
+job-duplicate
+=============
+In :kbd:`q` mode, when a job is highlighted within a workshop or furnace
+building, calling ``job-duplicate`` instantly duplicates the job.
+
+:dfhack-keybind:`job-duplicate`
diff --git a/docs/plugins/job-material.rst b/docs/plugins/job-material.rst
new file mode 100644
index 000000000..f1b37fc1d
--- /dev/null
+++ b/docs/plugins/job-material.rst
@@ -0,0 +1,15 @@
+job-material
+============
+Alter the material of the selected job.  Similar to ``job item-material ...``
+
+Invoked as::
+
+    job-material <inorganic-token>
+
+:dfhack-keybind:`job-material`
+
+* In :kbd:`q` mode, when a job is highlighted within a workshop or furnace,
+  changes the material of the job. Only inorganic materials can be used
+  in this mode.
+* In :kbd:`b` mode, during selection of building components positions the cursor
+  over the first available choice with the matching material.
diff --git a/docs/plugins/job.rst b/docs/plugins/job.rst
new file mode 100644
index 000000000..26f163864
--- /dev/null
+++ b/docs/plugins/job.rst
@@ -0,0 +1,15 @@
+job
+===
+Command for general job query and manipulation.
+
+Options:
+
+*no extra options*
+    Print details of the current job. The job can be selected
+    in a workshop, or the unit/jobs screen.
+**list**
+    Print details of all jobs in the selected workshop.
+**item-material <item-idx> <material[:subtoken]>**
+    Replace the exact material id in the job item.
+**item-type <item-idx> <type[:subtype]>**
+    Replace the exact item type id in the job item.
diff --git a/docs/plugins/labormanager.rst b/docs/plugins/labormanager.rst
new file mode 100644
index 000000000..d16a10e33
--- /dev/null
+++ b/docs/plugins/labormanager.rst
@@ -0,0 +1,105 @@
+labormanager
+============
+Automatically manage dwarf labors to efficiently complete jobs.
+Labormanager is derived from autolabor (above) but uses a completely
+different approach to assigning jobs to dwarves. While autolabor tries
+to keep as many dwarves busy as possible, labormanager instead strives
+to get jobs done as quickly as possible.
+
+Labormanager frequently scans the current job list, current list of
+dwarfs, and the map to determine how many dwarves need to be assigned to
+what labors in order to meet all current labor needs without starving
+any particular type of job.
+
+.. warning::
+
+    *As with autolabor, labormanager will override any manual changes you
+    make to labors while it is enabled, including through other tools such
+    as Dwarf Therapist*
+
+Simple usage:
+
+:enable labormanager: Enables the plugin with default settings.
+    (Persistent per fortress)
+
+:disable labormanager: Disables the plugin.
+
+Anything beyond this is optional - labormanager works fairly well on the
+default settings.
+
+The default priorities for each labor vary (some labors are higher
+priority by default than others). The way the plugin works is that, once
+it determines how many of each labor is needed, it then sorts them by
+adjusted priority. (Labors other than hauling have a bias added to them
+based on how long it's been since they were last used, to prevent job
+starvation.) The labor with the highest priority is selected, the "best
+fit" dwarf for that labor is assigned to that labor, and then its
+priority is *halved*. This process is repeated until either dwarfs or
+labors run out.
+
+Because there is no easy way to detect how many haulers are actually
+needed at any moment, the plugin always ensures that at least one dwarf
+is assigned to each of the hauling labors, even if no hauling jobs are
+detected. At least one dwarf is always assigned to construction removing
+and cleaning because these jobs also cannot be easily detected. Lever
+pulling is always assigned to everyone. Any dwarfs for which there are
+no jobs will be assigned hauling, lever pulling, and cleaning labors. If
+you use animal trainers, note that labormanager will misbehave if you
+assign specific trainers to specific animals; results are only guaranteed
+if you use "any trainer", and animal trainers will probably be
+overallocated in any case.
+
+Labormanager also sometimes assigns extra labors to currently busy
+dwarfs so that when they finish their current job, they will go off and
+do something useful instead of standing around waiting for a job.
+
+There is special handling to ensure that at least one dwarf is assigned
+to haul food whenever food is detected left in a place where it will rot
+if not stored. This will cause a dwarf to go idle if you have no
+storepiles to haul food to.
+
+Dwarfs who are unable to work (child, in the military, wounded,
+handless, asleep, in a meeting) are entirely excluded from labor
+assignment. Any dwarf explicitly assigned to a burrow will also be
+completely ignored by labormanager.
+
+The fitness algorithm for assigning jobs to dwarfs generally attempts to
+favor dwarfs who are more skilled over those who are less skilled. It
+also tries to avoid assigning female dwarfs with children to jobs that
+are "outside", favors assigning "outside" jobs to dwarfs who are
+carrying a tool that could be used as a weapon, and tries to minimize
+how often dwarfs have to reequip.
+
+Labormanager automatically determines medical needs and reserves health
+care providers as needed. Note that this may cause idling if you have
+injured dwarfs but no or inadequate hospital facilities.
+
+Hunting is never assigned without a butchery, and fishing is never
+assigned without a fishery, and neither of these labors is assigned
+unless specifically enabled.
+
+The method by which labormanager determines what labor is needed for a
+particular job is complicated and, in places, incomplete. In some
+situations, labormanager will detect that it cannot determine what labor
+is required. It will, by default, pause and print an error message on
+the dfhack console, followed by the message "LABORMANAGER: Game paused
+so you can investigate the above message.". If this happens, please open
+an issue on github, reporting the lines that immediately preceded this
+message. You can tell labormanager to ignore this error and carry on by
+typing ``labormanager pause-on-error no``, but be warned that some job may go
+undone in this situation.
+
+Advanced usage:
+
+:labormanager enable:                      Turn plugin on.
+:labormanager disable:                     Turn plugin off.
+:labormanager priority <labor> <value>:    Set the priority value (see above) for labor <labor> to <value>.
+:labormanager reset <labor>:               Reset the priority value of labor <labor> to its default.
+:labormanager reset-all:                   Reset all priority values to their defaults.
+:labormanager allow-fishing:               Allow dwarfs to fish. *Warning* This tends to result in most of the fort going fishing.
+:labormanager forbid-fishing:              Forbid dwarfs from fishing. Default behavior.
+:labormanager allow-hunting:               Allow dwarfs to hunt. *Warning* This tends to result in as many dwarfs going hunting as you have crossbows.
+:labormanager forbid-hunting:              Forbid dwarfs from hunting. Default behavior.
+:labormanager list:                        Show current priorities and current allocation stats.
+:labormanager pause-on-error yes:          Make labormanager pause if the labor inference engine fails. See above.
+:labormanager pause-on-error no:           Allow labormanager to continue past a labor inference engine failure.
diff --git a/docs/plugins/lair.rst b/docs/plugins/lair.rst
new file mode 100644
index 000000000..b80e71e3a
--- /dev/null
+++ b/docs/plugins/lair.rst
@@ -0,0 +1,12 @@
+lair
+====
+This command allows you to mark the map as a monster lair, preventing item
+scatter on abandon. When invoked as ``lair reset``, it does the opposite.
+
+Unlike `reveal`, this command doesn't save the information about tiles - you
+won't be able to restore state of real monster lairs using ``lair reset``.
+
+Options:
+
+:lair:          Mark the map as monster lair
+:lair reset:    Mark the map as ordinary (not lair)
diff --git a/docs/plugins/liquids-here.rst b/docs/plugins/liquids-here.rst
new file mode 100644
index 000000000..d838170a2
--- /dev/null
+++ b/docs/plugins/liquids-here.rst
@@ -0,0 +1,6 @@
+liquids-here
+------------
+Run the liquid spawner with the current/last settings made in liquids (if no
+settings in liquids were made it paints a point of 7/7 magma by default).
+
+Intended to be used as keybinding. Requires an active in-game cursor.
diff --git a/docs/plugins/liquids.rst b/docs/plugins/liquids.rst
new file mode 100644
index 000000000..d55962ad5
--- /dev/null
+++ b/docs/plugins/liquids.rst
@@ -0,0 +1,65 @@
+liquids
+=======
+Allows adding magma, water and obsidian to the game. It replaces the normal
+dfhack command line and can't be used from a hotkey. Settings will be remembered
+as long as dfhack runs. Intended for use in combination with the command
+``liquids-here`` (which can be bound to a hotkey).  See also :issue:`80`.
+
+.. warning::
+
+    Spawning and deleting liquids can mess up pathing data and
+    temperatures (creating heat traps). You've been warned.
+
+.. note::
+
+    `gui/liquids` is an in-game UI for this script.
+
+Settings will be remembered until you quit DF. You can call `liquids-here` to execute
+the last configured action, which is useful in combination with keybindings.
+
+Usage: point the DF cursor at a tile you want to modify and use the commands.
+
+If you only want to add or remove water or magma from one tile,
+`source` may be easier to use.
+
+Commands
+--------
+Misc commands:
+
+:q:                 quit
+:help, ?:           print this list of commands
+:<empty line>:      put liquid
+
+Modes:
+
+:m:         switch to magma
+:w:         switch to water
+:o:         make obsidian wall instead
+:of:        make obsidian floors
+:rs:        make a river source
+:f:         flow bits only
+:wclean:    remove salt and stagnant flags from tiles
+
+Set-Modes and flow properties (only for magma/water):
+
+:s+:    only add mode
+:s.:    set mode
+:s-:    only remove mode
+:f+:    make the spawned liquid flow
+:f.:    don't change flow state (read state in flow mode)
+:f-:    make the spawned liquid static
+
+Permaflow (only for water):
+
+:pf.:           don't change permaflow state
+:pf-:           make the spawned liquid static
+:pf[NS][EW]:    make the spawned liquid permanently flow
+:0-7:           set liquid amount
+
+Brush size and shape:
+
+:p, point:      Single tile
+:r, range:      Block with cursor at bottom north-west (any place, any size)
+:block:         DF map block with cursor in it (regular spaced 16x16x1 blocks)
+:column:        Column from cursor, up through free space
+:flood:         Flood-fill water tiles from cursor (only makes sense with wclean)
diff --git a/docs/plugins/manipulator.rst b/docs/plugins/manipulator.rst
new file mode 100644
index 000000000..024438d85
--- /dev/null
+++ b/docs/plugins/manipulator.rst
@@ -0,0 +1,182 @@
+manipulator
+===========
+An in-game equivalent to the popular program Dwarf Therapist.
+
+To activate, open the unit screen and press :kbd:`l`.
+
+.. image:: ../images/manipulator.png
+
+The far left column displays the unit's Happiness (color-coded based on its
+value), Name, Profession/Squad, and the right half of the screen displays each
+dwarf's labor settings and skill levels (0-9 for Dabbling through Professional,
+A-E for Great through Grand Master, and U-Z for Legendary through Legendary+5).
+
+Cells with teal backgrounds denote skills not controlled by labors, e.g.
+military and social skills.
+
+.. image:: ../images/manipulator2.png
+
+Press :kbd:`t` to toggle between Profession, Squad, and Job views.
+
+.. image:: ../images/manipulator3.png
+
+Use the arrow keys or number pad to move the cursor around, holding :kbd:`Shift` to
+move 10 tiles at a time.
+
+Press the Z-Up (:kbd:`<`) and Z-Down (:kbd:`>`) keys to move quickly between labor/skill
+categories. The numpad Z-Up and Z-Down keys seek to the first or last unit
+in the list. :kbd:`Backspace` seeks to the top left corner.
+
+Press Enter to toggle the selected labor for the selected unit, or Shift+Enter
+to toggle all labors within the selected category.
+
+Press the :kbd:`+`:kbd:`-` keys to sort the unit list according to the currently selected
+skill/labor, and press the :kbd:`*`:kbd:`/` keys to sort the unit list by Name, Profession/Squad,
+Happiness, or Arrival order (using :kbd:`Tab` to select which sort method to use here).
+
+With a unit selected, you can press the :kbd:`v` key to view its properties (and
+possibly set a custom nickname or profession) or the :kbd:`c` key to exit
+Manipulator and zoom to its position within your fortress.
+
+The following mouse shortcuts are also available:
+
+* Click on a column header to sort the unit list. Left-click to sort it in one
+  direction (descending for happiness or labors/skills, ascending for name,
+  profession or squad) and right-click to sort it in the opposite direction.
+* Left-click on a labor cell to toggle that labor. Right-click to move the
+  cursor onto that cell instead of toggling it.
+* Left-click on a unit's name, profession or squad to view its properties.
+* Right-click on a unit's name, profession or squad to zoom to it.
+
+Pressing :kbd:`Esc` normally returns to the unit screen, but :kbd:`Shift`:kbd:`Esc` would exit
+directly to the main dwarf mode screen.
+
+Professions
+-----------
+
+The manipulator plugin supports saving professions: a named set of labors that can be
+quickly applied to one or multiple dwarves.
+
+To save a profession, highlight a dwarf and press :kbd:`P`. The profession will be saved using
+the custom profession name of the dwarf, or the default for that dwarf if no custom profession
+name has been set.
+
+To apply a profession, either highlight a single dwarf or select multiple with
+:kbd:`x`, and press :kbd:`p` to select the profession to apply. All labors for
+the selected dwarves will be reset to the labors of the chosen profession.
+
+Professions are saved as human-readable text files in the
+``dfhack-config/professions`` folder within the DF folder, and can be edited or
+deleted there.
+
+The professions library
+~~~~~~~~~~~~~~~~~~~~~~~
+
+The manipulator plugin comes with a library of professions that you can assign
+to your dwarves.
+
+If you'd rather use Dwarf Therapist to manage your labors, it is easy to import
+these professions to DT and use them there. Simply assign the professions you
+want to import to a dwarf. Once you have assigned a profession to at least one
+dwarf, you can select "Import Professions from DF" in the DT "File" menu. The
+professions will then be available for use in DT.
+
+In the charts below, the "At Start" and "Max" columns indicate the approximate
+number of dwarves of each profession that you are likely to need at the start of
+the game and how many you are likely to need in a mature fort. These are just
+approximations. Your playstyle may demand more or fewer of each profession.
+
+=============  ========  ===== =================================================
+Profession     At Start  Max   Description
+=============  ========  ===== =================================================
+Chef           0         3     Buchery, Tanning, and Cooking. It is important to
+                               focus just a few dwarves on cooking since
+                               well-crafted meals make dwarves very happy. They
+                               are also an excellent trade good.
+Craftsdwarf    0         4-6   All labors used at Craftsdwarf's workshops,
+                               Glassmaker's workshops, and kilns.
+Doctor         0         2-4   The full suite of medical labors, plus Animal
+                               Caretaking for those using the dwarfvet plugin.
+Farmer         1         4     Food- and animal product-related labors. This
+                               profession also has the ``Alchemist`` labor
+                               enabled since they need to focus on food-related
+                               jobs, though you might want to disable
+                               ``Alchemist`` for your first farmer until there
+                               are actual farming duties to perform.
+Fisherdwarf    0         0-1   Fishing and fish cleaning. If you assign this
+                               profession to any dwarf, be prepared to be
+                               inundated with fish. Fisherdwarves *never stop
+                               fishing*. Be sure to also run ``prioritize -a
+                               PrepareRawFish ExtractFromRawFish`` or else
+                               caught fish will just be left to rot.
+Hauler         0         >20   All hauling labors plus Siege Operating, Mechanic
+                               (so haulers can assist in reloading traps) and
+                               Architecture (so haulers can help build massive
+                               windmill farms and pump stacks). As you
+                               accumulate enough Haulers, you can turn off
+                               hauling labors for other dwarves so they can
+                               focus on their skilled tasks. You may also want
+                               to restrict your Mechanic's workshops to only
+                               skilled mechanics so your haulers don't make
+                               low-quality mechanisms.
+Laborer        0         10-12 All labors that don't improve quality with skill,
+                               such as Soapmaking and furnace labors.
+Marksdwarf     0         10-30 Similar to Hauler. See the description for
+                               Meleedwarf below for more details.
+Mason          2         2-4   Masonry and Gem Cutting/Encrusting. In the early
+                               game, you may need to run "`prioritize`
+                               ConstructBuilding" to get your masons to build
+                               wells and bridges if they are too busy crafting
+                               stone furniture.
+Meleedwarf     0         20-50 Similar to Hauler, but without most civilian
+                               labors. This profession is separate from Hauler
+                               so you can find your military dwarves easily.
+                               Meleedwarves and Marksdwarves have Mechanics and
+                               hauling labors enabled so you can temporarily
+                               deactivate your military after sieges and allow
+                               your military dwarves to help clean up.
+Migrant        0         0     You can assign this profession to new migrants
+                               temporarily while you sort them into professions.
+                               Like Marksdwarf and Meleedwarf, the purpose of
+                               this profession is so you can find your new
+                               dwarves more easily.
+Miner          2         2-10  Mining and Engraving. This profession also has
+                               the ``Alchemist`` labor enabled, which disables
+                               hauling for those using the `autohauler` plugin.
+                               Once the need for Miners tapers off in the late
+                               game, dwarves with this profession make good
+                               military dwarves, wielding their picks as
+                               weapons.
+Outdoorsdwarf  1         2-4   Carpentry, Bowyery, Woodcutting, Animal Training,
+                               Trapping, Plant Gathering, Beekeeping, and Siege
+                               Engineering.
+Smith          0         2-4   Smithing labors. You may want to specialize your
+                               Smiths to focus on a single smithing skill to
+                               maximize equipment quality.
+StartManager   1         0     All skills not covered by the other starting
+                               professions (Miner, Mason, Outdoorsdwarf, and
+                               Farmer), plus a few overlapping skills to
+                               assist in critical tasks at the beginning of the
+                               game. Individual labors should be turned off as
+                               migrants are assigned more specialized
+                               professions that cover them, and the StartManager
+                               dwarf can eventually convert to some other
+                               profession.
+Tailor         0         2     Textile industry labors: Dying, Leatherworking,
+                               Weaving, and Clothesmaking.
+=============  ========  ===== =================================================
+
+A note on autohauler
+~~~~~~~~~~~~~~~~~~~~
+
+These profession definitions are designed to work well with or without the
+`autohauler` plugin (which helps to keep your dwarves focused on skilled labors
+instead of constantly being distracted by hauling). If you do want to use
+autohauler, adding the following lines to your ``onMapLoad.init`` file will
+configure it to let the professions manage the "Feed water to civilians" and
+"Recover wounded" labors instead of enabling those labors for all hauling
+dwarves::
+
+    on-new-fortress enable autohauler
+    on-new-fortress autohauler FEED_WATER_CIVILIANS allow
+    on-new-fortress autohauler RECOVER_WOUNDED allow
diff --git a/docs/plugins/misery.rst b/docs/plugins/misery.rst
new file mode 100644
index 000000000..1c146a10f
--- /dev/null
+++ b/docs/plugins/misery.rst
@@ -0,0 +1,14 @@
+misery
+======
+When enabled, fake bad thoughts will be added to all dwarves.
+
+Usage:
+
+:misery enable n:  enable misery with optional magnitude n. If specified, n must
+    be positive.
+:misery n:         same as "misery enable n"
+:misery enable:    same as "misery enable 1"
+:misery disable:   stop adding new negative thoughts. This will not remove
+                   existing negative thoughts. Equivalent to "misery 0".
+:misery clear:     remove fake thoughts, even after saving and reloading. Does
+    not change factor.
diff --git a/docs/plugins/mode.rst b/docs/plugins/mode.rst
new file mode 100644
index 000000000..9b3fc6984
--- /dev/null
+++ b/docs/plugins/mode.rst
@@ -0,0 +1,21 @@
+mode
+====
+This command lets you see and change the game mode directly.
+
+.. warning::
+
+    Only use ``mode`` after making a backup of your save!
+
+    Not all combinations are good for every situation and most of them will
+    produce undesirable results. There are a few good ones though.
+
+Examples:
+
+  * You are in fort game mode, managing your fortress and paused.
+  * You switch to the arena game mode, *assume control of a creature* and then
+  * switch to adventure game mode(1).
+    You just lost a fortress and gained an adventurer.  Alternatively:
+
+  * You are in fort game mode, managing your fortress and paused at the esc menu.
+  * You switch to the adventure game mode, assume control of a creature, then save or retire.
+  * You just created a returnable mountain home and gained an adventurer.
diff --git a/docs/plugins/mousequery.rst b/docs/plugins/mousequery.rst
new file mode 100644
index 000000000..2f613acaa
--- /dev/null
+++ b/docs/plugins/mousequery.rst
@@ -0,0 +1,16 @@
+mousequery
+==========
+Adds mouse controls to the DF interface, e.g. click-and-drag designations.
+
+Options:
+
+:plugin:    enable/disable the entire plugin
+:rbutton:   enable/disable right mouse button
+:track:     enable/disable moving cursor in build and designation mode
+:edge:      enable/disable active edge scrolling (when on, will also enable tracking)
+:live:      enable/disable query view when unpaused
+:delay:     Set delay when edge scrolling in tracking mode. Omit amount to display current setting.
+
+Usage::
+
+    mousequery [plugin] [rbutton] [track] [edge] [live] [enable|disable]
diff --git a/docs/plugins/nestboxes.rst b/docs/plugins/nestboxes.rst
new file mode 100644
index 000000000..2b633f31b
--- /dev/null
+++ b/docs/plugins/nestboxes.rst
@@ -0,0 +1,5 @@
+nestboxes
+=========
+
+Automatically scan for and forbid fertile eggs incubating in a nestbox.
+Toggle status with `enable` or `disable <disable>`.
diff --git a/docs/plugins/nopause.rst b/docs/plugins/nopause.rst
new file mode 100644
index 000000000..c30543187
--- /dev/null
+++ b/docs/plugins/nopause.rst
@@ -0,0 +1,4 @@
+nopause
+=======
+Disables pausing (both manual and automatic) with the exception of pause forced
+by `reveal` ``hell``. This is nice for digging under rivers.
diff --git a/docs/plugins/orders.rst b/docs/plugins/orders.rst
new file mode 100644
index 000000000..eb0e8a7ca
--- /dev/null
+++ b/docs/plugins/orders.rst
@@ -0,0 +1,116 @@
+orders
+======
+
+A plugin for manipulating manager orders.
+
+Subcommands:
+
+:list: Shows the list of previously exported orders, including the orders library.
+:export NAME: Exports the current list of manager orders to a file named ``dfhack-config/orders/NAME.json``.
+:import NAME: Imports manager orders from a file named ``dfhack-config/orders/NAME.json``.
+:clear: Deletes all manager orders in the current embark.
+:sort: Sorts current manager orders by repeat frequency so daily orders don't
+    prevent other orders from ever being completed: one-time orders first, then
+    yearly, seasonally, monthly, then finally daily.
+
+You can keep your orders automatically sorted by adding the following command to
+your ``onMapLoad.init`` file::
+
+    repeat -name orders-sort -time 1 -timeUnits days -command [ orders sort ]
+
+
+The orders library
+------------------
+
+DFHack comes with a library of useful manager orders that are ready for import:
+
+:source:`basic.json <data/orders/basic.json>`
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+This collection of orders handles basic fort necessities:
+
+- prepared meals and food products (and by-products like oil)
+- booze/mead
+- thread/cloth/dye
+- pots/jugs/buckets/mugs
+- bags of leather, cloth, silk, and yarn
+- crafts and totems from otherwise unusable by-products
+- mechanisms/cages
+- splints/crutches
+- lye/soap
+- ash/potash
+- beds/wheelbarrows/minecarts
+- scrolls
+
+You should import it as soon as you have enough dwarves to perform the tasks.
+Right after the first migration wave is usually a good time.
+
+:source:`furnace.json <data/orders/furnace.json>`
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+This collection creates basic items that require heat. It is separated out from
+``basic.json`` to give players the opportunity to set up magma furnaces first in
+order to save resources. It handles:
+
+- charcoal (including smelting of bituminous coal and lignite)
+- pearlash
+- sand
+- green/clear/crystal glass
+- adamantine processing
+- item melting
+
+Orders are missing for plaster powder until DF :bug:`11803` is fixed.
+
+:source:`military.json <data/orders/military.json>`
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+This collection adds high-volume smelting jobs for military-grade metal ores and
+produces weapons and armor:
+
+- leather backpacks/waterskins/cloaks/quivers/armor
+- bone/wooden bolts
+- smelting for platinum, silver, steel, bronze, bismuth bronze, and copper (and
+  their dependencies)
+- bronze/bismuth bronze/copper bolts
+- platinum/silver/steel/iron/bismuth bronze/bronze/copper weapons and armor,
+  with checks to ensure only the best available materials are being used
+
+If you set a stockpile to take weapons and armor of less than masterwork quality
+and turn on `automelt` (like what `dreamfort` provides on its industry level),
+these orders will automatically upgrade your military equipment to masterwork.
+Make sure you have a lot of fuel (or magma forges and furnaces) before you turn
+``automelt`` on, though!
+
+This file should only be imported, of course, if you need to equip a military.
+
+:source:`smelting.json <data/orders/smelting.json>`
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+This collection adds smelting jobs for all ores. It includes handling the ores
+already managed by ``military.json``, but has lower limits. This ensures all
+ores will be covered if a player imports ``smelting`` but not ``military``, but
+the higher-volume ``military`` orders will take priority if both are imported.
+
+:source:`rockstock.json <data/orders/rockstock.json>`
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+This collection of orders keeps a small stock of all types of rock furniture.
+This allows you to do ad-hoc furnishings of guildhalls, libraries, temples, or
+other rooms with `buildingplan` and your masons will make sure there is always
+stock on hand to fulfill the plans.
+
+:source:`glassstock.json <data/orders/glassstock.json>`
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Similar to ``rockstock`` above, this collection keeps a small stock of all types
+of glass furniture. If you have a functioning glass industry, this is more
+sustainable than ``rockstock`` since you can never run out of sand. If you have
+plenty of rock and just want the variety, you can import both ``rockstock`` and
+``glassstock`` to get a mixture of rock and glass furnishings in your fort.
+
+There are a few items that ``glassstock`` produces that ``rockstock`` does not,
+since there are some items that can not be made out of rock, for example:
+
+- tubes and corkscrews for building magma-safe screw pumps
+- windows
+- terrariums (as an alternative to wooden cages)
diff --git a/docs/plugins/petcapRemover.rst b/docs/plugins/petcapRemover.rst
new file mode 100644
index 000000000..65ebaeeab
--- /dev/null
+++ b/docs/plugins/petcapRemover.rst
@@ -0,0 +1,19 @@
+petcapRemover
+=============
+Allows you to remove or raise the pet population cap. In vanilla
+DF, pets will not reproduce unless the population is below 50 and the number of
+children of that species is below a certain percentage. This plugin allows
+removing the second restriction and removing or raising the first. Pets still
+require PET or PET_EXOTIC tags in order to reproduce. Type ``help petcapRemover``
+for exact usage. In order to make population more stable and avoid sudden
+population booms as you go below the raised population cap, this plugin counts
+pregnancies toward the new population cap. It can still go over, but only in the
+case of multiple births.
+
+Usage:
+
+:petcapRemover:             cause pregnancies now and schedule the next check
+:petcapRemover every n:     set how often in ticks the plugin checks for possible pregnancies
+:petcapRemover cap n:       set the new cap to n. if n = 0, no cap
+:petcapRemover pregtime n:  sets the pregnancy duration to n ticks. natural pregnancies are
+                            300000 ticks for the current race and 200000 for everyone else
diff --git a/docs/plugins/plant.rst b/docs/plugins/plant.rst
new file mode 100644
index 000000000..b621b890d
--- /dev/null
+++ b/docs/plugins/plant.rst
@@ -0,0 +1,16 @@
+plant
+=====
+A tool for creating shrubs, growing, or getting rid of them.
+
+Subcommands:
+
+:create:      Creates a new sapling under the cursor. Takes a raw ID as argument
+              (e.g. TOWER_CAP). The cursor must be located on a dirt or grass floor tile.
+:grow:        Turns saplings into trees; under the cursor if a sapling is selected,
+              or every sapling on the map if the cursor is hidden.
+
+For mass effects, use one of the additional options:
+
+:shrubs:    affect all shrubs on the map
+:trees:     affect all trees on the map
+:all:       affect every plant!
diff --git a/docs/plugins/power-meter.rst b/docs/plugins/power-meter.rst
new file mode 100644
index 000000000..163ef91be
--- /dev/null
+++ b/docs/plugins/power-meter.rst
@@ -0,0 +1,6 @@
+power-meter
+===========
+The power-meter plugin implements a modified pressure plate that detects power being
+supplied to gear boxes built in the four adjacent N/S/W/E tiles.
+
+The configuration front-end is implemented by `gui/power-meter`.
diff --git a/docs/plugins/probe.rst b/docs/plugins/probe.rst
new file mode 100644
index 000000000..1dcc28336
--- /dev/null
+++ b/docs/plugins/probe.rst
@@ -0,0 +1,13 @@
+probe
+=====
+
+This plugin provides multiple commands that print low-level properties of the
+selected objects.
+
+* ``probe``: prints some properties of the tile selected with :kbd:`k`. Some of
+  these properties can be passed into `tiletypes`.
+* ``cprobe``: prints some properties of the unit selected with :kbd:`v`, as well
+  as the IDs of any worn items. `gui/gm-unit` and `gui/gm-editor` are more
+  complete in-game alternatives.
+* ``bprobe``: prints some properties of the building selected with :kbd:`q` or
+  :kbd:`t`. `gui/gm-editor` is a more complete in-game alternative.
diff --git a/docs/plugins/prospect.rst b/docs/plugins/prospect.rst
new file mode 100644
index 000000000..a8979f1cc
--- /dev/null
+++ b/docs/plugins/prospect.rst
@@ -0,0 +1,51 @@
+prospect
+========
+
+**Usage:**
+
+    ``prospect [all|hell] [<options>]``
+
+Shows a summary of resources that exist on the map. By default, only the visible
+part of the map is scanned. Include the ``all`` keyword if you want ``prospect``
+to scan the whole map as if it were revealed. Use ``hell`` instead of ``all`` if
+you also want to see the Z range of HFS tubes in the 'features' report section.
+
+**Options:**
+
+:``-h``, ``--help``:
+    Shows this help text.
+:``-s``, ``--show <sections>``:
+    Shows only the named comma-separated list of report sections. Report section
+    names are: summary, liquids, layers, features, ores, gems, veins, shrubs,
+    and trees. If run during pre-embark, only the layers, ores, gems, and veins
+    report sections are available.
+:``-v``, ``--values``:
+    Includes material value in the output. Most useful for the 'gems' report
+    section.
+
+**Examples:**
+
+``prospect all``
+    Shows the entire report for the entire map.
+
+``prospect hell --show layers,ores,veins``
+    Shows only the layers, ores, and other vein stone report sections, and
+    includes information on HFS tubes when a fort is loaded.
+
+``prospect all -sores``
+    Show only information about ores for the pre-embark or fortress map report.
+
+**Pre-embark estimate:**
+
+If prospect is called during the embark selection screen, it displays an
+estimate of layer stone availability. If the ``all`` keyword is specified, it
+also estimates ores, gems, and vein material. The estimate covers all tiles of
+the embark rectangle.
+
+.. note::
+
+    The results of pre-embark prospect are an *estimate*, and can at best be
+    expected to be somewhere within +/- 30% of the true amount; sometimes it
+    does a lot worse. Especially, it is not clear how to precisely compute how
+    many soil layers there will be in a given embark tile, so it can report a
+    whole extra layer, or omit one that is actually present.
diff --git a/docs/plugins/prospector.rst b/docs/plugins/prospector.rst
new file mode 100644
index 000000000..a8979f1cc
--- /dev/null
+++ b/docs/plugins/prospector.rst
@@ -0,0 +1,51 @@
+prospect
+========
+
+**Usage:**
+
+    ``prospect [all|hell] [<options>]``
+
+Shows a summary of resources that exist on the map. By default, only the visible
+part of the map is scanned. Include the ``all`` keyword if you want ``prospect``
+to scan the whole map as if it were revealed. Use ``hell`` instead of ``all`` if
+you also want to see the Z range of HFS tubes in the 'features' report section.
+
+**Options:**
+
+:``-h``, ``--help``:
+    Shows this help text.
+:``-s``, ``--show <sections>``:
+    Shows only the named comma-separated list of report sections. Report section
+    names are: summary, liquids, layers, features, ores, gems, veins, shrubs,
+    and trees. If run during pre-embark, only the layers, ores, gems, and veins
+    report sections are available.
+:``-v``, ``--values``:
+    Includes material value in the output. Most useful for the 'gems' report
+    section.
+
+**Examples:**
+
+``prospect all``
+    Shows the entire report for the entire map.
+
+``prospect hell --show layers,ores,veins``
+    Shows only the layers, ores, and other vein stone report sections, and
+    includes information on HFS tubes when a fort is loaded.
+
+``prospect all -sores``
+    Show only information about ores for the pre-embark or fortress map report.
+
+**Pre-embark estimate:**
+
+If prospect is called during the embark selection screen, it displays an
+estimate of layer stone availability. If the ``all`` keyword is specified, it
+also estimates ores, gems, and vein material. The estimate covers all tiles of
+the embark rectangle.
+
+.. note::
+
+    The results of pre-embark prospect are an *estimate*, and can at best be
+    expected to be somewhere within +/- 30% of the true amount; sometimes it
+    does a lot worse. Especially, it is not clear how to precisely compute how
+    many soil layers there will be in a given embark tile, so it can report a
+    whole extra layer, or omit one that is actually present.
diff --git a/docs/plugins/rb.rst b/docs/plugins/rb.rst
new file mode 100644
index 000000000..359d6149b
--- /dev/null
+++ b/docs/plugins/rb.rst
@@ -0,0 +1,4 @@
+ruby
+====
+Ruby language plugin, which evaluates the following arguments as a ruby string.
+Best used as ``:rb [string]``, for the special parsing mode.  Alias ``rb_eval``.
diff --git a/docs/plugins/regrass.rst b/docs/plugins/regrass.rst
new file mode 100644
index 000000000..f3d00d8e1
--- /dev/null
+++ b/docs/plugins/regrass.rst
@@ -0,0 +1,3 @@
+regrass
+=======
+Regrows all the grass. Not much to it ;)
diff --git a/docs/plugins/remotefortressreader.rst b/docs/plugins/remotefortressreader.rst
new file mode 100644
index 000000000..287debca8
--- /dev/null
+++ b/docs/plugins/remotefortressreader.rst
@@ -0,0 +1,4 @@
+remotefortressreader
+====================
+An in-development plugin for realtime fortress visualisation.
+See :forums:`Armok Vision <146473>`.
diff --git a/docs/plugins/rename.rst b/docs/plugins/rename.rst
new file mode 100644
index 000000000..55534e636
--- /dev/null
+++ b/docs/plugins/rename.rst
@@ -0,0 +1,19 @@
+rename
+======
+Allows renaming various things.  Use `gui/rename` for an in-game interface.
+
+Options:
+
+``rename squad <index> "name"``
+  Rename squad by index to 'name'.
+``rename hotkey <index> \"name\"``
+  Rename hotkey by index. This allows assigning
+  longer commands to the DF hotkeys.
+``rename unit "nickname"``
+  Rename a unit/creature highlighted in the DF user interface.
+``rename unit-profession "custom profession"``
+  Change proffession name of the highlighted unit/creature.
+``rename building "name"``
+  Set a custom name for the selected building.
+  The building must be one of stockpile, workshop, furnace, trap,
+  siege engine or an activity zone.
diff --git a/docs/plugins/rendermax.rst b/docs/plugins/rendermax.rst
new file mode 100644
index 000000000..a173a75db
--- /dev/null
+++ b/docs/plugins/rendermax.rst
@@ -0,0 +1,18 @@
+rendermax
+=========
+A collection of renderer replacing/enhancing filters. For better effect try changing the
+black color in palette to non totally black. See :forums:`128487` for more info.
+
+Options:
+
+:trippy:                        Randomizes the color of each tiles. Used for fun, or testing.
+:light:                         Enable lighting engine.
+:light reload:                  Reload the settings file.
+:light sun <x>|cycle:           Set time to <x> (in hours) or set it to df time cycle.
+:occlusionON, occlusionOFF:     Show debug occlusion info.
+:disable:                       Disable any filter that is enabled.
+
+An image showing lava and dragon breath. Not pictured here: sunlight, shining items/plants,
+materials that color the light etc...
+
+.. image:: ../images/rendermax.png
diff --git a/docs/plugins/restrictice.rst b/docs/plugins/restrictice.rst
new file mode 100644
index 000000000..558fb5679
--- /dev/null
+++ b/docs/plugins/restrictice.rst
@@ -0,0 +1,4 @@
+restrictice
+===========
+Restrict traffic on all tiles on top of visible ice.
+See also `alltraffic`, `filltraffic`, and `restrictliquids`.
diff --git a/docs/plugins/restrictliquids.rst b/docs/plugins/restrictliquids.rst
new file mode 100644
index 000000000..4f6cd9550
--- /dev/null
+++ b/docs/plugins/restrictliquids.rst
@@ -0,0 +1,4 @@
+restrictliquids
+===============
+Restrict traffic on all visible tiles with liquid.
+See also `alltraffic`, `filltraffic`, and `restrictice`.
diff --git a/docs/plugins/resume.rst b/docs/plugins/resume.rst
new file mode 100644
index 000000000..ccca39e28
--- /dev/null
+++ b/docs/plugins/resume.rst
@@ -0,0 +1,4 @@
+resume
+======
+Allows automatic resumption of suspended constructions, along with colored
+UI hints for construction status.
diff --git a/docs/plugins/reveal.rst b/docs/plugins/reveal.rst
new file mode 100644
index 000000000..da7be8277
--- /dev/null
+++ b/docs/plugins/reveal.rst
@@ -0,0 +1,23 @@
+reveal
+======
+This reveals the map. By default, HFS will remain hidden so that the demons
+don't spawn. You can use ``reveal hell`` to reveal everything. With hell revealed,
+you won't be able to unpause until you hide the map again. If you really want
+to unpause with hell revealed, use ``reveal demons``.
+
+Reveal also works in adventure mode, but any of its effects are negated once
+you move. When you use it this way, you don't need to run ``unreveal``.
+
+Usage and related commands:
+
+:reveal:        Reveal the whole map, except for HFS to avoid demons spawning
+:reveal hell:   Also show hell, but requires ``unreveal`` before unpausing
+:reveal demon:  Reveals everything and allows unpausing - good luck!
+:unreveal:      Reverts the effects of ``reveal``
+:revtoggle:     Switches between ``reveal`` and ``unreveal``
+:revflood:      Hide everything, then reveal tiles with a path to the cursor.
+                Note that tiles behind constructed walls are also revealed as a
+                workaround for :bug:`1871`.
+:revforget:     Discard info about what was visible before revealing the map.
+                Only useful where (e.g.) you abandoned with the fort revealed
+                and no longer want the data.
diff --git a/docs/plugins/revflood.rst b/docs/plugins/revflood.rst
new file mode 100644
index 000000000..da7be8277
--- /dev/null
+++ b/docs/plugins/revflood.rst
@@ -0,0 +1,23 @@
+reveal
+======
+This reveals the map. By default, HFS will remain hidden so that the demons
+don't spawn. You can use ``reveal hell`` to reveal everything. With hell revealed,
+you won't be able to unpause until you hide the map again. If you really want
+to unpause with hell revealed, use ``reveal demons``.
+
+Reveal also works in adventure mode, but any of its effects are negated once
+you move. When you use it this way, you don't need to run ``unreveal``.
+
+Usage and related commands:
+
+:reveal:        Reveal the whole map, except for HFS to avoid demons spawning
+:reveal hell:   Also show hell, but requires ``unreveal`` before unpausing
+:reveal demon:  Reveals everything and allows unpausing - good luck!
+:unreveal:      Reverts the effects of ``reveal``
+:revtoggle:     Switches between ``reveal`` and ``unreveal``
+:revflood:      Hide everything, then reveal tiles with a path to the cursor.
+                Note that tiles behind constructed walls are also revealed as a
+                workaround for :bug:`1871`.
+:revforget:     Discard info about what was visible before revealing the map.
+                Only useful where (e.g.) you abandoned with the fort revealed
+                and no longer want the data.
diff --git a/docs/plugins/revforget.rst b/docs/plugins/revforget.rst
new file mode 100644
index 000000000..da7be8277
--- /dev/null
+++ b/docs/plugins/revforget.rst
@@ -0,0 +1,23 @@
+reveal
+======
+This reveals the map. By default, HFS will remain hidden so that the demons
+don't spawn. You can use ``reveal hell`` to reveal everything. With hell revealed,
+you won't be able to unpause until you hide the map again. If you really want
+to unpause with hell revealed, use ``reveal demons``.
+
+Reveal also works in adventure mode, but any of its effects are negated once
+you move. When you use it this way, you don't need to run ``unreveal``.
+
+Usage and related commands:
+
+:reveal:        Reveal the whole map, except for HFS to avoid demons spawning
+:reveal hell:   Also show hell, but requires ``unreveal`` before unpausing
+:reveal demon:  Reveals everything and allows unpausing - good luck!
+:unreveal:      Reverts the effects of ``reveal``
+:revtoggle:     Switches between ``reveal`` and ``unreveal``
+:revflood:      Hide everything, then reveal tiles with a path to the cursor.
+                Note that tiles behind constructed walls are also revealed as a
+                workaround for :bug:`1871`.
+:revforget:     Discard info about what was visible before revealing the map.
+                Only useful where (e.g.) you abandoned with the fort revealed
+                and no longer want the data.
diff --git a/docs/plugins/revtoggle.rst b/docs/plugins/revtoggle.rst
new file mode 100644
index 000000000..da7be8277
--- /dev/null
+++ b/docs/plugins/revtoggle.rst
@@ -0,0 +1,23 @@
+reveal
+======
+This reveals the map. By default, HFS will remain hidden so that the demons
+don't spawn. You can use ``reveal hell`` to reveal everything. With hell revealed,
+you won't be able to unpause until you hide the map again. If you really want
+to unpause with hell revealed, use ``reveal demons``.
+
+Reveal also works in adventure mode, but any of its effects are negated once
+you move. When you use it this way, you don't need to run ``unreveal``.
+
+Usage and related commands:
+
+:reveal:        Reveal the whole map, except for HFS to avoid demons spawning
+:reveal hell:   Also show hell, but requires ``unreveal`` before unpausing
+:reveal demon:  Reveals everything and allows unpausing - good luck!
+:unreveal:      Reverts the effects of ``reveal``
+:revtoggle:     Switches between ``reveal`` and ``unreveal``
+:revflood:      Hide everything, then reveal tiles with a path to the cursor.
+                Note that tiles behind constructed walls are also revealed as a
+                workaround for :bug:`1871`.
+:revforget:     Discard info about what was visible before revealing the map.
+                Only useful where (e.g.) you abandoned with the fort revealed
+                and no longer want the data.
diff --git a/docs/plugins/ruby.rst b/docs/plugins/ruby.rst
new file mode 100644
index 000000000..359d6149b
--- /dev/null
+++ b/docs/plugins/ruby.rst
@@ -0,0 +1,4 @@
+ruby
+====
+Ruby language plugin, which evaluates the following arguments as a ruby string.
+Best used as ``:rb [string]``, for the special parsing mode.  Alias ``rb_eval``.
diff --git a/docs/plugins/search.rst b/docs/plugins/search.rst
new file mode 100644
index 000000000..57b9e5df4
--- /dev/null
+++ b/docs/plugins/search.rst
@@ -0,0 +1,40 @@
+
+.. _search-plugin:
+
+search
+======
+The search plugin adds search to the Stocks, Animals, Trading, Stockpile,
+Noble (assignment candidates), Military (position candidates), Burrows
+(unit list), Rooms, Announcements, Job List and Unit List screens.
+
+.. image:: ../images/search.png
+
+Searching works the same way as the search option in :guilabel:`Move to Depot`.
+You will see the Search option displayed on screen with a hotkey (usually :kbd:`s`).
+Pressing it lets you start typing a query and the relevant list will start
+filtering automatically.
+
+Pressing :kbd:`Enter`, :kbd:`Esc` or the arrow keys will return you to browsing the now
+filtered list, which still functions as normal. You can clear the filter
+by either going back into search mode and backspacing to delete it, or
+pressing the "shifted" version of the search hotkey while browsing the
+list (e.g. if the hotkey is :kbd:`s`, then hitting :kbd:`Shift`:kbd:`s` will clear any
+filter).
+
+Leaving any screen automatically clears the filter.
+
+In the Trade screen, the actual trade will always only act on items that
+are actually visible in the list; the same effect applies to the Trade
+Value numbers displayed by the screen. Because of this, the :kbd:`t` key is
+blocked while search is active, so you have to reset the filters first.
+Pressing :kbd:`Alt`:kbd:`C` will clear both search strings.
+
+In the stockpile screen the option only appears if the cursor is in the
+rightmost list:
+
+.. image:: ../images/search-stockpile.png
+
+Note that the 'Permit XXX'/'Forbid XXX' keys conveniently operate only
+on items actually shown in the rightmost list, so it is possible to select
+only fat or tallow by forbidding fats, then searching for fat/tallow, and
+using Permit Fats again while the list is filtered.
diff --git a/docs/plugins/seedwatch.rst b/docs/plugins/seedwatch.rst
new file mode 100644
index 000000000..1d5ab9e62
--- /dev/null
+++ b/docs/plugins/seedwatch.rst
@@ -0,0 +1,27 @@
+seedwatch
+=========
+Watches the numbers of seeds available and enables/disables seed and plant cooking.
+
+Each plant type can be assigned a limit. If their number falls below that limit,
+the plants and seeds of that type will be excluded from cookery.
+If the number rises above the limit + 20, then cooking will be allowed.
+
+The plugin needs a fortress to be loaded and will deactivate automatically otherwise.
+You have to reactivate with 'seedwatch start' after you load the game.
+
+Options:
+
+:all:       Adds all plants from the abbreviation list to the watch list.
+:start:     Start watching.
+:stop:      Stop watching.
+:info:      Display whether seedwatch is watching, and the watch list.
+:clear:     Clears the watch list.
+
+Examples:
+
+``seedwatch MUSHROOM_HELMET_PLUMP 30``
+    add ``MUSHROOM_HELMET_PLUMP`` to the watch list, limit = 30
+``seedwatch MUSHROOM_HELMET_PLUMP``
+    removes ``MUSHROOM_HELMET_PLUMP`` from the watch list.
+``seedwatch all 30``
+    adds all plants from the abbreviation list to the watch list, the limit being 30.
diff --git a/docs/plugins/showmood.rst b/docs/plugins/showmood.rst
new file mode 100644
index 000000000..9276766c4
--- /dev/null
+++ b/docs/plugins/showmood.rst
@@ -0,0 +1,3 @@
+showmood
+========
+Shows all items needed for the currently active strange mood.
diff --git a/docs/plugins/siege-engine.rst b/docs/plugins/siege-engine.rst
new file mode 100644
index 000000000..0e9511d3d
--- /dev/null
+++ b/docs/plugins/siege-engine.rst
@@ -0,0 +1,12 @@
+siege-engine
+============
+Siege engines in DF haven't been updated since the game was 2D, and can
+only aim in four directions.  To make them useful above-ground,
+this plugin allows you to:
+
+* link siege engines to stockpiles
+* restrict operator skill levels (like workshops)
+* load any object into a catapult, not just stones
+* aim at a rectangular area in any direction, and across Z-levels
+
+The front-end is implemented by `gui/siege-engine`.
diff --git a/docs/plugins/sort-items.rst b/docs/plugins/sort-items.rst
new file mode 100644
index 000000000..d18f33c4e
--- /dev/null
+++ b/docs/plugins/sort-items.rst
@@ -0,0 +1,17 @@
+.. _sort:
+
+sort-items
+==========
+Sort the visible item list::
+
+    sort-items order [order...]
+
+Sort the item list using the given sequence of comparisons.
+The ``<`` prefix for an order makes undefined values sort first.
+The ``>`` prefix reverses the sort order for defined values.
+
+Item order examples::
+
+    description material wear type quality
+
+The orderings are defined in ``hack/lua/plugins/sort/*.lua``
diff --git a/docs/plugins/sort-units.rst b/docs/plugins/sort-units.rst
new file mode 100644
index 000000000..1a88381ce
--- /dev/null
+++ b/docs/plugins/sort-units.rst
@@ -0,0 +1,17 @@
+sort-units
+==========
+Sort the visible unit list::
+
+    sort-units order [order...]
+
+Sort the unit list using the given sequence of comparisons.
+The ``<`` prefix for an order makes undefined values sort first.
+The ``>`` prefix reverses the sort order for defined values.
+
+Unit order examples::
+
+    name age arrival squad squad_position profession
+
+The orderings are defined in ``hack/lua/plugins/sort/*.lua``
+
+:dfhack-keybind:`sort-units`
diff --git a/docs/plugins/spectate.rst b/docs/plugins/spectate.rst
new file mode 100644
index 000000000..6c2ca9e24
--- /dev/null
+++ b/docs/plugins/spectate.rst
@@ -0,0 +1,5 @@
+spectate
+========
+Simple plugin to automate following random dwarves. Most of the time things will
+be weighted towards z-levels with the highest job activity. Simply enter the
+``spectate`` command to toggle the plugin's state.
diff --git a/docs/plugins/spotclean.rst b/docs/plugins/spotclean.rst
new file mode 100644
index 000000000..9ccdd2cc6
--- /dev/null
+++ b/docs/plugins/spotclean.rst
@@ -0,0 +1,6 @@
+spotclean
+=========
+Works like ``clean map snow mud``, but only for the tile under the cursor. Ideal
+if you want to keep that bloody entrance ``clean map`` would clean up.
+
+:dfhack-keybind:`spotclean`
diff --git a/docs/plugins/steam-engine.rst b/docs/plugins/steam-engine.rst
new file mode 100644
index 000000000..416ac9ad1
--- /dev/null
+++ b/docs/plugins/steam-engine.rst
@@ -0,0 +1,84 @@
+steam-engine
+============
+The steam-engine plugin detects custom workshops with STEAM_ENGINE in
+their token, and turns them into real steam engines.
+
+The vanilla game contains only water wheels and windmills as sources of
+power, but windmills give relatively little power, and water wheels require
+flowing water, which must either be a real river and thus immovable and
+limited in supply, or actually flowing and thus laggy.
+
+Compared to the :wiki:`water reactor <Water_wheel#Dwarven_Water_Reactor>`
+exploit, steam engines make a lot of sense!
+
+Construction
+------------
+The workshop needs water as its input, which it takes via a
+passable floor tile below it, like usual magma workshops do.
+The magma version also needs magma.
+
+Due to DFHack limits, the workshop will collapse over true open space.
+However down stairs are passable but support machines, so you can use them.
+
+After constructing the building itself, machines can be connected
+to the edge tiles that look like gear boxes. Their exact position
+is extracted from the workshop raws.
+
+Like with collapse above, due to DFHack limits the workshop
+can only immediately connect to machine components built AFTER it.
+This also means that engines cannot be chained without intermediate
+axles built after both engines.
+
+Operation
+---------
+In order to operate the engine, queue the Stoke Boiler job (optionally
+on repeat). A furnace operator will come, possibly bringing a bar of fuel,
+and perform it. As a result, a "boiling water" item will appear
+in the :kbd:`t` view of the workshop.
+
+.. note::
+
+    The completion of the job will actually consume one unit
+    of the appropriate liquids from below the workshop. This means
+    that you cannot just raise 7 units of magma with a piston and
+    have infinite power. However, liquid consumption should be slow
+    enough that water can be supplied by a pond zone bucket chain.
+
+Every such item gives 100 power, up to a limit of 300 for coal,
+and 500 for a magma engine. The building can host twice that
+amount of items to provide longer autonomous running. When the
+boiler gets filled to capacity, all queued jobs are suspended;
+once it drops back to 3+1 or 5+1 items, they are re-enabled.
+
+While the engine is providing power, steam is being consumed.
+The consumption speed includes a fixed 10% waste rate, and
+the remaining 90% are applied proportionally to the actual
+load in the machine. With the engine at nominal 300 power with
+150 load in the system, it will consume steam for actual
+300*(10% + 90%*150/300) = 165 power.
+
+Masterpiece mechanism and chain will decrease the mechanical
+power drawn by the engine itself from 10 to 5. Masterpiece
+barrel decreases waste rate by 4%. Masterpiece piston and pipe
+decrease it by further 4%, and also decrease the whole steam
+use rate by 10%.
+
+Explosions
+----------
+The engine must be constructed using barrel, pipe and piston
+from fire-safe, or in the magma version magma-safe metals.
+
+During operation weak parts get gradually worn out, and
+eventually the engine explodes. It should also explode if
+toppled during operation by a building destroyer, or a
+tantruming dwarf.
+
+Save files
+----------
+It should be safe to load and view engine-using fortresses
+from a DF version without DFHack installed, except that in such
+case the engines won't work. However actually making modifications
+to them, or machines they connect to (including by pulling levers),
+can easily result in inconsistent state once this plugin is
+available again. The effects may be as weird as negative power
+being generated.
diff --git a/docs/plugins/stockflow.rst b/docs/plugins/stockflow.rst
new file mode 100644
index 000000000..c3db7a673
--- /dev/null
+++ b/docs/plugins/stockflow.rst
@@ -0,0 +1,31 @@
+stockflow
+=========
+Allows the fortress bookkeeper to queue jobs through the manager,
+based on space or items available in stockpiles.
+
+Inspired by `workflow`.
+
+Usage:
+
+``stockflow enable``
+    Enable the plugin.
+``stockflow disable``
+    Disable the plugin.
+``stockflow fast``
+    Enable the plugin in fast mode.
+``stockflow list``
+    List any work order settings for your stockpiles.
+``stockflow status``
+    Display whether the plugin is enabled.
+
+While enabled, the :kbd:`q` menu of each stockpile will have two new options:
+
+* :kbd:`j`:  Select a job to order, from an interface like the manager's screen.
+* :kbd:`J`:  Cycle between several options for how many such jobs to order.
+
+Whenever the bookkeeper updates stockpile records, new work orders will
+be placed on the manager's queue for each such selection, reduced by the
+number of identical orders already in the queue.
+
+In fast mode, new work orders will be enqueued once per day, instead of
+waiting for the bookkeeper.
diff --git a/docs/plugins/stockpiles.rst b/docs/plugins/stockpiles.rst
new file mode 100644
index 000000000..000527ce5
--- /dev/null
+++ b/docs/plugins/stockpiles.rst
@@ -0,0 +1,28 @@
+.. _stocksettings:
+
+stockpiles
+==========
+Offers the following commands to save and load stockpile settings.
+See `gui/stockpiles` for an in-game interface.
+
+:copystock:     Copies the parameters of the currently highlighted stockpile to the custom
+                stockpile settings and switches to custom stockpile placement mode, effectively
+                allowing you to copy/paste stockpiles easily.
+                :dfhack-keybind:`copystock`
+
+:savestock:     Saves the currently highlighted stockpile's settings to a file in your Dwarf
+                Fortress folder. This file can be used to copy settings between game saves or
+                players.  e.g.:  ``savestock food_settings.dfstock``
+
+:loadstock:     Loads a saved stockpile settings file and applies it to the currently selected
+                stockpile.  e.g.:  ``loadstock food_settings.dfstock``
+
+To use savestock and loadstock, use the :kbd:`q` command to highlight a stockpile.
+Then run savestock giving it a descriptive filename. Then, in a different (or
+the same!) gameworld, you can highlight any stockpile with :kbd:`q` then execute the
+``loadstock`` command passing it the name of that file. The settings will be
+applied to that stockpile.
+
+Note that files are relative to the DF folder, so put your files there or in a
+subfolder for easy access. Filenames should not have spaces.  Generated materials,
+divine metals, etc are not saved as they are different in every world.
diff --git a/docs/plugins/stocks.rst b/docs/plugins/stocks.rst
new file mode 100644
index 000000000..cbfbce978
--- /dev/null
+++ b/docs/plugins/stocks.rst
@@ -0,0 +1,6 @@
+stocks
+======
+Replaces the DF stocks screen with an improved version.
+
+:dfhack-keybind:`stocks`
+
diff --git a/docs/plugins/stonesense.rst b/docs/plugins/stonesense.rst
new file mode 100644
index 000000000..b6c154e66
--- /dev/null
+++ b/docs/plugins/stonesense.rst
@@ -0,0 +1,10 @@
+.. _plugin-stonesense:
+
+stonesense
+==========
+An isometric visualizer that runs in a second window. Usage:
+
+:stonesense:        Open the visualiser in a new window.  Alias ``ssense``.
+:ssense overlay:    Overlay DF window, replacing the map area.
+
+For more information, see `the full Stonesense README <stonesense>`.
diff --git a/docs/plugins/strangemood.rst b/docs/plugins/strangemood.rst
new file mode 100644
index 000000000..0d578c363
--- /dev/null
+++ b/docs/plugins/strangemood.rst
@@ -0,0 +1,19 @@
+strangemood
+===========
+Creates a strange mood job the same way the game itself normally does it.
+
+Options:
+
+:-force:        Ignore normal strange mood preconditions (no recent mood, minimum
+                moodable population, artifact limit not reached).
+:-unit:         Make the strange mood strike the selected unit instead of picking
+                one randomly. Unit eligibility is still enforced.
+:-type <T>:     Force the mood to be of a particular type instead of choosing randomly based on happiness.
+                Valid values for T are "fey", "secretive", "possessed", "fell", and "macabre".
+:-skill S:      Force the mood to use a specific skill instead of choosing the highest moodable skill.
+                Valid values are "miner", "carpenter", "engraver", "mason", "tanner", "weaver",
+                "clothier", "weaponsmith",  "armorsmith", "metalsmith", "gemcutter", "gemsetter",
+                "woodcrafter", "stonecrafter", "metalcrafter", "glassmaker", "leatherworker",
+                "bonecarver", "bowyer", and "mechanic".
+
+Known limitations: if the selected unit is currently performing a job, the mood will not be started.
diff --git a/docs/plugins/tailor.rst b/docs/plugins/tailor.rst
new file mode 100644
index 000000000..ee1567fdb
--- /dev/null
+++ b/docs/plugins/tailor.rst
@@ -0,0 +1,11 @@
+tailor
+======
+
+Whenever the bookkeeper updates stockpile records, this plugin will scan every unit in the fort,
+count up the number that are worn, and then order enough more made to replace all worn items.
+If there are enough replacement items in inventory to replace all worn items, the units wearing them
+will have the worn items confiscated (in the same manner as the `cleanowned` plugin) so that they'll
+reeequip with replacement items.
+
+Use the `enable` and `disable <disable>` commands to toggle this plugin's status, or run
+``tailor status`` to check its current status.
diff --git a/docs/plugins/tiletypes-command.rst b/docs/plugins/tiletypes-command.rst
new file mode 100644
index 000000000..0f75c633e
--- /dev/null
+++ b/docs/plugins/tiletypes-command.rst
@@ -0,0 +1,10 @@
+tiletypes-command
+-----------------
+Runs tiletypes commands, separated by ``;``. This makes it possible to change
+tiletypes modes from a hotkey or via dfhack-run.
+
+Example::
+
+    tiletypes-command p any ; p s wall ; p sp normal
+
+This resets the paint filter to unsmoothed walls.
diff --git a/docs/plugins/tiletypes-here-point.rst b/docs/plugins/tiletypes-here-point.rst
new file mode 100644
index 000000000..8951bdff8
--- /dev/null
+++ b/docs/plugins/tiletypes-here-point.rst
@@ -0,0 +1,6 @@
+tiletypes-here-point
+--------------------
+Apply the current tiletypes options at the in-game cursor position to a single
+tile. Can be used from a hotkey.
+
+This command supports the same options as `tiletypes-here` above.
diff --git a/docs/plugins/tiletypes-here.rst b/docs/plugins/tiletypes-here.rst
new file mode 100644
index 000000000..fe9ceefd9
--- /dev/null
+++ b/docs/plugins/tiletypes-here.rst
@@ -0,0 +1,14 @@
+tiletypes-here
+--------------
+Apply the current tiletypes options at the in-game cursor position, including
+the brush. Can be used from a hotkey.
+
+Options:
+
+:``-c``, ``--cursor <x>,<y>,<z>``:
+    Use the specified map coordinates instead of the current cursor position. If
+    this option is specified, then an active game map cursor is not necessary.
+:``-h``, ``--help``:
+    Show command help text.
+:``-q``, ``--quiet``:
+    Suppress non-error status output.
diff --git a/docs/plugins/tiletypes.rst b/docs/plugins/tiletypes.rst
new file mode 100644
index 000000000..41f780521
--- /dev/null
+++ b/docs/plugins/tiletypes.rst
@@ -0,0 +1,82 @@
+tiletypes
+=========
+Can be used for painting map tiles and is an interactive command, much like
+`liquids`. Some properties of existing tiles can be looked up with `probe`. If
+something goes wrong, `fixveins` may help.
+
+The tool works with two set of options and a brush. The brush determines which
+tiles will be processed. First set of options is the filter, which can exclude
+some of the tiles from the brush by looking at the tile properties. The second
+set of options is the paint - this determines how the selected tiles are
+changed.
+
+Both paint and filter can have many different properties including things like
+general shape (WALL, FLOOR, etc.), general material (SOIL, STONE, MINERAL,
+etc.), state of 'designated', 'hidden' and 'light' flags.
+
+The properties of filter and paint can be partially defined. This means that
+you can for example turn all stone fortifications into floors, preserving the
+material::
+
+        filter material STONE
+        filter shape FORTIFICATION
+        paint shape FLOOR
+
+Or turn mineral vein floors back into walls::
+
+        filter shape FLOOR
+        filter material MINERAL
+        paint shape WALL
+
+The tool also allows tweaking some tile flags::
+
+        paint hidden 1
+        paint hidden 0
+
+This will hide previously revealed tiles (or show hidden with the 0 option).
+
+More recently, the tool supports changing the base material of the tile to
+an arbitrary stone from the raws, by creating new veins as required. Note
+that this mode paints under ice and constructions, instead of overwriting
+them. To enable, use::
+
+        paint stone MICROCLINE
+
+This mode is incompatible with the regular ``material`` setting, so changing
+it cancels the specific stone selection::
+
+        paint material ANY
+
+Since different vein types have different drop rates, it is possible to choose
+which one to use in painting::
+
+        paint veintype CLUSTER_SMALL
+
+When the chosen type is ``CLUSTER`` (the default), the tool may automatically
+choose to use layer stone or lava stone instead of veins if its material matches
+the desired one.
+
+Any paint or filter option (or the entire paint or filter) can be disabled entirely by using the ANY keyword::
+
+        paint hidden ANY
+        paint shape ANY
+        filter material any
+        filter shape any
+        filter any
+
+You can use several different brushes for painting tiles:
+
+:point:     a single tile
+:range:     a rectangular range
+:column:    a column ranging from current cursor to the first solid tile above
+:block:     a DF map block - 16x16 tiles, in a regular grid
+
+Example::
+
+    range 10 10 1
+
+This will change the brush to a rectangle spanning 10x10 tiles on one z-level.
+The range starts at the position of the cursor and goes to the east, south and
+up.
+
+For more details, use ``tiletypes help``.
diff --git a/docs/plugins/title-folder.rst b/docs/plugins/title-folder.rst
new file mode 100644
index 000000000..4e1ef40ec
--- /dev/null
+++ b/docs/plugins/title-folder.rst
@@ -0,0 +1,3 @@
+title-folder
+=============
+Displays the DF folder name in the window title bar when enabled.
diff --git a/docs/plugins/title-version.rst b/docs/plugins/title-version.rst
new file mode 100644
index 000000000..aed7a02e0
--- /dev/null
+++ b/docs/plugins/title-version.rst
@@ -0,0 +1,3 @@
+title-version
+=============
+Displays the DFHack version on DF's title screen when enabled.
diff --git a/docs/plugins/trackstop.rst b/docs/plugins/trackstop.rst
new file mode 100644
index 000000000..b012df34d
--- /dev/null
+++ b/docs/plugins/trackstop.rst
@@ -0,0 +1,5 @@
+trackstop
+=========
+Adds a :kbd:`q` menu for track stops, which is completely blank by default.
+This allows you to view and/or change the track stop's friction and dump
+direction settings, using the keybindings from the track stop building interface.
diff --git a/docs/plugins/tubefill.rst b/docs/plugins/tubefill.rst
new file mode 100644
index 000000000..99c0b76bd
--- /dev/null
+++ b/docs/plugins/tubefill.rst
@@ -0,0 +1,11 @@
+tubefill
+========
+Fills all the adamantine veins again. Veins that were hollow will be left
+alone.
+
+Options:
+
+:hollow:            fill in naturally hollow veins too
+
+Beware that filling in hollow veins will trigger a demon invasion on top of
+your miner when you dig into the region that used to be hollow.
diff --git a/docs/plugins/tweak.rst b/docs/plugins/tweak.rst
new file mode 100644
index 000000000..4ce7b6d38
--- /dev/null
+++ b/docs/plugins/tweak.rst
@@ -0,0 +1,91 @@
+tweak
+=====
+Contains various tweaks for minor bugs.
+
+One-shot subcommands:
+
+:clear-missing:  Remove the missing status from the selected unit.
+                 This allows engraving slabs for ghostly, but not yet
+                 found, creatures.
+:clear-ghostly:  Remove the ghostly status from the selected unit and mark
+                 it as dead. This allows getting rid of bugged ghosts
+                 which do not show up in the engraving slab menu at all,
+                 even after using clear-missing. It works, but is
+                 potentially very dangerous - so use with care. Probably
+                 (almost certainly) it does not have the same effects like
+                 a proper burial. You've been warned.
+:fixmigrant:     Remove the resident/merchant flag from the selected unit.
+                 Intended to fix bugged migrants/traders who stay at the
+                 map edge and don't enter your fort. Only works for
+                 dwarves (or generally the player's race in modded games).
+                 Do NOT abuse this for 'real' caravan merchants (if you
+                 really want to kidnap them, use 'tweak makeown' instead,
+                 otherwise they will have their clothes set to forbidden etc).
+:makeown:        Force selected unit to become a member of your fort.
+                 Can be abused to grab caravan merchants and escorts, even if
+                 they don't belong to the player's race. Foreign sentients
+                 (humans, elves) can be put to work, but you can't assign rooms
+                 to them and they don't show up in DwarfTherapist because the
+                 game treats them like pets. Grabbing draft animals from
+                 a caravan can result in weirdness (animals go insane or berserk
+                 and are not flagged as tame), but you are allowed to mark them
+                 for slaughter. Grabbing wagons results in some funny spam, then
+                 they are scuttled.
+
+Subcommands that persist until disabled or DF quits:
+
+.. comment: sort these alphabetically
+
+:adamantine-cloth-wear: Prevents adamantine clothing from wearing out while being worn (:bug:`6481`).
+:advmode-contained:     Works around :bug:`6202`, custom reactions with container inputs
+                        in advmode. The issue is that the screen tries to force you to select
+                        the contents separately from the container. This forcefully skips child
+                        reagents.
+:block-labors:          Prevents labors that can't be used from being toggled
+:burrow-name-cancel:    Implements the "back" option when renaming a burrow,
+                        which currently does nothing (:bug:`1518`)
+:cage-butcher:          Adds an option to butcher units when viewing cages with :kbd:`q`
+:civ-view-agreement:    Fixes overlapping text on the "view agreement" screen
+:condition-material:    Fixes a crash in the work order contition material list (:bug:`9905`).
+:craft-age-wear:        Fixes the behavior of crafted items wearing out over time (:bug:`6003`).
+                        With this tweak, items made from cloth and leather will gain a level of
+                        wear  every 20 years.
+:do-job-now:            Adds a job priority toggle to the jobs list
+:embark-profile-name:   Allows the use of lowercase letters when saving embark profiles
+:eggs-fertile:          Displays a fertility indicator on nestboxes
+:farm-plot-select:      Adds "Select all" and "Deselect all" options to farm plot menus
+:fast-heat:             Further improves temperature update performance by ensuring that 1 degree
+                        of item temperature is crossed in no more than specified number of frames
+                        when updating from the environment temperature. This reduces the time it
+                        takes for stable-temp to stop updates again when equilibrium is disturbed.
+:fast-trade:            Makes Shift-Down in the Move Goods to Depot and Trade screens select
+                        the current item (fully, in case of a stack), and scroll down one line.
+:fps-min:               Fixes the in-game minimum FPS setting
+:hide-priority:         Adds an option to hide designation priority indicators
+:hotkey-clear:          Adds an option to clear currently-bound hotkeys (in the :kbd:`H` menu)
+:import-priority-category:
+                        Allows changing the priority of all goods in a
+                        category when discussing an import agreement with the liaison
+:kitchen-prefs-all:     Adds an option to toggle cook/brew for all visible items in kitchen preferences
+:kitchen-prefs-color:   Changes color of enabled items to green in kitchen preferences
+:kitchen-prefs-empty:   Fixes a layout issue with empty kitchen tabs (:bug:`9000`)
+:max-wheelbarrow:       Allows assigning more than 3 wheelbarrows to a stockpile
+:military-color-assigned:
+                        Color squad candidates already assigned to other squads in yellow/green
+                        to make them stand out more in the list.
+
+                        .. image:: ../images/tweak-mil-color.png
+
+:military-stable-assign:
+                        Preserve list order and cursor position when assigning to squad,
+                        i.e. stop the rightmost list of the Positions page of the military
+                        screen from constantly resetting to the top.
+:nestbox-color:         Fixes the color of built nestboxes
+:partial-items:         Displays percentages on partially-consumed items such as hospital cloth
+:reaction-gloves:       Fixes reactions to produce gloves in sets with correct handedness (:bug:`6273`)
+:shift-8-scroll:        Gives Shift-8 (or :kbd:`*`) priority when scrolling menus, instead of scrolling the map
+:stable-cursor:         Saves the exact cursor position between t/q/k/d/b/etc menus of fortress mode, if the
+                        map view is near enough to its previous position.
+:stone-status-all:      Adds an option to toggle the economic status of all stones
+:title-start-rename:    Adds a safe rename option to the title screen "Start Playing" menu
+:tradereq-pet-gender:   Displays pet genders on the trade request screen
diff --git a/docs/plugins/unreveal.rst b/docs/plugins/unreveal.rst
new file mode 100644
index 000000000..da7be8277
--- /dev/null
+++ b/docs/plugins/unreveal.rst
@@ -0,0 +1,23 @@
+reveal
+======
+This reveals the map. By default, HFS will remain hidden so that the demons
+don't spawn. You can use ``reveal hell`` to reveal everything. With hell revealed,
+you won't be able to unpause until you hide the map again. If you really want
+to unpause with hell revealed, use ``reveal demons``.
+
+Reveal also works in adventure mode, but any of its effects are negated once
+you move. When you use it this way, you don't need to run ``unreveal``.
+
+Usage and related commands:
+
+:reveal:        Reveal the whole map, except for HFS to avoid demons spawning
+:reveal hell:   Also show hell, but requires ``unreveal`` before unpausing
+:reveal demon:  Reveals everything and allows unpausing - good luck!
+:unreveal:      Reverts the effects of ``reveal``
+:revtoggle:     Switches between ``reveal`` and ``unreveal``
+:revflood:      Hide everything, then reveal tiles with a path to the cursor.
+                Note that tiles behind constructed walls are also revealed as a
+                workaround for :bug:`1871`.
+:revforget:     Discard info about what was visible before revealing the map.
+                Only useful where (e.g.) you abandoned with the fort revealed
+                and no longer want the data.
diff --git a/docs/plugins/workNow.rst b/docs/plugins/workNow.rst
new file mode 100644
index 000000000..bacecf612
--- /dev/null
+++ b/docs/plugins/workNow.rst
@@ -0,0 +1,12 @@
+workNow
+=======
+Don't allow dwarves to idle if any jobs are available.
+
+When workNow is active, every time the game pauses, DF will make dwarves
+perform any appropriate available jobs.  This includes when you one step
+through the game using the pause menu.  Usage:
+
+:workNow:       print workNow status
+:workNow 0:     deactivate workNow
+:workNow 1:     activate workNow (look for jobs on pause, and only then)
+:workNow 2:     make dwarves look for jobs whenever a job completes
diff --git a/docs/plugins/workflow.rst b/docs/plugins/workflow.rst
new file mode 100644
index 000000000..17db57e69
--- /dev/null
+++ b/docs/plugins/workflow.rst
@@ -0,0 +1,113 @@
+workflow
+========
+Manage control of repeat jobs.  `gui/workflow` provides a simple
+front-end integrated in the game UI.
+
+Usage:
+
+``workflow enable [option...], workflow disable [option...]``
+   If no options are specified, enables or disables the plugin.
+   Otherwise, enables or disables any of the following options:
+
+   - drybuckets: Automatically empty abandoned water buckets.
+   - auto-melt: Resume melt jobs when there are objects to melt.
+``workflow jobs``
+   List workflow-controlled jobs (if in a workshop, filtered by it).
+``workflow list``
+   List active constraints, and their job counts.
+``workflow list-commands``
+   List active constraints as workflow commands that re-create them;
+   this list can be copied to a file, and then reloaded using the
+   ``script`` built-in command.
+``workflow count <constraint-spec> <cnt-limit> [cnt-gap]``
+   Set a constraint, counting every stack as 1 item.
+``workflow amount <constraint-spec> <cnt-limit> [cnt-gap]``
+   Set a constraint, counting all items within stacks.
+``workflow unlimit <constraint-spec>``
+   Delete a constraint.
+``workflow unlimit-all``
+   Delete all constraints.
+
+Function
+--------
+When the plugin is enabled, it protects all repeat jobs from removal.
+If they do disappear due to any cause, they are immediately re-added to their
+workshop and suspended.
+
+In addition, when any constraints on item amounts are set, repeat jobs that
+produce that kind of item are automatically suspended and resumed as the item
+amount goes above or below the limit. The gap specifies how much below the limit
+the amount has to drop before jobs are resumed; this is intended to reduce
+the frequency of jobs being toggled.
+
+Constraint format
+-----------------
+The constraint spec consists of 4 parts, separated with ``/`` characters::
+
+    ITEM[:SUBTYPE]/[GENERIC_MAT,...]/[SPECIFIC_MAT:...]/[LOCAL,<quality>]
+
+The first part is mandatory and specifies the item type and subtype,
+using the raw tokens for items (the same syntax used custom reaction inputs).
+For more information, see :wiki:`this wiki page <Material_token>`.
+
+The subsequent parts are optional:
+
+- A generic material spec constrains the item material to one of
+  the hard-coded generic classes, which currently include::
+
+    PLANT WOOD CLOTH SILK LEATHER BONE SHELL SOAP TOOTH HORN PEARL YARN
+    METAL STONE SAND GLASS CLAY MILK
+
+- A specific material spec chooses the material exactly, using the
+  raw syntax for reaction input materials, e.g. ``INORGANIC:IRON``,
+  although for convenience it also allows just ``IRON``, or ``ACACIA:WOOD`` etc.
+  See the link above for more details on the unabbreviated raw syntax.
+
+- A comma-separated list of miscellaneous flags, which currently can
+  be used to ignore imported items or items below a certain quality.
+
+Constraint examples
+-------------------
+Keep metal bolts within 900-1000, and wood/bone within 150-200::
+
+    workflow amount AMMO:ITEM_AMMO_BOLTS/METAL 1000 100
+    workflow amount AMMO:ITEM_AMMO_BOLTS/WOOD,BONE 200 50
+
+Keep the number of prepared food & drink stacks between 90 and 120::
+
+    workflow count FOOD 120 30
+    workflow count DRINK 120 30
+
+Make sure there are always 25-30 empty bins/barrels/bags::
+
+    workflow count BIN 30
+    workflow count BARREL 30
+    workflow count BOX/CLOTH,SILK,YARN 30
+
+Make sure there are always 15-20 coal and 25-30 copper bars::
+
+    workflow count BAR//COAL 20
+    workflow count BAR//COPPER 30
+
+Produce 15-20 gold crafts::
+
+    workflow count CRAFTS//GOLD 20
+
+Collect 15-20 sand bags and clay boulders::
+
+    workflow count POWDER_MISC/SAND 20
+    workflow count BOULDER/CLAY 20
+
+Make sure there are always 80-100 units of dimple dye::
+
+    workflow amount POWDER_MISC//MUSHROOM_CUP_DIMPLE:MILL 100 20
+
+.. note::
+
+  In order for this to work, you have to set the material of the PLANT input
+  on the Mill Plants job to MUSHROOM_CUP_DIMPLE using the `job item-material <job>`
+  command. Otherwise the plugin won't be able to deduce the output material.
+
+Maintain 10-100 locally-made crafts of exceptional quality::
+
+    workflow count CRAFTS///LOCAL,EXCEPTIONAL 100 90
diff --git a/docs/plugins/zone.rst b/docs/plugins/zone.rst
new file mode 100644
index 000000000..a3112c147
--- /dev/null
+++ b/docs/plugins/zone.rst
@@ -0,0 +1,130 @@
+zone
+====
+Helps a bit with managing activity zones (pens, pastures and pits) and cages.
+
+:dfhack-keybind:`zone`
+
+Options:
+
+:set:         Set zone or cage under cursor as default for future assigns.
+:assign:      Assign unit(s) to the pen or pit marked with the 'set' command.
+              If no filters are set a unit must be selected in the in-game ui.
+              Can also be followed by a valid zone id which will be set
+              instead.
+:unassign:    Unassign selected creature from it's zone.
+:nick:        Mass-assign nicknames, must be followed by the name you want
+              to set.
+:remnick:     Mass-remove nicknames.
+:enumnick:    Assign enumerated nicknames (e.g. "Hen 1", "Hen 2"...). Must be
+              followed by the prefix to use in nicknames.
+:tocages:     Assign unit(s) to cages inside a pasture.
+:uinfo:       Print info about unit(s). If no filters are set a unit must
+              be selected in the in-game ui.
+:zinfo:       Print info about zone(s). If no filters are set zones under
+              the cursor are listed.
+:verbose:     Print some more info.
+:filters:     Print list of valid filter options.
+:examples:    Print some usage examples.
+:not:         Negates the next filter keyword.
+
+Filters:
+
+:all:           Process all units (to be used with additional filters).
+:count:         Must be followed by a number. Process only n units (to be used
+                with additional filters).
+:unassigned:    Not assigned to zone, chain or built cage.
+:minage:        Minimum age. Must be followed by number.
+:maxage:        Maximum age. Must be followed by number.
+:race:          Must be followed by a race RAW ID (e.g. BIRD_TURKEY, ALPACA,
+                etc). Negatable.
+:caged:         In a built cage. Negatable.
+:own:           From own civilization. Negatable.
+:merchant:      Is a merchant / belongs to a merchant. Should only be used for
+                pitting, not for stealing animals (slaughter should work).
+:war:           Trained war creature. Negatable.
+:hunting:       Trained hunting creature. Negatable.
+:tamed:         Creature is tame. Negatable.
+:trained:       Creature is trained. Finds war/hunting creatures as well as
+                creatures who have a training level greater than 'domesticated'.
+                If you want to specifically search for war/hunting creatures use
+                'war' or 'hunting' Negatable.
+:trainablewar:  Creature can be trained for war (and is not already trained for
+                war/hunt). Negatable.
+:trainablehunt: Creature can be trained for hunting (and is not already trained
+                for war/hunt). Negatable.
+:male:          Creature is male. Negatable.
+:female:        Creature is female. Negatable.
+:egglayer:      Race lays eggs. Negatable.
+:grazer:        Race is a grazer. Negatable.
+:milkable:      Race is milkable. Negatable.
+
+Usage with single units
+-----------------------
+One convenient way to use the zone tool is to bind the command 'zone assign' to
+a hotkey, maybe also the command 'zone set'. Place the in-game cursor over
+a pen/pasture or pit, use 'zone set' to mark it. Then you can select units
+on the map (in 'v' or 'k' mode), in the unit list or from inside cages
+and use 'zone assign' to assign them to their new home. Allows pitting your
+own dwarves, by the way.
+
+Usage with filters
+------------------
+All filters can be used together with the 'assign' command.
+
+Restrictions: It's not possible to assign units who are inside built cages
+or chained because in most cases that won't be desirable anyways.
+It's not possible to cage owned pets because in that case the owner
+uncages them after a while which results in infinite hauling back and forth.
+
+Usually you should always use the filter 'own' (which implies tame) unless you
+want to use the zone tool for pitting hostiles. 'own' ignores own dwarves unless
+you specify 'race DWARF' (so it's safe to use 'assign all own' to one big
+pasture if you want to have all your animals at the same place). 'egglayer' and
+'milkable' should be used together with 'female' unless you have a mod with
+egg-laying male elves who give milk or whatever. Merchants and their animals are
+ignored unless you specify 'merchant' (pitting them should be no problem,
+but stealing and pasturing their animals is not a good idea since currently they
+are not properly added to your own stocks; slaughtering them should work).
+
+Most filters can be negated (e.g. 'not grazer' -> race is not a grazer).
+
+Mass-renaming
+-------------
+Using the 'nick' command you can set the same nickname for multiple units.
+If used without 'assign', 'all' or 'count' it will rename all units in the
+current default target zone. Combined with 'assign', 'all' or 'count' (and
+further optional filters) it will rename units matching the filter conditions.
+
+Cage zones
+----------
+Using the 'tocages' command you can assign units to a set of cages, for example
+a room next to your butcher shop(s). They will be spread evenly among available
+cages to optimize hauling to and butchering from them. For this to work you need
+to build cages and then place one pen/pasture activity zone above them, covering
+all cages you want to use. Then use 'zone set' (like with 'assign') and use
+'zone tocages filter1 filter2 ...'. 'tocages' overwrites 'assign' because it
+would make no sense, but can be used together with 'nick' or 'remnick' and all
+the usual filters.
+
+Examples
+--------
+``zone assign all own ALPACA minage 3 maxage 10``
+   Assign all own alpacas who are between 3 and 10 years old to the selected
+   pasture.
+``zone assign all own caged grazer nick ineedgrass``
+   Assign all own grazers who are sitting in cages on stockpiles (e.g. after
+   buying them from merchants) to the selected pasture and give them
+   the nickname 'ineedgrass'.
+``zone assign all own not grazer not race CAT``
+   Assign all own animals who are not grazers, excluding cats.
+``zone assign count 5 own female milkable``
+   Assign up to 5 own female milkable creatures to the selected pasture.
+``zone assign all own race DWARF maxage 2``
+   Throw all useless kids into a pit :)
+``zone nick donttouchme``
+   Nicknames all units in the current default zone or cage to 'donttouchme'.
+   Mostly intended to be used for special pastures or cages which are not marked
+   as rooms you want to protect from autobutcher.
+``zone tocages count 50 own tame male not grazer``
+   Stuff up to 50 owned tame male animals who are not grazers into cages built
+   on the current default zone.

From a58b56abc4a0f0197eb6378b201de9044c49b7f5 Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Sat, 9 Jul 2022 23:16:40 -0700
Subject: [PATCH 186/854] don't error out if files cannot be read

---
 library/lua/helpdb.lua | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/library/lua/helpdb.lua b/library/lua/helpdb.lua
index e72f0804d..83a281884 100644
--- a/library/lua/helpdb.lua
+++ b/library/lua/helpdb.lua
@@ -206,8 +206,10 @@ local function make_script_entry(old_entry, entry_name, script_source_path)
     end
     local entry = make_default_entry(entry_name, {[ENTRY_TYPES.COMMAND]=true},
                     HELP_SOURCES.SCRIPT, source_timestamp, script_source_path)
+    local ok, lines = pcall(io.lines, script_source_path)
+    if not ok then return entry end
     local is_rb = script_source_path:endswith('.rb')
-    update_entry(entry, io.lines(script_source_path),
+    update_entry(entry, lines,
             {begin_marker=(is_rb and SCRIPT_DOC_BEGIN_RUBY or SCRIPT_DOC_BEGIN),
              end_marker=(is_rb and SCRIPT_DOC_BEGIN_RUBY or SCRIPT_DOC_END),
              first_line_is_short_help=true})
@@ -343,7 +345,9 @@ end
 -- to tag_index, initizlizing each entry with an empty list.
 local function initialize_tags()
     local tag, desc, in_desc = nil, nil, false
-    for line in io.lines(TAG_DEFINITIONS) do
+    local ok, lines = pcall(io.lines, TAG_DEFINITIONS)
+    if not ok then return end
+    for line in lines do
         if in_desc then
             line = line:trim()
             if #line == 0 then

From 12557f8dc14b77ab86f42e448ab8c1c065bb9560 Mon Sep 17 00:00:00 2001
From: "pre-commit-ci[bot]"
 <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Date: Sun, 10 Jul 2022 06:47:15 +0000
Subject: [PATCH 187/854] [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci
---
 docs/plugins/diggingInvaders.rst | 1 -
 docs/plugins/stocks.rst          | 1 -
 2 files changed, 2 deletions(-)

diff --git a/docs/plugins/diggingInvaders.rst b/docs/plugins/diggingInvaders.rst
index 0557225fb..09a22c07a 100644
--- a/docs/plugins/diggingInvaders.rst
+++ b/docs/plugins/diggingInvaders.rst
@@ -26,4 +26,3 @@ Action                         Cost    Delay  Notes
 ``destroyRoughConstruction``   1,000   1,000  constructions made from boulders
 ``destroySmoothConstruction``  100     100    constructions made from blocks or bars
 ============================== ======= ====== =================================
-
diff --git a/docs/plugins/stocks.rst b/docs/plugins/stocks.rst
index cbfbce978..404c96a6d 100644
--- a/docs/plugins/stocks.rst
+++ b/docs/plugins/stocks.rst
@@ -3,4 +3,3 @@ stocks
 Replaces the DF stocks screen with an improved version.
 
 :dfhack-keybind:`stocks`
-

From fdd406b7220d6c2086a959a2c6cd69a5c7858644 Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Sat, 9 Jul 2022 23:58:11 -0700
Subject: [PATCH 188/854] ensure all files are reread on every docs build

this fixes the issue where the Stonesense docs were getting ignored
---
 CMakeLists.txt | 4 ++--
 conf.py        | 2 +-
 docs/build.sh  | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 46bd1917b..a076bbc76 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -478,13 +478,13 @@ if(BUILD_DOCS)
     set_source_files_properties(${SPHINX_OUTPUT} PROPERTIES GENERATED TRUE)
     add_custom_command(OUTPUT ${SPHINX_OUTPUT}
         COMMAND ${SPHINX_EXECUTABLE}
-            -q -b html -d "${CMAKE_BINARY_DIR}/docs/html"
+            -E -q -b html -d "${CMAKE_BINARY_DIR}/docs/html"
             "${CMAKE_CURRENT_SOURCE_DIR}"
             "${CMAKE_CURRENT_SOURCE_DIR}/docs/html"
             -w "${CMAKE_BINARY_DIR}/docs/html/_sphinx-warnings.txt"
             -j auto
         COMMAND ${SPHINX_EXECUTABLE}
-            -q -b text -d "${CMAKE_BINARY_DIR}/docs/text"
+            -E -q -b text -d "${CMAKE_BINARY_DIR}/docs/text"
             "${CMAKE_CURRENT_SOURCE_DIR}"
             "${CMAKE_CURRENT_SOURCE_DIR}/docs/text"
             -w "${CMAKE_BINARY_DIR}/docs/text/_sphinx-warnings.txt"
diff --git a/conf.py b/conf.py
index d7be99a15..530a7a312 100644
--- a/conf.py
+++ b/conf.py
@@ -140,7 +140,7 @@ def write_tool_docs():
         os.makedirs(os.path.join('docs/tools', os.path.dirname(k[0])),
                     mode=0o755, exist_ok=True)
         with open('docs/tools/{}.rst'.format(k[0]), mode) as outfile:
-            if k[0] != 'search':
+            if k[0] != 'search' and k[0] != 'stonesense':
                 outfile.write(label)
             outfile.write(include)
 
diff --git a/docs/build.sh b/docs/build.sh
index c696d5fbe..28182d9c0 100755
--- a/docs/build.sh
+++ b/docs/build.sh
@@ -11,5 +11,5 @@
 cd $(dirname "$0")
 cd ..
 
-"${SPHINX:-sphinx-build}" -b html -d build/docs/html . docs/html -w build/docs/html/_sphinx-warnings.txt -j "${JOBS:-auto}" "$@"
-"${SPHINX:-sphinx-build}" -b text -d build/docs/text . docs/text -w build/docs/text/_sphinx-warnings.txt -j "${JOBS:-auto}" "$@"
+"${SPHINX:-sphinx-build}" -E -b html -d build/docs/html . docs/html -w build/docs/html/_sphinx-warnings.txt -j "${JOBS:-auto}" "$@"
+"${SPHINX:-sphinx-build}" -E -b text -d build/docs/text . docs/text -w build/docs/text/_sphinx-warnings.txt -j "${JOBS:-auto}" "$@"

From 4ed15ffcc4032dec4b31def7d02ad8e100c91d5a Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Sun, 10 Jul 2022 20:48:24 -0700
Subject: [PATCH 189/854] fix parsing of first line as the short_help

---
 library/lua/helpdb.lua | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/library/lua/helpdb.lua b/library/lua/helpdb.lua
index 83a281884..a145ab5f7 100644
--- a/library/lua/helpdb.lua
+++ b/library/lua/helpdb.lua
@@ -92,9 +92,10 @@ end
 --   end_marker (string that marks the end of the help text; text will stop
 --               being parsed after this marker is seen)
 --   no_header (don't try to find the entity name at the top of the help text)
---   first_line_is_short_help (read the short help text from the first commented
---                             line of the script instead of using the first
---                             sentence of the long help text)
+--   first_line_is_short_help (if set, then read the short help text from the
+--                             first commented line of the script instead of
+--                             using the first sentence of the long help text.
+--                             value is the comment character.)
 local function update_entry(entry, iterator, opts)
     opts = opts or {}
     local lines = {}
@@ -104,7 +105,7 @@ local function update_entry(entry, iterator, opts)
     for line in iterator do
         if not short_help_found and first_line_is_short_help then
             line = line:trim()
-            local _,_,text = line:find('^%-%-%s*(.*)') or line:find('^#%s*(.*)')
+            local _,_,text = line:find('^'..first_line_is_short_help..'%s*(.*)')
             if not text then
                 -- if no first-line short help found, fall back to getting the
                 -- first sentence of the help text.
@@ -212,7 +213,7 @@ local function make_script_entry(old_entry, entry_name, script_source_path)
     update_entry(entry, lines,
             {begin_marker=(is_rb and SCRIPT_DOC_BEGIN_RUBY or SCRIPT_DOC_BEGIN),
              end_marker=(is_rb and SCRIPT_DOC_BEGIN_RUBY or SCRIPT_DOC_END),
-             first_line_is_short_help=true})
+             first_line_is_short_help=(is_rb and '#' or '%-%-')})
     return entry
 end
 

From f670ef4b60a694f565745076df6d862cb8d6838e Mon Sep 17 00:00:00 2001
From: Tachytaenius <henryfthomson@gmail.com>
Date: Mon, 11 Jul 2022 18:24:07 +0100
Subject: [PATCH 190/854] Add custom raw tokens link and add prefix to custom
 raw tokens in raws

---
 docs/guides/modding-guide.rst | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/docs/guides/modding-guide.rst b/docs/guides/modding-guide.rst
index 15e96599d..ea7ae9eb7 100644
--- a/docs/guides/modding-guide.rst
+++ b/docs/guides/modding-guide.rst
@@ -101,7 +101,7 @@ Check the full list of events at https://docs.dfhack.org/en/stable/docs/Lua%20AP
 Custom raw tokens
 -----------------
 
-In this section, we are going to use custom raw tokens applied to a reaction to transfer the material of a reagent to a product as a handle improvement (like on artifact buckets), and then we are going to see how you could make boots that make units go faster when worn. Both of these involve custom raw tokens.
+In this section, we are going to use `custom raw tokens <_custom-raw-tokens>` applied to a reaction to transfer the material of a reagent to a product as a handle improvement (like on artifact buckets), and then we are going to see how you could make boots that make units go faster when worn. Both of these involve custom raw tokens.
 
 First, let's define a custom crossbow with its own custom reaction. The crossbow: ::
 
@@ -117,7 +117,7 @@ First, let's define a custom crossbow with its own custom reaction. The crossbow
         [MATERIAL_SIZE:4]
         [ATTACK:BLUNT:10000:4000:bash:bashes:NO_SUB:1250]
             [ATTACK_PREPARE_AND_RECOVER:3:3]
-        [FIRE_RATE_MULTIPLIER:2] custom token (you'll see)
+        [TUTORIAL_MOD_FIRE_RATE_MULTIPLIER:2] custom token (you'll see)
 
 The reaction to make it (you would add the reaction and not the weapon to an entity raw): ::
 
@@ -132,7 +132,7 @@ The reaction to make it (you would add the reaction and not the weapon to an ent
             [ANY_PLANT_MATERIAL]
         [REAGENT:handle 2:1:BLOCKS:NONE:NONE:NONE]
             [ANY_PLANT_MATERIAL]
-        [TRANSFER_HANDLE_MATERIAL_TO_PRODUCT_IMPROVEMENT:1] another custom token
+        [TUTORIAL_MOD_TRANSFER_HANDLE_MATERIAL_TO_PRODUCT_IMPROVEMENT:1] another custom token
         [PRODUCT:100:1:WEAPON:ITEM_WEAPON_CROSSBOW_SIEGE:GET_MATERIAL_FROM_REAGENT:bar:NONE]
 
 So, we are going to use the ``eventful`` module to make it so that (after the script is run) when this crossbow is crafted, it will have two handles, each with the material given by the block reagents.
@@ -149,7 +149,9 @@ Now, let's make a callback: ::
 
 First, we check to see if it the reaction that just happened is relevant to this callback: ::
 
-    if not customRawTokens.getToken(reaction, "TRANSFER_HANDLE_MATERIAL_TO_PRODUCT_IMPROVEMENT") then return end
+    if not customRawTokens.getToken(reaction, "TUTORIAL_MOD_TRANSFER_HANDLE_MATERIAL_TO_PRODUCT_IMPROVEMENT") then
+        return
+    end
 
 Then, we get the product number listed. Next, for every reagent, if the reagent name starts with "handle" then we get the corresponding item, and... ::
 
@@ -186,7 +188,7 @@ Let's also make some code to modify the fire rate of the siege crossbow. ::
             return
         end
 
-        local multiplier = tonumber(customRawTokens.getToken(weapon.subtype, "FIRE_RATE_MULTIPLIER")) or 1
+        local multiplier = tonumber(customRawTokens.getToken(weapon.subtype, "TUTORIAL_MOD_FIRE_RATE_MULTIPLIER")) or 1
         firer.counters.think_counter = math.floor(firer.counters.think_counter * multiplier)
     end
 

From aa8809833b4048ca2a8d4d0f5489058db67309f7 Mon Sep 17 00:00:00 2001
From: Tachytaenius <henryfthomson@gmail.com>
Date: Mon, 11 Jul 2022 18:56:28 +0100
Subject: [PATCH 191/854] Do the "running shoes" TODO

---
 docs/guides/modding-guide.rst | 35 ++++++++++++++++++++++++++++++++++-
 1 file changed, 34 insertions(+), 1 deletion(-)

diff --git a/docs/guides/modding-guide.rst b/docs/guides/modding-guide.rst
index ea7ae9eb7..5cafba37d 100644
--- a/docs/guides/modding-guide.rst
+++ b/docs/guides/modding-guide.rst
@@ -192,7 +192,40 @@ Let's also make some code to modify the fire rate of the siege crossbow. ::
         firer.counters.think_counter = math.floor(firer.counters.think_counter * multiplier)
     end
 
-TODO: "running shoes"
+Now, let's see how we could make some "pegasus boots". First, let's define the item in the raws: ::
+
+[ITEM_SHOES:ITEM_SHOES_BOOTS_PEGASUS]
+    [NAME:pegasus boot:pegasus boots]
+    [ARMORLEVEL:1]
+    [UPSTEP:1]
+    [METAL_ARMOR_LEVELS]
+    [LAYER:OVER]
+    [COVERAGE:100]
+    [LAYER_SIZE:25]
+    [LAYER_PERMIT:15]
+    [MATERIAL_SIZE:2]
+    [METAL]
+    [LEATHER]
+    [HARD]
+    [EXAMPLE_MOD_MOVEMENT_TIMER_REDUCTION_PER_TICK:5] custom raw token (you don't have to say this every time)
+
+Then, let's make a ``repeat-util`` callback for once a tick: ::
+
+    repeatUtil.scheduleEvery(modId, 1, "ticks", function()
+
+Let's iterate over every active unit, and for every unit, initialise a variable for how much we are going to take from their movement timer and iterate over all their worn items: ::
+
+    for _, unit in ipairs(df.global.world.units.active) do
+        local amount = 0
+        for _, entry in ipairs(unit.inventory) do
+
+Now, we will add up the effect of all speed-increasing gear and apply it: ::
+
+        if entry.mode == df.unit_inventory_item.T_mode.Worn then
+            amount = amount + tonumber((customRawTokens.getToken(entry.item, "EXAMPLE_MOD_MOVEMENT_TIMER_REDUCTION_PER_TICK")) or 0)
+        end
+    end
+    dfhack.units.addMoveTimer(-amount) -- Subtract amount from movement timer if currently moving
 
 Your first whole mod
 --------------------

From a5da3c18f9957b26e948e4db3ec87fd2c5dff003 Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Mon, 11 Jul 2022 17:23:23 -0700
Subject: [PATCH 192/854] reset scroll position when the text is changed

---
 library/lua/gui/widgets.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/library/lua/gui/widgets.lua b/library/lua/gui/widgets.lua
index 1a1b4c6fb..d5d94ffd9 100644
--- a/library/lua/gui/widgets.lua
+++ b/library/lua/gui/widgets.lua
@@ -469,7 +469,6 @@ Label.ATTRS{
 }
 
 function Label:init(args)
-    self.start_line_num = 1
     -- use existing saved text if no explicit text was specified. this avoids
     -- overwriting pre-formatted text that subclasses may have already set
     self:setText(args.text or self.text)
@@ -479,6 +478,7 @@ function Label:init(args)
 end
 
 function Label:setText(text)
+    self.start_line_num = 1
     self.text = text
     parse_label_text(self)
 

From 328d839f1938d2cf4623fc6e26db9fada346e354 Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Mon, 11 Jul 2022 17:23:56 -0700
Subject: [PATCH 193/854] support backtick as a keybinding

and bind it to gui/launcher
---
 data/init/dfhack.keybindings.init | 2 ++
 docs/Builtin.rst                  | 4 ++--
 library/Core.cpp                  | 3 +++
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/data/init/dfhack.keybindings.init b/data/init/dfhack.keybindings.init
index e32a7c58e..f38840e06 100644
--- a/data/init/dfhack.keybindings.init
+++ b/data/init/dfhack.keybindings.init
@@ -8,6 +8,8 @@
 # Generic dwarfmode bindings #
 ##############################
 
+keybinding add ` gui/launcher
+
 # show all current key bindings
 keybinding add Ctrl-F1 hotkeys
 keybinding add Alt-F1 hotkeys
diff --git a/docs/Builtin.rst b/docs/Builtin.rst
index 2d938e30f..cf58337bc 100644
--- a/docs/Builtin.rst
+++ b/docs/Builtin.rst
@@ -107,8 +107,8 @@ To set keybindings, use the built-in ``keybinding`` command. Like any other
 command it can be used at any time from the console, but bindings are not
 remembered between runs of the game unless re-created in `dfhack.init`.
 
-Currently, any combinations of Ctrl/Alt/Shift with A-Z, 0-9, or F1-F12 are
-supported.
+Currently, any combinations of Ctrl/Alt/Shift with A-Z, 0-9, F1-F12, or ``\```
+are supported.
 
 Possible ways to call the command:
 
diff --git a/library/Core.cpp b/library/Core.cpp
index 62fe366f1..a4feab742 100644
--- a/library/Core.cpp
+++ b/library/Core.cpp
@@ -2558,6 +2558,9 @@ static bool parseKeySpec(std::string keyspec, int *psym, int *pmod, std::string
     if (keyspec.size() == 1 && keyspec[0] >= 'A' && keyspec[0] <= 'Z') {
         *psym = SDL::K_a + (keyspec[0]-'A');
         return true;
+    } else if (keyspec.size() == 1 && keyspec[0] == '`') {
+        *psym = SDL::K_BACKQUOTE;
+        return true;
     } else if (keyspec.size() == 1 && keyspec[0] >= '0' && keyspec[0] <= '9') {
         *psym = SDL::K_0 + (keyspec[0]-'0');
         return true;

From d68350c1f116cb569fab996f8743fc099b1d8907 Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Mon, 11 Jul 2022 17:24:17 -0700
Subject: [PATCH 194/854] wrap text at 52 characters for in-game display

---
 conf.py | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/conf.py b/conf.py
index 530a7a312..461fa789b 100644
--- a/conf.py
+++ b/conf.py
@@ -363,3 +363,9 @@ latex_documents = [
 ]
 
 latex_toplevel_sectioning = 'part'
+
+# -- Options for text output ---------------------------------------------
+
+from sphinx.writers import text
+
+text.MAXWIDTH = 52

From 185f49976c51e0e689c06f6ae67c789a7c8feb92 Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Mon, 11 Jul 2022 17:24:53 -0700
Subject: [PATCH 195/854] ensure scripts get their entry type set

---
 library/lua/helpdb.lua | 58 +++++++++++++++++++++++++-----------------
 1 file changed, 34 insertions(+), 24 deletions(-)

diff --git a/library/lua/helpdb.lua b/library/lua/helpdb.lua
index a145ab5f7..8856c7ad8 100644
--- a/library/lua/helpdb.lua
+++ b/library/lua/helpdb.lua
@@ -318,6 +318,7 @@ end
 
 -- scan for scripts and add their help to the db
 local function scan_scripts(old_db, db)
+    local entry_types = {[ENTRY_TYPES.COMMAND]=true}
     for _,script_path in ipairs(dfhack.internal.getScriptPaths()) do
         local files = dfhack.filesystem.listdir_recursive(
                                             script_path, nil, false)
@@ -330,12 +331,13 @@ local function scan_scripts(old_db, db)
                 goto continue
             end
             local dot_index = f.path:find('%.[^.]*$')
+            local entry_name = f.path:sub(1, dot_index - 1)
             local script_source = script_path .. '/' .. f.path
             update_db(old_db, db,
-                      has_rendered_help(f.path) and
+                      has_rendered_help(entry_name) and
                             HELP_SOURCES.RENDERED or HELP_SOURCES.SCRIPT,
-                      f.path:sub(1, dot_index - 1),
-                      {script_source=script_source})
+                      entry_name,
+                      {entry_types=entry_types, script_source=script_source})
             ::continue::
         end
         ::skip_path::
@@ -388,6 +390,33 @@ end
 -- get API
 ---------------------------------------------------------------------------
 
+-- converts strings into single-element lists containing that string
+local function normalize_string_list(l)
+    if not l or #l == 0 then return nil end
+    if type(l) == 'string' then
+        return {l}
+    end
+    return l
+end
+
+local function has_keys(str, dict)
+    if not str or #str == 0 then
+        return false
+    end
+    ensure_db()
+    for _,s in ipairs(normalize_string_list(str)) do
+        if not dict[s] then
+            return false
+        end
+    end
+    return true
+end
+
+-- returns whether the given string (or list of strings) is an entry in the db
+function is_entry(str)
+    return has_keys(str, db)
+end
+
 local function get_db_property(entry_name, property)
     ensure_db()
     if not db[entry_name] then
@@ -420,19 +449,9 @@ function get_entry_tags(entry)
     return set_to_sorted_list(get_db_property(entry, 'tags'))
 end
 
--- returns whether the given string matches a tag name
+-- returns whether the given string (or list of strings) matches a tag name
 function is_tag(str)
-    if not str or #str == 0 then
-        return false
-    end
-    ensure_db()
-    if type(str) == "string" then str = {str} end
-    for _,s in ipairs(str) do
-        if not tag_index[s] then
-            return false
-        end
-    end
-    return true
+    return has_keys(str, tag_index)
 end
 
 -- returns the defined tags in alphabetical order
@@ -524,15 +543,6 @@ local function matches(entry_name, filter)
     return true
 end
 
--- converts strings into single-element lists containing that string
-local function normalize_string_list(l)
-    if not l or #l == 0 then return nil end
-    if type(l) == 'string' then
-        return {l}
-    end
-    return l
-end
-
 -- normalizes the lists in the filter and returns nil if no filter elements are
 -- populated
 local function normalize_filter(f)

From c9cffc7da92e25bf9a1032e18a81eb000aac8f73 Mon Sep 17 00:00:00 2001
From: Tachytaenius <henryfthomson@gmail.com>
Date: Tue, 12 Jul 2022 11:26:49 +0100
Subject: [PATCH 196/854] Fix docs bugs

---
 docs/guides/modding-guide.rst | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/docs/guides/modding-guide.rst b/docs/guides/modding-guide.rst
index 5cafba37d..990c0ce96 100644
--- a/docs/guides/modding-guide.rst
+++ b/docs/guides/modding-guide.rst
@@ -101,7 +101,7 @@ Check the full list of events at https://docs.dfhack.org/en/stable/docs/Lua%20AP
 Custom raw tokens
 -----------------
 
-In this section, we are going to use `custom raw tokens <_custom-raw-tokens>` applied to a reaction to transfer the material of a reagent to a product as a handle improvement (like on artifact buckets), and then we are going to see how you could make boots that make units go faster when worn. Both of these involve custom raw tokens.
+In this section, we are going to use `custom raw tokens <custom-raw-tokens>` applied to a reaction to transfer the material of a reagent to a product as a handle improvement (like on artifact buckets), and then we are going to see how you could make boots that make units go faster when worn. Both of these involve custom raw tokens.
 
 First, let's define a custom crossbow with its own custom reaction. The crossbow: ::
 
@@ -194,20 +194,20 @@ Let's also make some code to modify the fire rate of the siege crossbow. ::
 
 Now, let's see how we could make some "pegasus boots". First, let's define the item in the raws: ::
 
-[ITEM_SHOES:ITEM_SHOES_BOOTS_PEGASUS]
-    [NAME:pegasus boot:pegasus boots]
-    [ARMORLEVEL:1]
-    [UPSTEP:1]
-    [METAL_ARMOR_LEVELS]
-    [LAYER:OVER]
-    [COVERAGE:100]
-    [LAYER_SIZE:25]
-    [LAYER_PERMIT:15]
-    [MATERIAL_SIZE:2]
-    [METAL]
-    [LEATHER]
-    [HARD]
-    [EXAMPLE_MOD_MOVEMENT_TIMER_REDUCTION_PER_TICK:5] custom raw token (you don't have to say this every time)
+    [ITEM_SHOES:ITEM_SHOES_BOOTS_PEGASUS]
+        [NAME:pegasus boot:pegasus boots]
+        [ARMORLEVEL:1]
+        [UPSTEP:1]
+        [METAL_ARMOR_LEVELS]
+        [LAYER:OVER]
+        [COVERAGE:100]
+        [LAYER_SIZE:25]
+        [LAYER_PERMIT:15]
+        [MATERIAL_SIZE:2]
+        [METAL]
+        [LEATHER]
+        [HARD]
+        [EXAMPLE_MOD_MOVEMENT_TIMER_REDUCTION_PER_TICK:5] custom raw token (you don't have to say this every time)
 
 Then, let's make a ``repeat-util`` callback for once a tick: ::
 

From f021dd0e0a468204f08808a8b0d63a9b66647ad7 Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Tue, 12 Jul 2022 11:25:16 -0400
Subject: [PATCH 197/854] Gui::getAnyItem(): add support for
 viewscreen_treasurelistst

---
 docs/changelog.txt      | 1 +
 library/modules/Gui.cpp | 8 ++++++++
 2 files changed, 9 insertions(+)

diff --git a/docs/changelog.txt b/docs/changelog.txt
index 9bc714e48..447f2f22e 100644
--- a/docs/changelog.txt
+++ b/docs/changelog.txt
@@ -56,6 +56,7 @@ changelog.txt uses a syntax similar to RST, with a few special sequences:
 - Removed ``Notes`` module (C++-only). Access ``ui.waypoints.points`` directly instead.
 - Removed ``Windows`` module (C++-only) - unused.
 - ``Constructions`` module (C++-only): removed ``t_construction``, ``isValid()``, ``getCount()``, ``getConstruction()``, and ``copyConstruction()``. Access ``world.constructions`` directly instead.
+- ``Gui::getSelectedItem()``, ``Gui::getAnyItem()``: added support for the artifacts screen
 
 ## Lua
 - ``tile-material``: fix the order of declarations. The ``GetTileMat`` function now returns the material as intended (always returned nil before). Also changed the license info, with permission of the original author.
diff --git a/library/modules/Gui.cpp b/library/modules/Gui.cpp
index 963b2ecd6..fc78bb57d 100644
--- a/library/modules/Gui.cpp
+++ b/library/modules/Gui.cpp
@@ -106,6 +106,7 @@ using namespace DFHack;
 #include "df/viewscreen_unitlistst.h"
 #include "df/viewscreen_unitst.h"
 #include "df/viewscreen_reportlistst.h"
+#include "df/viewscreen_treasurelistst.h"
 #include "df/viewscreen_workquota_conditionst.h"
 #include "df/viewscreen_workshop_profilest.h"
 #include "df/world.h"
@@ -1181,6 +1182,13 @@ df::item *Gui::getAnyItem(df::viewscreen *top)
         return NULL;
     }
 
+    if (VIRTUAL_CAST_VAR(screen, df::viewscreen_treasurelistst, top))
+    {
+        if (world)
+            return vector_get(world->items.other[df::items_other_id::ANY_ARTIFACT], screen->sel_idx);
+        return NULL;
+    }
+
     if (auto dfscreen = dfhack_viewscreen::try_cast(top))
         return dfscreen->getSelectedItem();
 

From c39e2fe2cbf88a2e88552f7b09f2bdc28d199dca Mon Sep 17 00:00:00 2001
From: Tachytaenius <henryfthomson@gmail.com>
Date: Wed, 13 Jul 2022 22:42:35 +0100
Subject: [PATCH 198/854] Mod structure

---
 docs/guides/modding-guide.rst | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/docs/guides/modding-guide.rst b/docs/guides/modding-guide.rst
index 990c0ce96..abc5e5e01 100644
--- a/docs/guides/modding-guide.rst
+++ b/docs/guides/modding-guide.rst
@@ -232,4 +232,15 @@ Your first whole mod
 
 Now, you may have noticed that you won't be able to run multiple functions on tick/as event callbacks with that ``modId`` idea alone. To solve that we can just define all the functions we want and call them from a single function.
 
-TODO
+Create a folder for mod projects within your Dwarf Fortress directory somewhere (e.g. ``hack/my-scripts/mods/``) and use your mod ID (in hyphen-case) as the name for the mod folders within it. The structure of and environment for fully-functioning modular mods are as follows:
+
+* The main content of the mod would be in the ``raw`` folder:
+
+  * A Lua file in ``raw/init.d/`` to initialise the mod by calling ``your-mod-id/main/ enable``.
+  * Raw content (potentially with custom raw tokens) in ``raw/objects/``.
+  * A subfolder for your mod in ``raw/scripts/`` containing a ``main.lua`` file (an example of which we will see) and all the modules containing the functions used in callbacks to ``repeat-util`` and ``eventful``. Potentially a file containing constant definitions used by your mod (perhaps defined by the game) too.
+
+* Using git within each mod folder is recommended, but not required.
+* A ``readme.mkd`` markdown file is also recommended.
+* An ``addToEntity.txt`` file containing lines to add to entity definitions for access to mod content would be needed if applicable.
+* Unless you want to merge your ``raw`` folder with your worlds every time you make a change to your scripts, you should add ``path/to/your-mod/raw/scripts/`` to your script paths.

From 9c04a28bd96503e4a2ff1b2e52745b7326f5a4ff Mon Sep 17 00:00:00 2001
From: Tachytaenius <henryfthomson@gmail.com>
Date: Wed, 13 Jul 2022 22:43:01 +0100
Subject: [PATCH 199/854] Shouldn't've replaced the TODO

---
 docs/guides/modding-guide.rst | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docs/guides/modding-guide.rst b/docs/guides/modding-guide.rst
index abc5e5e01..d52607798 100644
--- a/docs/guides/modding-guide.rst
+++ b/docs/guides/modding-guide.rst
@@ -244,3 +244,5 @@ Create a folder for mod projects within your Dwarf Fortress directory somewhere
 * A ``readme.mkd`` markdown file is also recommended.
 * An ``addToEntity.txt`` file containing lines to add to entity definitions for access to mod content would be needed if applicable.
 * Unless you want to merge your ``raw`` folder with your worlds every time you make a change to your scripts, you should add ``path/to/your-mod/raw/scripts/`` to your script paths.
+
+TODO

From d7976e63b60ab3664485f7b16b9c8101a8d8e654 Mon Sep 17 00:00:00 2001
From: Tachytaenius <henryfthomson@gmail.com>
Date: Wed, 13 Jul 2022 22:44:38 +0100
Subject: [PATCH 200/854] const example. also, (preemptively acquiescing)
 readme.mkd --> readme.md

---
 docs/guides/modding-guide.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/guides/modding-guide.rst b/docs/guides/modding-guide.rst
index d52607798..033ddc731 100644
--- a/docs/guides/modding-guide.rst
+++ b/docs/guides/modding-guide.rst
@@ -238,10 +238,10 @@ Create a folder for mod projects within your Dwarf Fortress directory somewhere
 
   * A Lua file in ``raw/init.d/`` to initialise the mod by calling ``your-mod-id/main/ enable``.
   * Raw content (potentially with custom raw tokens) in ``raw/objects/``.
-  * A subfolder for your mod in ``raw/scripts/`` containing a ``main.lua`` file (an example of which we will see) and all the modules containing the functions used in callbacks to ``repeat-util`` and ``eventful``. Potentially a file containing constant definitions used by your mod (perhaps defined by the game) too.
+  * A subfolder for your mod in ``raw/scripts/`` containing a ``main.lua`` file (an example of which we will see) and all the modules containing the functions used in callbacks to ``repeat-util`` and ``eventful``. Potentially a file containing constant definitions used by your mod (perhaps defined by the game, like the acceleration of parabolic projectiles due to gravity (``4900``)) too.
 
 * Using git within each mod folder is recommended, but not required.
-* A ``readme.mkd`` markdown file is also recommended.
+* A ``readme.md`` markdown file is also recommended.
 * An ``addToEntity.txt`` file containing lines to add to entity definitions for access to mod content would be needed if applicable.
 * Unless you want to merge your ``raw`` folder with your worlds every time you make a change to your scripts, you should add ``path/to/your-mod/raw/scripts/`` to your script paths.
 

From a996b29cf5845024ac50dacb7c35c097c28abcda Mon Sep 17 00:00:00 2001
From: Tachytaenius <henryfthomson@gmail.com>
Date: Thu, 14 Jul 2022 11:10:23 +0100
Subject: [PATCH 201/854] Some editing of mod guide

---
 docs/guides/modding-guide.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/guides/modding-guide.rst b/docs/guides/modding-guide.rst
index 033ddc731..6b18188a0 100644
--- a/docs/guides/modding-guide.rst
+++ b/docs/guides/modding-guide.rst
@@ -230,9 +230,9 @@ Now, we will add up the effect of all speed-increasing gear and apply it: ::
 Your first whole mod
 --------------------
 
-Now, you may have noticed that you won't be able to run multiple functions on tick/as event callbacks with that ``modId`` idea alone. To solve that we can just define all the functions we want and call them from a single function.
+Now, you may have noticed that you won't be able to run multiple functions on tick/as event callbacks with that ``modId`` idea alone. To solve that we can just define all the functions we want and call them from a single function. Alternatively you can create multiple callbacks with your mod ID being a prefix, though this way there is no guarantee about the order if that is important.
 
-Create a folder for mod projects within your Dwarf Fortress directory somewhere (e.g. ``hack/my-scripts/mods/``) and use your mod ID (in hyphen-case) as the name for the mod folders within it. The structure of and environment for fully-functioning modular mods are as follows:
+Create a folder for mod projects somewhere (e.g. ``hack/my-scripts/mods/``, or maybe somewhere outside your Dwarf Fortress installation) and use your mod ID (in hyphen-case) as the name for the mod folders within it. The structure of and environment for fully-functioning modular mods are as follows:
 
 * The main content of the mod would be in the ``raw`` folder:
 

From d06a63e4dc583732f70bce03945f6da20d1e4e6d Mon Sep 17 00:00:00 2001
From: Tachytaenius <henryfthomson@gmail.com>
Date: Thu, 14 Jul 2022 11:11:50 +0100
Subject: [PATCH 202/854] DFStructs (a nickname?) --> df-structures

---
 docs/guides/modding-guide.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/guides/modding-guide.rst b/docs/guides/modding-guide.rst
index 6b18188a0..1badad2dd 100644
--- a/docs/guides/modding-guide.rst
+++ b/docs/guides/modding-guide.rst
@@ -55,8 +55,8 @@ Now, the field ``sex`` in a unit is an integer, but each integer corresponds to
 
 Simple. Save this as a Lua file in your own scripts directory and run it as shown before when focused on a unit one way or another.
 
-Getting used to gm-editor and DFStructs exploration
----------------------------------------------------
+Getting used to gm-editor and df-structures exploration
+-------------------------------------------------------
 
 So how could you have known about the field and type we just used? Well, there are two main tools for discovering the various fields in the game's data structures. The first is the ``df-structures`` repository (at https://github.com/DFHack/df-structures) that contains XML files denoting the contents of the game's structures. The second is the script ``gui/gm-editor`` which is an interactive data explorer. You can run the script while objects like units are selected to view the data within them. You can also pass ``scr`` as an argument to the script to view the data for the current screen. Press ? while the script is active to view help.
 

From 3f848b8836ef8eeb6cc720c298539b2e62696998 Mon Sep 17 00:00:00 2001
From: Tachytaenius <henryfthomson@gmail.com>
Date: Thu, 14 Jul 2022 17:46:12 +0100
Subject: [PATCH 203/854] Misc minor changes to modding guide

---
 docs/guides/modding-guide.rst | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/docs/guides/modding-guide.rst b/docs/guides/modding-guide.rst
index 1badad2dd..d0c9cb398 100644
--- a/docs/guides/modding-guide.rst
+++ b/docs/guides/modding-guide.rst
@@ -22,7 +22,7 @@ Scripts can be run from a world's ``raw/scripts/`` directory, and (configurably)
 
 A script is run by writing its path and name from a script path folder without the file extension into a DFHack command prompt (in-game or the external one). E.g. ``gui/gm-editor`` for ``hack/scripts/gui/gm-editor.lua``.
 
-You can make all your scripts in ``hack/scripts/``, but this is not recommended as it makes things much harder to maintain each update. It's recommended to make a folder with a name like "own-scripts" and add it to ``dfhack-config/script-paths.txt``. You should also make a folder for external installed scripts from the internet that are not in ``hack/scripts/``. You can prepend your script paths entries with a ``+`` so that they take precedence over other folders.
+You can make all your scripts in ``hack/scripts/``, but this is not recommended as it makes things much harder to maintain each update. It's recommended to make a folder with a name like ``own-scripts`` and add it to ``dfhack-config/script-paths.txt``. You could also make a folder for external installed scripts from the internet that are not in ``hack/scripts/``. You can prepend your script paths entries with a ``+`` so that they take precedence over other folders.
 
 If your mod is installed into ``raw/scripts/`` be aware that the copies of the scripts in ``data/save/*/raw/`` are checked first and will run instead of any changes you make to an in-development copy outside of a raw folder.
 
@@ -75,13 +75,13 @@ First, we load the module: ::
 
 Both ``repeat-util`` and ``eventful`` require keys for registered callbacks. It's recommended to use something like a mod id. ::
 
-    local modId = "my-test-mod"
+    local modId = "callback-example-mod"
 
 Then, we pass the key, amount of time units between function calls, what the time units are, and finally the callback function itself: ::
 
     repeatUtil.scheduleEvery(modId, 1, "ticks", function()
-        -- Do something like iterating over all units
-        for _, unit in ipairs(df.global.world.units.all) do
+        -- Do something like iterating over all active units
+        for _, unit in ipairs(df.global.world.units.active) do
             print(unit.id)
         end
     end)
@@ -117,7 +117,7 @@ First, let's define a custom crossbow with its own custom reaction. The crossbow
         [MATERIAL_SIZE:4]
         [ATTACK:BLUNT:10000:4000:bash:bashes:NO_SUB:1250]
             [ATTACK_PREPARE_AND_RECOVER:3:3]
-        [TUTORIAL_MOD_FIRE_RATE_MULTIPLIER:2] custom token (you'll see)
+        [SIEGE_CROSSBOW_MOD_FIRE_RATE_MULTIPLIER:2] custom token (you'll see)
 
 The reaction to make it (you would add the reaction and not the weapon to an entity raw): ::
 
@@ -132,7 +132,7 @@ The reaction to make it (you would add the reaction and not the weapon to an ent
             [ANY_PLANT_MATERIAL]
         [REAGENT:handle 2:1:BLOCKS:NONE:NONE:NONE]
             [ANY_PLANT_MATERIAL]
-        [TUTORIAL_MOD_TRANSFER_HANDLE_MATERIAL_TO_PRODUCT_IMPROVEMENT:1] another custom token
+        [SIEGE_CROSSBOW_MOD_TRANSFER_HANDLE_MATERIAL_TO_PRODUCT_IMPROVEMENT:1] another custom token
         [PRODUCT:100:1:WEAPON:ITEM_WEAPON_CROSSBOW_SIEGE:GET_MATERIAL_FROM_REAGENT:bar:NONE]
 
 So, we are going to use the ``eventful`` module to make it so that (after the script is run) when this crossbow is crafted, it will have two handles, each with the material given by the block reagents.
@@ -144,12 +144,12 @@ First, require the modules we are going to use. ::
 
 Now, let's make a callback: ::
 
-    local modId = "siege-crossbow"
+    local modId = "siege-crossbow-mod"
     eventful.onReactionComplete[modId] = function(reaction, reactionProduct, unit, inputItems, inputReagents, outputItems)
 
 First, we check to see if it the reaction that just happened is relevant to this callback: ::
 
-    if not customRawTokens.getToken(reaction, "TUTORIAL_MOD_TRANSFER_HANDLE_MATERIAL_TO_PRODUCT_IMPROVEMENT") then
+    if not customRawTokens.getToken(reaction, "SIEGE_CROSSBOW_MOD_TRANSFER_HANDLE_MATERIAL_TO_PRODUCT_IMPROVEMENT") then
         return
     end
 
@@ -188,7 +188,7 @@ Let's also make some code to modify the fire rate of the siege crossbow. ::
             return
         end
 
-        local multiplier = tonumber(customRawTokens.getToken(weapon.subtype, "TUTORIAL_MOD_FIRE_RATE_MULTIPLIER")) or 1
+        local multiplier = tonumber(customRawTokens.getToken(weapon.subtype, "SIEGE_CROSSBOW_MOD_FIRE_RATE_MULTIPLIER")) or 1
         firer.counters.think_counter = math.floor(firer.counters.think_counter * multiplier)
     end
 
@@ -207,7 +207,7 @@ Now, let's see how we could make some "pegasus boots". First, let's define the i
         [METAL]
         [LEATHER]
         [HARD]
-        [EXAMPLE_MOD_MOVEMENT_TIMER_REDUCTION_PER_TICK:5] custom raw token (you don't have to say this every time)
+        [PEGASUS_BOOTS_MOD_MOVEMENT_TIMER_REDUCTION_PER_TICK:5] custom raw token (you don't have to comment this every time)
 
 Then, let's make a ``repeat-util`` callback for once a tick: ::
 
@@ -222,7 +222,7 @@ Let's iterate over every active unit, and for every unit, initialise a variable
 Now, we will add up the effect of all speed-increasing gear and apply it: ::
 
         if entry.mode == df.unit_inventory_item.T_mode.Worn then
-            amount = amount + tonumber((customRawTokens.getToken(entry.item, "EXAMPLE_MOD_MOVEMENT_TIMER_REDUCTION_PER_TICK")) or 0)
+            amount = amount + tonumber((customRawTokens.getToken(entry.item, "PEGASUS_BOOTS_MOD_MOVEMENT_TIMER_REDUCTION_PER_TICK")) or 0)
         end
     end
     dfhack.units.addMoveTimer(-amount) -- Subtract amount from movement timer if currently moving

From e926e1116eb9490ccb6ce875a86dd33418f303c8 Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Thu, 14 Jul 2022 13:19:30 -0700
Subject: [PATCH 204/854] replace more Core cpp code with calls to helpdb

also document devel/dump-rpc builtin
---
 docs/Builtin.rst           |   11 +
 library/Core.cpp           | 1104 ++++++++++++++++--------------------
 library/LuaApi.cpp         |   10 +
 library/include/LuaTools.h |    2 +
 library/lua/helpdb.lua     |   28 +-
 5 files changed, 547 insertions(+), 608 deletions(-)

diff --git a/docs/Builtin.rst b/docs/Builtin.rst
index cf58337bc..8e59840b4 100644
--- a/docs/Builtin.rst
+++ b/docs/Builtin.rst
@@ -255,6 +255,17 @@ type
 ----
 ``type command`` shows where ``command`` is implemented.
 
+.. _devel/dump-rpc:
+
+devel/dump-rpc
+--------------
+
+Writes RPC endpoint information to the specified file.
+
+Usage::
+
+    devel/dump-rpc FILENAME
+
 Other Commands
 --------------
 The following commands are *not* built-in, but offer similarly useful functions.
diff --git a/library/Core.cpp b/library/Core.cpp
index a4feab742..30b87007d 100644
--- a/library/Core.cpp
+++ b/library/Core.cpp
@@ -277,65 +277,6 @@ static string dfhack_version_desc()
     return s.str();
 }
 
-static std::string getScriptHelp(std::string path, std::string helpprefix)
-{
-    ifstream script(path.c_str());
-
-    if (script.good())
-    {
-        std::string help;
-        if (getline(script, help) &&
-            help.substr(0,helpprefix.length()) == helpprefix)
-        {
-            help = help.substr(helpprefix.length());
-            while (help.size() && help[0] == ' ')
-                help = help.substr(1);
-            return help;
-        }
-    }
-
-    return "No help available.";
-}
-
-static void listScripts(PluginManager *plug_mgr, std::map<string,string> &pset, std::string path, bool all, std::string prefix = "")
-{
-    std::vector<string> files;
-    Filesystem::listdir(path, files);
-
-    path += '/';
-    for (size_t i = 0; i < files.size(); i++)
-    {
-        if (hasEnding(files[i], ".lua"))
-        {
-            string help = getScriptHelp(path + files[i], "--");
-            string key = prefix + files[i].substr(0, files[i].size()-4);
-            if (pset.find(key) == pset.end()) {
-                pset[key] = help;
-            }
-        }
-        else if (plug_mgr->ruby && plug_mgr->ruby->is_enabled() && hasEnding(files[i], ".rb"))
-        {
-            string help = getScriptHelp(path + files[i], "#");
-            string key = prefix + files[i].substr(0, files[i].size()-3);
-            if (pset.find(key) == pset.end()) {
-                pset[key] = help;
-            }
-        }
-        else if (all && !files[i].empty() && files[i][0] != '.' && files[i] != "internal" && files[i] != "test")
-        {
-            listScripts(plug_mgr, pset, path+files[i]+"/", all, prefix+files[i]+"/");
-        }
-    }
-}
-
-static void listAllScripts(map<string, string> &pset, bool all)
-{
-    vector<string> paths;
-    Core::getInstance().getScriptPaths(&paths);
-    for (string path : paths)
-        listScripts(Core::getInstance().getPluginManager(), pset, path, all);
-}
-
 namespace {
     struct ScriptArgs {
         const string *pcmd;
@@ -442,60 +383,52 @@ command_result Core::runCommand(color_ostream &out, const std::string &command)
         return CR_NOT_IMPLEMENTED;
 }
 
-// List of built in commands
-static const std::set<std::string> built_in_commands = {
-    "ls" ,
-    "help" ,
-    "tags" ,
-    "type" ,
-    "load" ,
-    "unload" ,
-    "reload" ,
-    "enable" ,
-    "disable" ,
-    "plug" ,
-    "keybinding" ,
-    "alias" ,
-    "fpause" ,
-    "cls" ,
-    "die" ,
-    "kill-lua" ,
-    "script" ,
-    "hide" ,
-    "show" ,
-    "sc-script"
-};
+bool is_builtin(color_ostream &con, const string &command) {
+    CoreSuspender suspend;
+    auto L = Lua::Core::State;
+    Lua::StackUnwinder top(L);
 
-static bool try_autocomplete(color_ostream &con, const std::string &first, std::string &completed)
-{
-    std::vector<std::string> possible;
+    if (!lua_checkstack(L, 1) ||
+        !Lua::PushModulePublic(con, L, "helpdb", "is_builtin")) {
+        con.printerr("Failed to load helpdb Lua code\n");
+        return false;
+    }
 
-    // Check for possible built in commands to autocomplete first
-    for (auto const &command : built_in_commands)
-        if (command.substr(0, first.size()) == first)
-            possible.push_back(command);
+    Lua::Push(L, command);
 
-    auto plug_mgr = Core::getInstance().getPluginManager();
-    for (auto it = plug_mgr->begin(); it != plug_mgr->end(); ++it)
-    {
-        const Plugin * plug = it->second;
-        for (size_t j = 0; j < plug->size(); j++)
-        {
-            const PluginCommand &pcmd = (*plug)[j];
-            if (pcmd.isHotkeyCommand())
-                continue;
-            if (pcmd.name.substr(0, first.size()) == first)
-                possible.push_back(pcmd.name);
-        }
+    if (!Lua::SafeCall(con, L, 1, 1)) {
+        con.printerr("Failed Lua call to helpdb.is_builtin.\n");
+        return false;
+    }
+
+    return lua_toboolean(L, -1);
+}
+
+void get_commands(color_ostream &con, vector<string> &commands) {
+    CoreSuspender suspend;
+    auto L = Lua::Core::State;
+    Lua::StackUnwinder top(L);
+
+    if (!lua_checkstack(L, 1) ||
+        !Lua::PushModulePublic(con, L, "helpdb", "get_commands")) {
+        con.printerr("Failed to load helpdb Lua code\n");
+        return;
     }
 
-    bool all = (first.find('/') != std::string::npos);
+    if (!Lua::SafeCall(con, L, 0, 1)) {
+        con.printerr("Failed Lua call to helpdb.get_commands.\n");
+    }
 
-    std::map<string, string> scripts;
-    listAllScripts(scripts, all);
-    for (auto iter = scripts.begin(); iter != scripts.end(); ++iter)
-        if (iter->first.substr(0, first.size()) == first)
-            possible.push_back(iter->first);
+    Lua::GetVector(L, commands);
+}
+
+static bool try_autocomplete(color_ostream &con, const std::string &first, std::string &completed)
+{
+    std::vector<std::string> commands, possible;
+
+    for (auto &command : commands)
+        if (command.substr(0, first.size()) == first)
+            possible.push_back(command);
 
     if (possible.size() == 1)
     {
@@ -651,30 +584,6 @@ static std::string sc_event_name (state_change_event id) {
     return "SC_UNKNOWN";
 }
 
-string getBuiltinCommand(std::string cmd)
-{
-    std::string builtin = "";
-
-    // Check our list of builtin commands from the header
-    if (built_in_commands.count(cmd))
-        builtin = cmd;
-
-    // Check for some common aliases for built in commands
-    else if (cmd == "?" || cmd == "man")
-        builtin = "help";
-
-    else if (cmd == "dir")
-        builtin = "ls";
-
-    else if (cmd == "clear")
-        builtin = "cls";
-
-    else if (cmd == "devel/dump-rpc")
-        builtin = "devel/dump-rpc";
-
-    return builtin;
-}
-
 void help_helper(color_ostream &con, const string &entry_name) {
     CoreSuspender suspend;
     auto L = Lua::Core::State;
@@ -753,587 +662,582 @@ command_result Core::runCommand(color_ostream &con, const std::string &first_, v
         return CR_FAILURE;
     }
 
-    command_result res;
-    if (!first.empty())
+    if (first.empty())
+        return CR_NOT_IMPLEMENTED;
+
+    if (first.find('\\') != std::string::npos)
     {
-        if(first.find('\\') != std::string::npos)
+        con.printerr("Replacing backslashes with forward slashes in \"%s\"\n", first.c_str());
+        for (size_t i = 0; i < first.size(); i++)
         {
-            con.printerr("Replacing backslashes with forward slashes in \"%s\"\n", first.c_str());
-            for (size_t i = 0; i < first.size(); i++)
-            {
-                if (first[i] == '\\')
-                    first[i] = '/';
-            }
+            if (first[i] == '\\')
+                first[i] = '/';
         }
+    }
 
-        // let's see what we actually got
-        string builtin = getBuiltinCommand(first);
-        if (builtin == "help")
+    // let's see what we actually got
+    command_result res;
+    if (first == "help" || first == "man" || first == "?")
+    {
+        if(!parts.size())
         {
-            if(!parts.size())
-            {
-                if (con.is_console())
-                {
-                    con.print("This is the DFHack console. You can type commands in and manage DFHack plugins from it.\n"
-                              "Some basic editing capabilities are included (single-line text editing).\n"
-                              "The console also has a command history - you can navigate it with Up and Down keys.\n"
-                              "On Windows, you may have to resize your console window. The appropriate menu is accessible\n"
-                              "by clicking on the program icon in the top bar of the window.\n\n");
-                }
-                con.print("Here are some basic commands to get you started:\n"
-                          "  help|?|man         - This text.\n"
-                          "  help <tool>        - Usage help for the given plugin, command, or script.\n"
-                          "  tags               - List the tags that the DFHack tools are grouped by.\n"
-                          "  ls|dir [<filter>]  - List commands, optionally filtered by a tag or substring.\n"
-                          "                       Optional parameters:\n"
-                          "                         --notags: skip printing tags for each command.\n"
-                          "                         --dev:  include commands intended for developers and modders.\n"
-                          "  cls|clear          - Clear the console.\n"
-                          "  fpause             - Force DF to pause.\n"
-                          "  die                - Force DF to close immediately, without saving.\n"
-                          "  keybinding         - Modify bindings of commands to in-game key shortcuts.\n"
-                          "\n"
-                          "See more commands by running 'ls'.\n\n"
-                         );
-
-                con.print("DFHack version %s\n", dfhack_version_desc().c_str());
-            }
-            else
+            if (con.is_console())
             {
-                help_helper(con, parts[0]);
+                con.print("This is the DFHack console. You can type commands in and manage DFHack plugins from it.\n"
+                          "Some basic editing capabilities are included (single-line text editing).\n"
+                          "The console also has a command history - you can navigate it with Up and Down keys.\n"
+                          "On Windows, you may have to resize your console window. The appropriate menu is accessible\n"
+                          "by clicking on the program icon in the top bar of the window.\n\n");
             }
+            con.print("Here are some basic commands to get you started:\n"
+                      "  help|?|man         - This text.\n"
+                      "  help <tool>        - Usage help for the given plugin, command, or script.\n"
+                      "  tags               - List the tags that the DFHack tools are grouped by.\n"
+                      "  ls|dir [<filter>]  - List commands, optionally filtered by a tag or substring.\n"
+                      "                       Optional parameters:\n"
+                      "                         --notags: skip printing tags for each command.\n"
+                      "                         --dev:  include commands intended for developers and modders.\n"
+                      "  cls|clear          - Clear the console.\n"
+                      "  fpause             - Force DF to pause.\n"
+                      "  die                - Force DF to close immediately, without saving.\n"
+                      "  keybinding         - Modify bindings of commands to in-game key shortcuts.\n"
+                      "\n"
+                      "See more commands by running 'ls'.\n\n"
+                     );
+
+            con.print("DFHack version %s\n", dfhack_version_desc().c_str());
         }
-        else if (builtin == "tags")
+        else
         {
-            tags_helper(con);
+            help_helper(con, parts[0]);
         }
-        else if (builtin == "load" || builtin == "unload" || builtin == "reload")
+    }
+    else if (first == "tags")
+    {
+        tags_helper(con);
+    }
+    else if (first == "load" || first == "unload" || first == "reload")
+    {
+        bool all = false;
+        bool load = (first == "load");
+        bool unload = (first == "unload");
+        if (parts.size())
         {
-            bool all = false;
-            bool load = (builtin == "load");
-            bool unload = (builtin == "unload");
-            if (parts.size())
+            for (auto p = parts.begin(); p != parts.end(); p++)
             {
-                for (auto p = parts.begin(); p != parts.end(); p++)
-                {
-                    if (p->size() && (*p)[0] == '-')
-                    {
-                        if (p->find('a') != string::npos)
-                            all = true;
-                    }
-                }
-                if (all)
-                {
-                    if (load)
-                        plug_mgr->loadAll();
-                    else if (unload)
-                        plug_mgr->unloadAll();
-                    else
-                        plug_mgr->reloadAll();
-                    return CR_OK;
-                }
-                for (auto p = parts.begin(); p != parts.end(); p++)
+                if (p->size() && (*p)[0] == '-')
                 {
-                    if (!p->size() || (*p)[0] == '-')
-                        continue;
-                    if (load)
-                        plug_mgr->load(*p);
-                    else if (unload)
-                        plug_mgr->unload(*p);
-                    else
-                        plug_mgr->reload(*p);
+                    if (p->find('a') != string::npos)
+                        all = true;
                 }
             }
-            else
-                con.printerr("%s: no arguments\n", builtin.c_str());
+            if (all)
+            {
+                if (load)
+                    plug_mgr->loadAll();
+                else if (unload)
+                    plug_mgr->unloadAll();
+                else
+                    plug_mgr->reloadAll();
+                return CR_OK;
+            }
+            for (auto p = parts.begin(); p != parts.end(); p++)
+            {
+                if (!p->size() || (*p)[0] == '-')
+                    continue;
+                if (load)
+                    plug_mgr->load(*p);
+                else if (unload)
+                    plug_mgr->unload(*p);
+                else
+                    plug_mgr->reload(*p);
+            }
         }
-        else if( builtin == "enable" || builtin == "disable" )
-        {
-            CoreSuspender suspend;
-            bool enable = (builtin == "enable");
+        else
+            con.printerr("%s: no arguments\n", first.c_str());
+    }
+    else if( first == "enable" || first == "disable" )
+    {
+        CoreSuspender suspend;
+        bool enable = (first == "enable");
 
-            if(parts.size())
+        if(parts.size())
+        {
+            for (size_t i = 0; i < parts.size(); i++)
             {
-                for (size_t i = 0; i < parts.size(); i++)
+                std::string part = parts[i];
+                if (part.find('\\') != std::string::npos)
                 {
-                    std::string part = parts[i];
-                    if (part.find('\\') != std::string::npos)
+                    con.printerr("Replacing backslashes with forward slashes in \"%s\"\n", part.c_str());
+                    for (size_t j = 0; j < part.size(); j++)
                     {
-                        con.printerr("Replacing backslashes with forward slashes in \"%s\"\n", part.c_str());
-                        for (size_t j = 0; j < part.size(); j++)
-                        {
-                            if (part[j] == '\\')
-                                part[j] = '/';
-                        }
+                        if (part[j] == '\\')
+                            part[j] = '/';
                     }
+                }
 
-                    Plugin * plug = (*plug_mgr)[part];
+                Plugin * plug = (*plug_mgr)[part];
 
-                    if(!plug)
-                    {
-                        std::string lua = findScript(part + ".lua");
-                        if (lua.size())
-                        {
-                            res = enableLuaScript(con, part, enable);
-                        }
-                        else
-                        {
-                            res = CR_NOT_FOUND;
-                            con.printerr("No such plugin or Lua script: %s\n", part.c_str());
-                        }
-                    }
-                    else if (!plug->can_set_enabled())
+                if(!plug)
+                {
+                    std::string lua = findScript(part + ".lua");
+                    if (lua.size())
                     {
-                        res = CR_NOT_IMPLEMENTED;
-                        con.printerr("Cannot %s plugin: %s\n", builtin.c_str(), part.c_str());
+                        res = enableLuaScript(con, part, enable);
                     }
                     else
                     {
-                        res = plug->set_enabled(con, enable);
-
-                        if (res != CR_OK || plug->is_enabled() != enable)
-                            con.printerr("Could not %s plugin: %s\n", builtin.c_str(), part.c_str());
+                        res = CR_NOT_FOUND;
+                        con.printerr("No such plugin or Lua script: %s\n", part.c_str());
                     }
                 }
-
-                return res;
-            }
-            else
-            {
-                for (auto it = plug_mgr->begin(); it != plug_mgr->end(); ++it)
+                else if (!plug->can_set_enabled())
+                {
+                    res = CR_NOT_IMPLEMENTED;
+                    con.printerr("Cannot %s plugin: %s\n", first.c_str(), part.c_str());
+                }
+                else
                 {
-                    Plugin * plug = it->second;
-                    if (!plug->can_be_enabled()) continue;
-
-                    con.print(
-                        "%20s\t%-3s%s\n",
-                        (plug->getName()+":").c_str(),
-                        plug->is_enabled() ? "on" : "off",
-                        plug->can_set_enabled() ? "" : " (controlled elsewhere)"
-                    );
+                    res = plug->set_enabled(con, enable);
+
+                    if (res != CR_OK || plug->is_enabled() != enable)
+                        con.printerr("Could not %s plugin: %s\n", first.c_str(), part.c_str());
                 }
             }
+
+            return res;
         }
-        else if (builtin == "ls" || builtin == "dir")
-        {
-            ls_helper(con, parts);
-        }
-        else if (builtin == "plug")
+        else
         {
-            const char *header_format = "%30s %10s %4s %8s\n";
-            const char *row_format =    "%30s %10s %4i %8s\n";
-            con.print(header_format, "Name", "State", "Cmds", "Enabled");
-
-            plug_mgr->refresh();
             for (auto it = plug_mgr->begin(); it != plug_mgr->end(); ++it)
             {
                 Plugin * plug = it->second;
-                if (!plug)
-                    continue;
-                if (parts.size() && std::find(parts.begin(), parts.end(), plug->getName()) == parts.end())
-                    continue;
-                color_value color;
-                switch (plug->getState())
-                {
-                    case Plugin::PS_LOADED:
-                        color = COLOR_RESET;
-                        break;
-                    case Plugin::PS_UNLOADED:
-                    case Plugin::PS_UNLOADING:
-                        color = COLOR_YELLOW;
-                        break;
-                    case Plugin::PS_LOADING:
-                        color = COLOR_LIGHTBLUE;
-                        break;
-                    case Plugin::PS_BROKEN:
-                        color = COLOR_LIGHTRED;
-                        break;
-                    default:
-                        color = COLOR_LIGHTMAGENTA;
-                        break;
-                }
-                con.color(color);
-                con.print(row_format,
-                    plug->getName().c_str(),
-                    Plugin::getStateDescription(plug->getState()),
-                    plug->size(),
-                    (plug->can_be_enabled()
-                        ? (plug->is_enabled() ? "enabled" : "disabled")
-                        : "n/a")
+                if (!plug->can_be_enabled()) continue;
+
+                con.print(
+                    "%20s\t%-3s%s\n",
+                    (plug->getName()+":").c_str(),
+                    plug->is_enabled() ? "on" : "off",
+                    plug->can_set_enabled() ? "" : " (controlled elsewhere)"
                 );
-                con.color(COLOR_RESET);
             }
         }
-        else if (builtin == "type")
+    }
+    else if (first == "ls" || first == "dir")
+    {
+        ls_helper(con, parts);
+    }
+    else if (first == "plug")
+    {
+        const char *header_format = "%30s %10s %4s %8s\n";
+        const char *row_format =    "%30s %10s %4i %8s\n";
+        con.print(header_format, "Name", "State", "Cmds", "Enabled");
+
+        plug_mgr->refresh();
+        for (auto it = plug_mgr->begin(); it != plug_mgr->end(); ++it)
         {
-            if (!parts.size())
-            {
-                con.printerr("type: no argument\n");
-                return CR_WRONG_USAGE;
-            }
-            con << parts[0];
-            string builtin_cmd = getBuiltinCommand(parts[0]);
-            string lua_path = findScript(parts[0] + ".lua");
-            string ruby_path = findScript(parts[0] + ".rb");
-            Plugin *plug = plug_mgr->getPluginByCommand(parts[0]);
-            if (builtin_cmd.size())
-            {
-                con << " is a built-in command";
-                if (builtin_cmd != parts[0])
-                    con << " (aliased to " << builtin_cmd << ")";
-                con << std::endl;
-            }
-            else if (IsAlias(parts[0]))
-            {
-                con << " is an alias: " << GetAliasCommand(parts[0]) << std::endl;
-            }
-            else if (plug)
-            {
-                con << " is a command implemented by the plugin " << plug->getName() << std::endl;
-            }
-            else if (lua_path.size())
-            {
-                con << " is a Lua script: " << lua_path << std::endl;
-            }
-            else if (ruby_path.size())
-            {
-                con << " is a Ruby script: " << ruby_path << std::endl;
-            }
-            else
+            Plugin * plug = it->second;
+            if (!plug)
+                continue;
+            if (parts.size() && std::find(parts.begin(), parts.end(), plug->getName()) == parts.end())
+                continue;
+            color_value color;
+            switch (plug->getState())
             {
-                con << " is not a recognized command." << std::endl;
-                plug = plug_mgr->getPluginByName(parts[0]);
-                if (plug)
-                    con << "Plugin " << parts[0] << " exists and implements " << plug->size() << " commands." << std::endl;
-                return CR_FAILURE;
+                case Plugin::PS_LOADED:
+                    color = COLOR_RESET;
+                    break;
+                case Plugin::PS_UNLOADED:
+                case Plugin::PS_UNLOADING:
+                    color = COLOR_YELLOW;
+                    break;
+                case Plugin::PS_LOADING:
+                    color = COLOR_LIGHTBLUE;
+                    break;
+                case Plugin::PS_BROKEN:
+                    color = COLOR_LIGHTRED;
+                    break;
+                default:
+                    color = COLOR_LIGHTMAGENTA;
+                    break;
             }
+            con.color(color);
+            con.print(row_format,
+                plug->getName().c_str(),
+                Plugin::getStateDescription(plug->getState()),
+                plug->size(),
+                (plug->can_be_enabled()
+                    ? (plug->is_enabled() ? "enabled" : "disabled")
+                    : "n/a")
+            );
+            con.color(COLOR_RESET);
         }
-        else if (builtin == "keybinding")
+    }
+    else if (first == "type")
+    {
+        if (!parts.size())
         {
-            if (parts.size() >= 3 && (parts[0] == "set" || parts[0] == "add"))
-            {
-                std::string keystr = parts[1];
-                if (parts[0] == "set")
-                    ClearKeyBindings(keystr);
-                for (int i = parts.size()-1; i >= 2; i--)
-                {
-                    if (!AddKeyBinding(keystr, parts[i])) {
-                        con.printerr("Invalid key spec: %s\n", keystr.c_str());
-                        break;
-                    }
-                }
-            }
-            else if (parts.size() >= 2 && parts[0] == "clear")
-            {
-                for (size_t i = 1; i < parts.size(); i++)
-                {
-                    if (!ClearKeyBindings(parts[i])) {
-                        con.printerr("Invalid key spec: %s\n", parts[i].c_str());
-                        break;
-                    }
-                }
-            }
-            else if (parts.size() == 2 && parts[0] == "list")
-            {
-                std::vector<std::string> list = ListKeyBindings(parts[1]);
-                if (list.empty())
-                    con << "No bindings." << endl;
-                for (size_t i = 0; i < list.size(); i++)
-                    con << "  " << list[i] << endl;
-            }
-            else
-            {
-                con << "Usage:" << endl
-                    << "  keybinding list <key>" << endl
-                    << "  keybinding clear <key>[@context]..." << endl
-                    << "  keybinding set <key>[@context] \"cmdline\" \"cmdline\"..." << endl
-                    << "  keybinding add <key>[@context] \"cmdline\" \"cmdline\"..." << endl
-                    << "Later adds, and earlier items within one command have priority." << endl
-                    << "Supported keys: [Ctrl-][Alt-][Shift-](A-Z, 0-9, F1-F12, or Enter)." << endl
-                    << "Context may be used to limit the scope of the binding, by" << endl
-                    << "requiring the current context to have a certain prefix." << endl
-                    << "Current UI context is: "
-                    << Gui::getFocusString(Core::getTopViewscreen()) << endl;
-            }
+            con.printerr("type: no argument\n");
+            return CR_WRONG_USAGE;
         }
-        else if (builtin == "alias")
+        con << parts[0];
+        bool builtin = is_builtin(con, parts[0]);
+        string lua_path = findScript(parts[0] + ".lua");
+        string ruby_path = findScript(parts[0] + ".rb");
+        Plugin *plug = plug_mgr->getPluginByCommand(parts[0]);
+        if (builtin)
         {
-            if (parts.size() >= 3 && (parts[0] == "add" || parts[0] == "replace"))
-            {
-                const string &name = parts[1];
-                vector<string> cmd(parts.begin() + 2, parts.end());
-                if (!AddAlias(name, cmd, parts[0] == "replace"))
-                {
-                    con.printerr("Could not add alias %s - already exists\n", name.c_str());
-                    return CR_FAILURE;
-                }
-            }
-            else if (parts.size() >= 2 && (parts[0] == "delete" || parts[0] == "clear"))
+            con << " is a built-in command";
+            con << std::endl;
+        }
+        else if (IsAlias(parts[0]))
+        {
+            con << " is an alias: " << GetAliasCommand(parts[0]) << std::endl;
+        }
+        else if (plug)
+        {
+            con << " is a command implemented by the plugin " << plug->getName() << std::endl;
+        }
+        else if (lua_path.size())
+        {
+            con << " is a Lua script: " << lua_path << std::endl;
+        }
+        else if (ruby_path.size())
+        {
+            con << " is a Ruby script: " << ruby_path << std::endl;
+        }
+        else
+        {
+            con << " is not a recognized command." << std::endl;
+            plug = plug_mgr->getPluginByName(parts[0]);
+            if (plug)
+                con << "Plugin " << parts[0] << " exists and implements " << plug->size() << " commands." << std::endl;
+            return CR_FAILURE;
+        }
+    }
+    else if (first == "keybinding")
+    {
+        if (parts.size() >= 3 && (parts[0] == "set" || parts[0] == "add"))
+        {
+            std::string keystr = parts[1];
+            if (parts[0] == "set")
+                ClearKeyBindings(keystr);
+            for (int i = parts.size()-1; i >= 2; i--)
             {
-                if (!RemoveAlias(parts[1]))
-                {
-                    con.printerr("Could not remove alias %s\n", parts[1].c_str());
-                    return CR_FAILURE;
+                if (!AddKeyBinding(keystr, parts[i])) {
+                    con.printerr("Invalid key spec: %s\n", keystr.c_str());
+                    break;
                 }
             }
-            else if (parts.size() >= 1 && (parts[0] == "list"))
+        }
+        else if (parts.size() >= 2 && parts[0] == "clear")
+        {
+            for (size_t i = 1; i < parts.size(); i++)
             {
-                auto aliases = ListAliases();
-                for (auto p : aliases)
-                {
-                    con << p.first << ": " << join_strings(" ", p.second) << endl;
+                if (!ClearKeyBindings(parts[i])) {
+                    con.printerr("Invalid key spec: %s\n", parts[i].c_str());
+                    break;
                 }
             }
-            else
+        }
+        else if (parts.size() == 2 && parts[0] == "list")
+        {
+            std::vector<std::string> list = ListKeyBindings(parts[1]);
+            if (list.empty())
+                con << "No bindings." << endl;
+            for (size_t i = 0; i < list.size(); i++)
+                con << "  " << list[i] << endl;
+        }
+        else
+        {
+            con << "Usage:" << endl
+                << "  keybinding list <key>" << endl
+                << "  keybinding clear <key>[@context]..." << endl
+                << "  keybinding set <key>[@context] \"cmdline\" \"cmdline\"..." << endl
+                << "  keybinding add <key>[@context] \"cmdline\" \"cmdline\"..." << endl
+                << "Later adds, and earlier items within one command have priority." << endl
+                << "Supported keys: [Ctrl-][Alt-][Shift-](A-Z, 0-9, F1-F12, or Enter)." << endl
+                << "Context may be used to limit the scope of the binding, by" << endl
+                << "requiring the current context to have a certain prefix." << endl
+                << "Current UI context is: "
+                << Gui::getFocusString(Core::getTopViewscreen()) << endl;
+        }
+    }
+    else if (first == "alias")
+    {
+        if (parts.size() >= 3 && (parts[0] == "add" || parts[0] == "replace"))
+        {
+            const string &name = parts[1];
+            vector<string> cmd(parts.begin() + 2, parts.end());
+            if (!AddAlias(name, cmd, parts[0] == "replace"))
             {
-                con << "Usage: " << endl
-                    << "  alias add|replace <name> <command...>" << endl
-                    << "  alias delete|clear <name> <command...>" << endl
-                    << "  alias list" << endl;
+                con.printerr("Could not add alias %s - already exists\n", name.c_str());
+                return CR_FAILURE;
             }
         }
-        else if (builtin == "fpause")
+        else if (parts.size() >= 2 && (parts[0] == "delete" || parts[0] == "clear"))
         {
-            World::SetPauseState(true);
-            if (auto scr = Gui::getViewscreenByType<df::viewscreen_new_regionst>())
+            if (!RemoveAlias(parts[1]))
             {
-                scr->worldgen_paused = true;
+                con.printerr("Could not remove alias %s\n", parts[1].c_str());
+                return CR_FAILURE;
             }
-            con.print("The game was forced to pause!\n");
         }
-        else if (builtin == "cls")
+        else if (parts.size() >= 1 && (parts[0] == "list"))
         {
-            if (con.is_console())
-                ((Console&)con).clear();
-            else
+            auto aliases = ListAliases();
+            for (auto p : aliases)
             {
-                con.printerr("No console to clear.\n");
-                return CR_NEEDS_CONSOLE;
+                con << p.first << ": " << join_strings(" ", p.second) << endl;
             }
         }
-        else if (builtin == "die")
+        else
         {
-            std::_Exit(666);
+            con << "Usage: " << endl
+                << "  alias add|replace <name> <command...>" << endl
+                << "  alias delete|clear <name> <command...>" << endl
+                << "  alias list" << endl;
         }
-        else if (builtin == "kill-lua")
+    }
+    else if (first == "fpause")
+    {
+        World::SetPauseState(true);
+        if (auto scr = Gui::getViewscreenByType<df::viewscreen_new_regionst>())
         {
-            bool force = false;
-            for (auto it = parts.begin(); it != parts.end(); ++it)
-            {
-                if (*it == "force")
-                    force = true;
-            }
-            if (!Lua::Interrupt(force))
-            {
-                con.printerr(
-                    "Failed to register hook. This can happen if you have"
-                    " lua profiling or coverage monitoring enabled. Use"
-                    " 'kill-lua force' to force, but this may disable"
-                    " profiling and coverage monitoring.\n");
-            }
+            scr->worldgen_paused = true;
         }
-        else if (builtin == "script")
+        con.print("The game was forced to pause!\n");
+    }
+    else if (first == "cls" || first == "clear")
+    {
+        if (con.is_console())
+            ((Console&)con).clear();
+        else
         {
-            if(parts.size() == 1)
-            {
-                loadScriptFile(con, parts[0], false);
-            }
-            else
-            {
-                con << "Usage:" << endl
-                    << "  script <filename>" << endl;
-                return CR_WRONG_USAGE;
-            }
+            con.printerr("No console to clear.\n");
+            return CR_NEEDS_CONSOLE;
         }
-        else if (builtin=="hide")
+    }
+    else if (first == "die")
+    {
+        std::_Exit(666);
+    }
+    else if (first == "kill-lua")
+    {
+        bool force = false;
+        for (auto it = parts.begin(); it != parts.end(); ++it)
+        {
+            if (*it == "force")
+                force = true;
+        }
+        if (!Lua::Interrupt(force))
+        {
+            con.printerr(
+                "Failed to register hook. This can happen if you have"
+                " lua profiling or coverage monitoring enabled. Use"
+                " 'kill-lua force' to force, but this may disable"
+                " profiling and coverage monitoring.\n");
+        }
+    }
+    else if (first == "script")
+    {
+        if(parts.size() == 1)
+        {
+            loadScriptFile(con, parts[0], false);
+        }
+        else
+        {
+            con << "Usage:" << endl
+                << "  script <filename>" << endl;
+            return CR_WRONG_USAGE;
+        }
+    }
+    else if (first == "hide")
+    {
+        if (!getConsole().hide())
+        {
+            con.printerr("Could not hide console\n");
+            return CR_FAILURE;
+        }
+        return CR_OK;
+    }
+    else if (first == "show")
+    {
+        if (!getConsole().show())
         {
-            if (!getConsole().hide())
+            con.printerr("Could not show console\n");
+            return CR_FAILURE;
+        }
+        return CR_OK;
+    }
+    else if (first == "sc-script")
+    {
+        if (parts.empty() || parts[0] == "help" || parts[0] == "?")
+        {
+            con << "Usage: sc-script add|remove|list|help SC_EVENT [path-to-script] [...]" << endl;
+            con << "Valid event names (SC_ prefix is optional):" << endl;
+            for (int i = SC_WORLD_LOADED; i <= SC_UNPAUSED; i++)
             {
-                con.printerr("Could not hide console\n");
-                return CR_FAILURE;
+                std::string name = sc_event_name((state_change_event)i);
+                if (name != "SC_UNKNOWN")
+                    con << "  " << name << endl;
             }
             return CR_OK;
         }
-        else if (builtin=="show")
+        else if (parts[0] == "list")
         {
-            if (!getConsole().show())
+            if(parts.size() < 2)
+                parts.push_back("");
+            if (parts[1].size() && sc_event_id(parts[1]) == SC_UNKNOWN)
             {
-                con.printerr("Could not show console\n");
-                return CR_FAILURE;
+                con << "Unrecognized event name: " << parts[1] << endl;
+                return CR_WRONG_USAGE;
+            }
+            for (auto it = state_change_scripts.begin(); it != state_change_scripts.end(); ++it)
+            {
+                if (!parts[1].size() || (it->event == sc_event_id(parts[1])))
+                {
+                    con.print("%s (%s): %s%s\n", sc_event_name(it->event).c_str(),
+                        it->save_specific ? "save-specific" : "global",
+                        it->save_specific ? "<save folder>/raw/" : "<DF folder>/",
+                        it->path.c_str());
+                }
             }
             return CR_OK;
         }
-        else if (builtin == "sc-script")
+        else if (parts[0] == "add")
         {
-            if (parts.empty() || parts[0] == "help" || parts[0] == "?")
+            if (parts.size() < 3 || (parts.size() >= 4 && parts[3] != "-save"))
             {
-                con << "Usage: sc-script add|remove|list|help SC_EVENT [path-to-script] [...]" << endl;
-                con << "Valid event names (SC_ prefix is optional):" << endl;
-                for (int i = SC_WORLD_LOADED; i <= SC_UNPAUSED; i++)
-                {
-                    std::string name = sc_event_name((state_change_event)i);
-                    if (name != "SC_UNKNOWN")
-                        con << "  " << name << endl;
-                }
-                return CR_OK;
+                con << "Usage: sc-script add EVENT path-to-script [-save]" << endl;
+                return CR_WRONG_USAGE;
             }
-            else if (parts[0] == "list")
+            state_change_event evt = sc_event_id(parts[1]);
+            if (evt == SC_UNKNOWN)
             {
-                if(parts.size() < 2)
-                    parts.push_back("");
-                if (parts[1].size() && sc_event_id(parts[1]) == SC_UNKNOWN)
-                {
-                    con << "Unrecognized event name: " << parts[1] << endl;
-                    return CR_WRONG_USAGE;
-                }
-                for (auto it = state_change_scripts.begin(); it != state_change_scripts.end(); ++it)
-                {
-                    if (!parts[1].size() || (it->event == sc_event_id(parts[1])))
-                    {
-                        con.print("%s (%s): %s%s\n", sc_event_name(it->event).c_str(),
-                            it->save_specific ? "save-specific" : "global",
-                            it->save_specific ? "<save folder>/raw/" : "<DF folder>/",
-                            it->path.c_str());
-                    }
-                }
-                return CR_OK;
+                con << "Unrecognized event: " << parts[1] << endl;
+                return CR_FAILURE;
             }
-            else if (parts[0] == "add")
+            bool save_specific = (parts.size() >= 4 && parts[3] == "-save");
+            StateChangeScript script(evt, parts[2], save_specific);
+            for (auto it = state_change_scripts.begin(); it != state_change_scripts.end(); ++it)
             {
-                if (parts.size() < 3 || (parts.size() >= 4 && parts[3] != "-save"))
-                {
-                    con << "Usage: sc-script add EVENT path-to-script [-save]" << endl;
-                    return CR_WRONG_USAGE;
-                }
-                state_change_event evt = sc_event_id(parts[1]);
-                if (evt == SC_UNKNOWN)
+                if (script == *it)
                 {
-                    con << "Unrecognized event: " << parts[1] << endl;
+                    con << "Script already registered" << endl;
                     return CR_FAILURE;
                 }
-                bool save_specific = (parts.size() >= 4 && parts[3] == "-save");
-                StateChangeScript script(evt, parts[2], save_specific);
-                for (auto it = state_change_scripts.begin(); it != state_change_scripts.end(); ++it)
-                {
-                    if (script == *it)
-                    {
-                        con << "Script already registered" << endl;
-                        return CR_FAILURE;
-                    }
-                }
-                state_change_scripts.push_back(script);
-                return CR_OK;
             }
-            else if (parts[0] == "remove")
+            state_change_scripts.push_back(script);
+            return CR_OK;
+        }
+        else if (parts[0] == "remove")
+        {
+            if (parts.size() < 3 || (parts.size() >= 4 && parts[3] != "-save"))
             {
-                if (parts.size() < 3 || (parts.size() >= 4 && parts[3] != "-save"))
-                {
-                    con << "Usage: sc-script remove EVENT path-to-script [-save]" << endl;
-                    return CR_WRONG_USAGE;
-                }
-                state_change_event evt = sc_event_id(parts[1]);
-                if (evt == SC_UNKNOWN)
-                {
-                    con << "Unrecognized event: " << parts[1] << endl;
-                    return CR_FAILURE;
-                }
-                bool save_specific = (parts.size() >= 4 && parts[3] == "-save");
-                StateChangeScript tmp(evt, parts[2], save_specific);
-                auto it = std::find(state_change_scripts.begin(), state_change_scripts.end(), tmp);
-                if (it != state_change_scripts.end())
-                {
-                    state_change_scripts.erase(it);
-                    return CR_OK;
-                }
-                else
-                {
-                    con << "Unrecognized script" << endl;
-                    return CR_FAILURE;
-                }
+                con << "Usage: sc-script remove EVENT path-to-script [-save]" << endl;
+                return CR_WRONG_USAGE;
+            }
+            state_change_event evt = sc_event_id(parts[1]);
+            if (evt == SC_UNKNOWN)
+            {
+                con << "Unrecognized event: " << parts[1] << endl;
+                return CR_FAILURE;
+            }
+            bool save_specific = (parts.size() >= 4 && parts[3] == "-save");
+            StateChangeScript tmp(evt, parts[2], save_specific);
+            auto it = std::find(state_change_scripts.begin(), state_change_scripts.end(), tmp);
+            if (it != state_change_scripts.end())
+            {
+                state_change_scripts.erase(it);
+                return CR_OK;
             }
             else
             {
-                con << "Usage: sc-script add|remove|list|help SC_EVENT [path-to-script] [...]" << endl;
-                return CR_WRONG_USAGE;
+                con << "Unrecognized script" << endl;
+                return CR_FAILURE;
             }
         }
-        else if (builtin == "devel/dump-rpc")
+        else
         {
-            if (parts.size() == 1)
-            {
-                std::ofstream file(parts[0]);
-                CoreService core;
-                core.dumpMethods(file);
+            con << "Usage: sc-script add|remove|list|help SC_EVENT [path-to-script] [...]" << endl;
+            return CR_WRONG_USAGE;
+        }
+    }
+    else if (first == "devel/dump-rpc")
+    {
+        if (parts.size() == 1)
+        {
+            std::ofstream file(parts[0]);
+            CoreService core;
+            core.dumpMethods(file);
 
-                for (auto & it : *plug_mgr)
-                {
-                    Plugin * plug = it.second;
-                    if (!plug)
-                        continue;
+            for (auto & it : *plug_mgr)
+            {
+                Plugin * plug = it.second;
+                if (!plug)
+                    continue;
 
-                    std::unique_ptr<RPCService> svc(plug->rpc_connect(con));
-                    if (!svc)
-                        continue;
+                std::unique_ptr<RPCService> svc(plug->rpc_connect(con));
+                if (!svc)
+                    continue;
 
-                    file << "// Plugin: " << plug->getName() << endl;
-                    svc->dumpMethods(file);
-                }
-            }
-            else
-            {
-                con << "Usage: devel/dump-rpc \"filename\"" << endl;
-                return CR_WRONG_USAGE;
+                file << "// Plugin: " << plug->getName() << endl;
+                svc->dumpMethods(file);
             }
         }
-        else if (RunAlias(con, first, parts, res))
+        else
         {
-            return res;
+            con << "Usage: devel/dump-rpc \"filename\"" << endl;
+            return CR_WRONG_USAGE;
         }
-        else
+    }
+    else if (RunAlias(con, first, parts, res))
+    {
+        return res;
+    }
+    else
+    {
+        res = plug_mgr->InvokeCommand(con, first, parts);
+        if(res == CR_NOT_IMPLEMENTED)
         {
-            res = plug_mgr->InvokeCommand(con, first, parts);
-            if(res == CR_NOT_IMPLEMENTED)
+            string completed;
+            string filename = findScript(first + ".lua");
+            bool lua = filename != "";
+            if ( !lua ) {
+                filename = findScript(first + ".rb");
+            }
+            if ( lua )
+                res = runLuaScript(con, first, parts);
+            else if ( filename != "" && plug_mgr->ruby && plug_mgr->ruby->is_enabled() )
+                res = runRubyScript(con, plug_mgr, filename, parts);
+            else if ( try_autocomplete(con, first, completed) )
+                res = CR_NOT_IMPLEMENTED;
+            else
+                con.printerr("%s is not a recognized command.\n", first.c_str());
+            if (res == CR_NOT_IMPLEMENTED)
             {
-                string completed;
-                string filename = findScript(first + ".lua");
-                bool lua = filename != "";
-                if ( !lua ) {
-                    filename = findScript(first + ".rb");
-                }
-                if ( lua )
-                    res = runLuaScript(con, first, parts);
-                else if ( filename != "" && plug_mgr->ruby && plug_mgr->ruby->is_enabled() )
-                    res = runRubyScript(con, plug_mgr, filename, parts);
-                else if ( try_autocomplete(con, first, completed) )
-                    res = CR_NOT_IMPLEMENTED;
-                else
-                    con.printerr("%s is not a recognized command.\n", first.c_str());
-                if (res == CR_NOT_IMPLEMENTED)
+                Plugin *p = plug_mgr->getPluginByName(first);
+                if (p)
                 {
-                    Plugin *p = plug_mgr->getPluginByName(first);
-                    if (p)
-                    {
-                        con.printerr("%s is a plugin ", first.c_str());
-                        if (p->getState() == Plugin::PS_UNLOADED)
-                            con.printerr("that is not loaded - try \"load %s\" or check stderr.log\n",
-                                first.c_str());
-                        else if (p->size())
-                            con.printerr("that implements %zi commands - see \"ls %s\" for details\n",
-                                p->size(), first.c_str());
-                        else
-                            con.printerr("but does not implement any commands\n");
-                    }
+                    con.printerr("%s is a plugin ", first.c_str());
+                    if (p->getState() == Plugin::PS_UNLOADED)
+                        con.printerr("that is not loaded - try \"load %s\" or check stderr.log\n",
+                            first.c_str());
+                    else if (p->size())
+                        con.printerr("that implements %zi commands - see \"ls %s\" for details\n",
+                            p->size(), first.c_str());
+                    else
+                        con.printerr("but does not implement any commands\n");
                 }
             }
-            else if (res == CR_NEEDS_CONSOLE)
-                con.printerr("%s needs interactive console to work.\n", first.c_str());
-            return res;
         }
-
-        return CR_OK;
+        else if (res == CR_NEEDS_CONSOLE)
+            con.printerr("%s needs interactive console to work.\n", first.c_str());
+        return res;
     }
 
-    return CR_NOT_IMPLEMENTED;
+    return CR_OK;
 }
 
 bool Core::loadScriptFile(color_ostream &out, string fname, bool silent)
diff --git a/library/LuaApi.cpp b/library/LuaApi.cpp
index fb557329d..af8eee3c1 100644
--- a/library/LuaApi.cpp
+++ b/library/LuaApi.cpp
@@ -148,6 +148,16 @@ void Lua::Push(lua_State *state, df::coord2d pos)
     lua_setfield(state, -2, "y");
 }
 
+void GetVector(lua_State *state, std::vector<std::string> &pvec)
+{
+    lua_pushnil(state);   // first key
+    while (lua_next(state, 1) != 0)
+    {
+        pvec.push_back(lua_tostring(state, -1));
+        lua_pop(state, 1);  // remove value, leave key
+    }
+}
+
 int Lua::PushPosXYZ(lua_State *state, df::coord pos)
 {
     if (!pos.isValid())
diff --git a/library/include/LuaTools.h b/library/include/LuaTools.h
index df89d184f..6dc5ae0bd 100644
--- a/library/include/LuaTools.h
+++ b/library/include/LuaTools.h
@@ -339,6 +339,8 @@ namespace DFHack {namespace Lua {
         }
     }
 
+    DFHACK_EXPORT void GetVector(lua_State *state, std::vector<std::string> &pvec);
+
     DFHACK_EXPORT int PushPosXYZ(lua_State *state, df::coord pos);
     DFHACK_EXPORT int PushPosXY(lua_State *state, df::coord2d pos);
 
diff --git a/library/lua/helpdb.lua b/library/lua/helpdb.lua
index 8856c7ad8..b52f91f22 100644
--- a/library/lua/helpdb.lua
+++ b/library/lua/helpdb.lua
@@ -250,6 +250,7 @@ local BUILTINS = {
     alias='Configure helper aliases for other DFHack commands.',
     cls='Clear the console screen.',
     clear='Clear the console screen.',
+    ['devel/dump-rpc']='Write RPC endpoint information to a file.',
     die='Force DF to close immediately, without saving.',
     enable='Enable a plugin or persistent script.',
     disable='Disable a plugin or persistent script.',
@@ -575,15 +576,26 @@ function search_entries(include, exclude)
     ensure_db()
     include = normalize_filter(include)
     exclude = normalize_filter(exclude)
-    local commands = {}
-    for command in pairs(db) do
-        if (not include or matches(command, include)) and
-                (not exclude or not matches(command, exclude)) then
-            table.insert(commands, command)
+    local entries = {}
+    for entry in pairs(db) do
+        if (not include or matches(entry, include)) and
+                (not exclude or not matches(entry, exclude)) then
+            table.insert(entries, entry)
         end
     end
-    table.sort(commands, sort_by_basename)
-    return commands
+    table.sort(entries, sort_by_basename)
+    return entries
+end
+
+-- returns a list of all commands. used by Core's autocomplete functionality.
+function get_commands()
+    local include = {types={ENTRY_TYPES.COMMAND}}
+    return search_entries(include)
+end
+
+function is_builtin(command)
+    ensure_db()
+    return db[command] and db[command].entry_types[ENTRY_TYPES.BUILTIN]
 end
 
 ---------------------------------------------------------------------------
@@ -633,7 +645,7 @@ function list_entries(skip_tags, include, exclude)
         end
     end
     if #entries == 0 then
-        print('no entries found.')
+        print('No matches.')
     end
 end
 

From 193b9a40040dc52cde722cea4415371681b2ea73 Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Thu, 14 Jul 2022 14:08:33 -0700
Subject: [PATCH 205/854] add missing namespace

which did not cause compiler errors for some reason
---
 library/LuaApi.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/library/LuaApi.cpp b/library/LuaApi.cpp
index af8eee3c1..056a89a07 100644
--- a/library/LuaApi.cpp
+++ b/library/LuaApi.cpp
@@ -148,7 +148,7 @@ void Lua::Push(lua_State *state, df::coord2d pos)
     lua_setfield(state, -2, "y");
 }
 
-void GetVector(lua_State *state, std::vector<std::string> &pvec)
+void Lua::GetVector(lua_State *state, std::vector<std::string> &pvec)
 {
     lua_pushnil(state);   // first key
     while (lua_next(state, 1) != 0)

From dd6fbd53b6498ddcc544fdff3eeffb3f6cdde95a Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Fri, 15 Jul 2022 09:07:14 -0700
Subject: [PATCH 206/854] add getEntries() to the CommandHistory API

so we can export them to lua
also bump the default history size to 5000 from the paltry 100 we had
---
 library/include/Console.h | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/library/include/Console.h b/library/include/Console.h
index 0882ba449..39a19b152 100644
--- a/library/include/Console.h
+++ b/library/include/Console.h
@@ -32,6 +32,7 @@ distribution.
 #include <assert.h>
 #include <iostream>
 #include <string>
+#include <vector>
 namespace tthread
 {
     class mutex;
@@ -44,7 +45,7 @@ namespace  DFHack
     class CommandHistory
     {
     public:
-        CommandHistory(std::size_t capacity = 100)
+        CommandHistory(std::size_t capacity = 5000)
         {
             this->capacity = capacity;
         }
@@ -114,6 +115,12 @@ namespace  DFHack
         {
             history.pop_front();
         }
+        /// adds the current list of entries to the given vector
+        void getEntries(std::vector<std::string> &entries)
+        {
+            for (auto &entry : history)
+                entries.push_back(entry);
+        }
     private:
         std::size_t capacity;
         std::deque <std::string> history;

From c9a87511bd46d8e69cf7e816195e70edbf50e66a Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Fri, 15 Jul 2022 09:18:27 -0700
Subject: [PATCH 207/854] add dfhack history repository and expose to lua

---
 docs/Lua API.rst   | 16 +++++++++++++++-
 library/LuaApi.cpp | 39 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 54 insertions(+), 1 deletion(-)

diff --git a/docs/Lua API.rst b/docs/Lua API.rst
index 55a217757..fb2b18291 100644
--- a/docs/Lua API.rst	
+++ b/docs/Lua API.rst	
@@ -524,6 +524,20 @@ Input & Output
   lock. Using an explicit ``dfhack.with_suspend`` will prevent
   this, forcing the function to block on input with lock held.
 
+* ``dfhack.getCommandHistory(history_id, history_filename)``
+
+  Returns the list of strings in the specified history. Intended to be used by
+  GUI scripts that don't have access to a console and so can't use
+  ``dfhack.lineedit``. The ``history_id`` parameter is some unique string that
+  the script uses to identify its command history, such as the script's name. If
+  this is the first time the history with the given ``history_id`` is being
+  accessed, it is initialized from the given file.
+
+* ``dfhack.addCommandToHistory(history_id, history_filename, command)``
+
+  Adds a command to the specified history and saves the updated history to the
+  specified file.
+
 * ``dfhack.interpreter([prompt[,history_filename[,env]]])``
 
   Starts an interactive lua interpreter, using the specified prompt
@@ -837,6 +851,7 @@ can be omitted.
 * ``dfhack.getGitXmlExpectedCommit()``
 * ``dfhack.gitXmlMatch()``
 * ``dfhack.isRelease()``
+* ``dfhack.isPrerelease()``
 
   Return information about the DFHack build in use.
 
@@ -890,7 +905,6 @@ can be omitted.
   from ``dfhack.TranslateName()``), use ``print(dfhack.df2console(text))`` to
   ensure proper display on all platforms.
 
-
 * ``dfhack.utf2df(string)``
 
   Convert a string from UTF-8 to DF's CP437 encoding.
diff --git a/library/LuaApi.cpp b/library/LuaApi.cpp
index 056a89a07..649ceb2dc 100644
--- a/library/LuaApi.cpp
+++ b/library/LuaApi.cpp
@@ -1369,6 +1369,38 @@ static void OpenRandom(lua_State *state)
     lua_pop(state, 1);
 }
 
+
+/*********************************
+* Commandline history repository *
+**********************************/
+
+static std::map<std::string, CommandHistory> commandHistories;
+
+static CommandHistory * ensureCommandHistory(std::string id,
+                                             std::string src_file) {
+    if (!commandHistories.count(id)) {
+        commandHistories[id].load(src_file.c_str());
+    }
+    return &commandHistories[id];
+}
+
+static int getCommandHistory(lua_State *state)
+{
+    std::string id = lua_tostring(state, 1);
+    std::string src_file = lua_tostring(state, 2);
+    std::vector<std::string> entries;
+    ensureCommandHistory(id, src_file)->getEntries(entries);
+    Lua::PushVector(state, entries);
+    return 1;
+}
+
+static void addCommandToHistory(std::string id, std::string src_file,
+                                std::string command) {
+    CommandHistory *history = ensureCommandHistory(id, src_file);
+    history->add(command);
+    history->save(src_file.c_str());
+}
+
 /************************
  * Wrappers for C++ API *
  ************************/
@@ -1460,6 +1492,12 @@ static const LuaWrapper::FunctionReg dfhack_module[] = {
     WRAP_VERSION_FUNC(gitXmlMatch, git_xml_match),
     WRAP_VERSION_FUNC(isRelease, is_release),
     WRAP_VERSION_FUNC(isPrerelease, is_prerelease),
+    WRAP(addCommandToHistory),
+    { NULL, NULL }
+};
+
+static const luaL_Reg dfhack_funcs[] = {
+    { "getCommandHistory", getCommandHistory },
     { NULL, NULL }
 };
 
@@ -3199,6 +3237,7 @@ void OpenDFHackApi(lua_State *state)
     OpenRandom(state);
 
     LuaWrapper::SetFunctionWrappers(state, dfhack_module);
+    luaL_setfuncs(state, dfhack_funcs, 0);
     OpenModule(state, "gui", dfhack_gui_module, dfhack_gui_funcs);
     OpenModule(state, "job", dfhack_job_module, dfhack_job_funcs);
     OpenModule(state, "units", dfhack_units_module, dfhack_units_funcs);

From f3539f06c8bf22a57acd5bedb7b06b2ff749b436 Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Fri, 15 Jul 2022 09:44:24 -0700
Subject: [PATCH 208/854] integrate hotkeys with helpdb

---
 plugins/CMakeLists.txt |  2 +-
 plugins/hotkeys.cpp    | 57 +++++++++++++++++++++++++-----------------
 2 files changed, 35 insertions(+), 24 deletions(-)

diff --git a/plugins/CMakeLists.txt b/plugins/CMakeLists.txt
index 732673926..af646759f 100644
--- a/plugins/CMakeLists.txt
+++ b/plugins/CMakeLists.txt
@@ -130,7 +130,7 @@ if(BUILD_SUPPORTED)
     dfhack_plugin(forceequip forceequip.cpp)
     dfhack_plugin(generated-creature-renamer generated-creature-renamer.cpp)
     dfhack_plugin(getplants getplants.cpp)
-    dfhack_plugin(hotkeys hotkeys.cpp)
+    dfhack_plugin(hotkeys hotkeys.cpp LINK_LIBRARIES lua)
     dfhack_plugin(infiniteSky infiniteSky.cpp)
     dfhack_plugin(isoworldremote isoworldremote.cpp PROTOBUFS isoworldremote)
     dfhack_plugin(jobutils jobutils.cpp)
diff --git a/plugins/hotkeys.cpp b/plugins/hotkeys.cpp
index e4cd13574..a91c62bdf 100644
--- a/plugins/hotkeys.cpp
+++ b/plugins/hotkeys.cpp
@@ -8,6 +8,7 @@
 #include "modules/World.h"
 #include "modules/Gui.h"
 
+#include "LuaTools.h"
 #include "PluginManager.h"
 
 DFHACK_PLUGIN("hotkeys");
@@ -54,6 +55,8 @@ static void find_active_keybindings(df::viewscreen *screen)
         valid_keys.push_back("F" + int_to_string(i));
     }
 
+    valid_keys.push_back("`");
+
     auto current_focus = Gui::getFocusString(screen);
     for (int shifted = 0; shifted < 2; shifted++)
     {
@@ -120,6 +123,29 @@ static void invoke_command(const size_t index)
     }
 }
 
+static std::string get_help(const std::string &command, bool full_help)
+{
+    auto L = Lua::Core::State;
+    color_ostream_proxy out(Core::getInstance().getConsole());
+    Lua::StackUnwinder top(L);
+
+    if (!lua_checkstack(L, 2) ||
+        !Lua::PushModulePublic(out, L, "helpdb",
+                    full_help ? "get_entry_long_help" : "get_entry_short_help"))
+        return "Help text unavailable.";
+
+    Lua::Push(L, command);
+
+    if (!Lua::SafeCall(out, L, 1, 1))
+        return "Help text unavailable.";
+
+    const char *s = lua_tostring(L, -1);
+    if (!s)
+        return "Help text unavailable.";
+
+    return s;
+}
+
 class ViewscreenHotkeys : public dfhack_viewscreen
 {
 public:
@@ -219,31 +245,16 @@ public:
         if (first[0] == '#')
             return;
 
-        Plugin *plugin = Core::getInstance().getPluginManager()->getPluginByCommand(first);
-        if (plugin)
+        OutputString(COLOR_BROWN, x, y, "Help", true, help_start);
+        string help_text = get_help(first, show_usage);
+        vector <string> lines;
+        split_string(&lines, help_text, "\n");
+        for (auto it = lines.begin(); it != lines.end() && y < gps->dimy - 4; it++)
         {
-            for (size_t i = 0; i < plugin->size(); i++)
+            auto wrapped_lines = wrapString(*it, width);
+            for (auto wit = wrapped_lines.begin(); wit != wrapped_lines.end() && y < gps->dimy - 4; wit++)
             {
-                auto pc = plugin->operator[](i);
-                if (pc.name == first)
-                {
-                    OutputString(COLOR_BROWN, x, y, "Help", true, help_start);
-                    vector <string> lines;
-                    string help_text = pc.description;
-                    if (show_usage)
-                        help_text += "\n\n" + pc.usage;
-
-                    split_string(&lines, help_text, "\n");
-                    for (auto it = lines.begin(); it != lines.end() && y < gps->dimy - 4; it++)
-                    {
-                        auto wrapped_lines = wrapString(*it, width);
-                        for (auto wit = wrapped_lines.begin(); wit != wrapped_lines.end() && y < gps->dimy - 4; wit++)
-                        {
-                            OutputString(COLOR_WHITE, x, y, *wit, true, help_start);
-                        }
-                    }
-                    break;
-                }
+                OutputString(COLOR_WHITE, x, y, *wit, true, help_start);
             }
         }
     }

From 0e704f39f7cdb4710923df648a000e7db635c0ed Mon Sep 17 00:00:00 2001
From: Tachytaenius <henryfthomson@gmail.com>
Date: Fri, 15 Jul 2022 19:28:59 +0100
Subject: [PATCH 209/854] Got the really big part of the guide done

---
 docs/Lua API.rst              |  2 +
 docs/guides/modding-guide.rst | 97 +++++++++++++++++++++++++++++++++--
 2 files changed, 95 insertions(+), 4 deletions(-)

diff --git a/docs/Lua API.rst b/docs/Lua API.rst
index f2f252c4b..c459bf1f2 100644
--- a/docs/Lua API.rst	
+++ b/docs/Lua API.rst	
@@ -5040,6 +5040,8 @@ General script API
 Importing scripts
 =================
 
+.. _reqscript:
+
 * ``dfhack.reqscript(name)`` or ``reqscript(name)``
 
   Loads a Lua script and returns its environment (i.e. a table of all global
diff --git a/docs/guides/modding-guide.rst b/docs/guides/modding-guide.rst
index d0c9cb398..aa07ca8a1 100644
--- a/docs/guides/modding-guide.rst
+++ b/docs/guides/modding-guide.rst
@@ -227,10 +227,10 @@ Now, we will add up the effect of all speed-increasing gear and apply it: ::
     end
     dfhack.units.addMoveTimer(-amount) -- Subtract amount from movement timer if currently moving
 
-Your first whole mod
---------------------
+The structure of a full mod
+---------------------------
 
-Now, you may have noticed that you won't be able to run multiple functions on tick/as event callbacks with that ``modId`` idea alone. To solve that we can just define all the functions we want and call them from a single function. Alternatively you can create multiple callbacks with your mod ID being a prefix, though this way there is no guarantee about the order if that is important.
+Now, you may have noticed that you won't be able to run multiple functions on tick/as event callbacks with that ``modId`` idea alone. To solve that we can just define all the functions we want and call them from a single function. Alternatively you can create multiple callbacks with your mod ID being a prefix, though this way there is no guarantee about the order if that is important. You will have to use your mod ID as a prefix if you register multiple ``repeat-util`` callbacks, though.
 
 Create a folder for mod projects somewhere (e.g. ``hack/my-scripts/mods/``, or maybe somewhere outside your Dwarf Fortress installation) and use your mod ID (in hyphen-case) as the name for the mod folders within it. The structure of and environment for fully-functioning modular mods are as follows:
 
@@ -245,4 +245,93 @@ Create a folder for mod projects somewhere (e.g. ``hack/my-scripts/mods/``, or m
 * An ``addToEntity.txt`` file containing lines to add to entity definitions for access to mod content would be needed if applicable.
 * Unless you want to merge your ``raw`` folder with your worlds every time you make a change to your scripts, you should add ``path/to/your-mod/raw/scripts/`` to your script paths.
 
-TODO
+Now, let's take a look at an example ``main.lua`` file. ::
+
+    local repeatUtil = require("repeat-util")
+    local eventful = require("plugins.eventful")
+
+    local modId = "example-mod"
+    local args = {...}
+
+    if args[1] == "enable" then
+        -- The modules and what they link into the environment with
+        -- Each module exports functions named the way they are to be used
+        local moduleA = dfhack.reqscript("example-mod/module-a") -- on load, every tick
+        local moduleB = dfhack.reqscript("example-mod/module-b") -- on load, on unload, onReactionComplete
+        local moduleC = dfhack.reqscript("example-mod/module-c") -- onReactionComplete
+        local moduleD = dfhack.reqscript("example-mod/module-d") -- every 100 frames, onProjItemCheckMovement, onProjUnitCheckMovement
+
+        -- Set up the modules
+        -- Order: on load, repeat-util ticks (from smallest interval to largest), days, months, years, and frames, then eventful callbacks in the same order as the first modules to use them
+
+        moduleA.onLoad()
+        moduleB.onLoad()
+
+        repeatUtil.scheduleEvery(modId .. " 1 ticks", 1, "ticks", function()
+            moduleA.every1Tick()
+        end)
+
+        repeatUtil.scheduleEvery(modID .. " 100 frames", 1, "frames", function()
+            moduleD.every100Frames()
+        end
+
+        eventful.onReactionComplete[modId] = function(...)
+            -- Pass the event's parameters to the listeners, whatever they are
+            moduleB.onReactionComplete(...)
+            moduleC.onReactionComplete(...)
+        end
+
+        eventful.onProjItemCheckMovement[modId] = function(...)
+            moduleD.onProjItemCheckMovement(...)
+        end
+
+        eventful.onProjUnitCheckMovement[modId] = function(...)
+            moduleD.onProjUnitCheckMovement(...)
+        end
+
+        print("Example mod enabled")
+    elseif args[1] == "disable" then
+        -- Order: on unload, then cancel the callbacks in the same order as above
+
+        moduleA.onUnload()
+
+        repeatUtil.cancel(modId .. " 1 ticks")
+        repeatUtil.cancel(modId .. " 100 frames")
+
+        eventful.onReactionComplete[modId] = nil
+        eventful.onProjItemCheckMovement[modId] = nil
+        eventful.onProjUnitCheckMovement[modId] = nil
+
+        print("Example mod disabled")
+    elseif not args[1] then
+        dfhack.printerr("No argument given to example-mod/main")
+    else
+        dfhack.printerr("Unknown argument \"" .. args[1] .. "\" to example-mod/main")
+    end
+
+You can see there are four cases depending on arguments. Set up the callbacks and call on-load functions if enabled, dismantle the callbacks and call on-unload functions if disabled, no arguments given, and invalid argument(s) given.
+
+Here is an example of an ``raw/init.d/`` file: ::
+
+    dfhack.run_command("example-mod/main enable") -- Very simple. Could be called "init-example-mod.lua"
+
+Here is what ``raw/scripts/module-a.lua`` would look like: ::
+
+    --@ module = true
+    -- The above line is required for dfhack.reqscript to work
+
+    function onLoad() -- global variables are exported
+        -- blah
+    end
+
+    local function usedByOnTick() -- local variables are not exported
+        -- blah
+    end
+
+    function onTick() -- exported
+        for blah in ipairs(blah) do
+            usedByOnTick()
+        end
+    end
+
+It is recommended to check `reqscript <reqscript>`'s documentation. ``reqscript`` caches scripts but will reload scripts that have changed (it checks the file's last modification date) so you can do live editing *and* have common tables et cetera between scripts that require the same module.

From fcd8839c0d81da1e47ab7e2902caf91e27feaa97 Mon Sep 17 00:00:00 2001
From: Tachytaenius <henryfthomson@gmail.com>
Date: Fri, 15 Jul 2022 19:43:48 +0100
Subject: [PATCH 210/854] Wrap lines to 80 characters

---
 docs/guides/modding-guide.rst | 213 +++++++++++++++++++++++++---------
 1 file changed, 161 insertions(+), 52 deletions(-)

diff --git a/docs/guides/modding-guide.rst b/docs/guides/modding-guide.rst
index aa07ca8a1..cebd34745 100644
--- a/docs/guides/modding-guide.rst
+++ b/docs/guides/modding-guide.rst
@@ -6,41 +6,70 @@ DFHack modding guide
 What is a mod/script?
 ---------------------
 
-A script is a single file that can be run as a command in DFHack, like something that modifies or displays game data on request. A mod is something you install to get persistent behavioural changes in the game and/or add new content. DFHack mods contain and use scripts as well as often having a raw mod component.
+A script is a single file that can be run as a command in DFHack, like something
+that modifies or displays game data on request. A mod is something you install
+to get persistent behavioural changes in the game and/or add new content. DFHack
+mods contain and use scripts as well as often having a raw mod component.
 
-DFHack scripts are written in Lua. If you don't already know Lua, there's a great primer at https://www.lua.org/pil/1.html.
+DFHack scripts are written in Lua. If you don't already know Lua, there's a
+great primer at https://www.lua.org/pil/1.html.
 
 Why not just use raw modding?
 -----------------------------
 
-For many things it's either completely and only (sensibly) doable in raws or completely and only doable with DFHack. For mods where DFHack is an alternative and not the only option, it's much less hacky, easier to maintain, and easier to extend, and is not prone to side-effects. A great example is adding a syndrome when a reaction is performed requiring an exploding boulder in raws but having dedicated tools for it if you use DFHack. Many things will require a mix of raw modding and DFHack.
+For many things it's either completely and only (sensibly) doable in raws or
+completely and only doable with DFHack. For mods where DFHack is an alternative
+and not the only option, it's much less hacky, easier to maintain, and easier to
+extend, and is not prone to side-effects. A great example is adding a syndrome
+when a reaction is performed requiring an exploding boulder in raws but having
+dedicated tools for it if you use DFHack. Many things will require a mix of raw
+modding and DFHack.
 
 A mod-maker's development environment
 -------------------------------------
 
-Scripts can be run from a world's ``raw/scripts/`` directory, and (configurably) are run by default from ``hack/scripts/``. Scripts in ``raw/init.d/`` are automatically run on world load. Scripts within the raws are a component for more advanced mods.
+Scripts can be run from a world's ``raw/scripts/`` directory, and (configurably)
+are run by default from ``hack/scripts/``. Scripts in ``raw/init.d/`` are
+automatically run on world load. Scripts within the raws are a component for
+more advanced mods.
 
-A script is run by writing its path and name from a script path folder without the file extension into a DFHack command prompt (in-game or the external one). E.g. ``gui/gm-editor`` for ``hack/scripts/gui/gm-editor.lua``.
+A script is run by writing its path and name from a script path folder without
+the file extension into a DFHack command prompt (in-game or the external one).
+E.g. ``gui/gm-editor`` for ``hack/scripts/gui/gm-editor.lua``.
 
-You can make all your scripts in ``hack/scripts/``, but this is not recommended as it makes things much harder to maintain each update. It's recommended to make a folder with a name like ``own-scripts`` and add it to ``dfhack-config/script-paths.txt``. You could also make a folder for external installed scripts from the internet that are not in ``hack/scripts/``. You can prepend your script paths entries with a ``+`` so that they take precedence over other folders.
+You can make all your scripts in ``hack/scripts/``, but this is not recommended
+as it makes things much harder to maintain each update. It's recommended to make
+a folder with a name like ``own-scripts`` and add it to
+``dfhack-config/script-paths.txt``. You could also make a folder for external
+installed scripts from the internet that are not in ``hack/scripts/``. You can
+prepend your script paths entries with a ``+`` so that they take precedence over
+other folders.
 
-If your mod is installed into ``raw/scripts/`` be aware that the copies of the scripts in ``data/save/*/raw/`` are checked first and will run instead of any changes you make to an in-development copy outside of a raw folder.
+If your mod is installed into ``raw/scripts/`` be aware that the copies of the
+scripts in ``data/save/*/raw/`` are checked first and will run instead of any
+changes you make to an in-development copy outside of a raw folder.
 
 The structure of the game
 -------------------------
 
-"The game" is in the global variable `df <lua-df>`. The game's memory can be found in ``df.global``, containing things like the list of all items, whether to reindex pathfinding, et cetera. Also relevant to us in ``df`` are the various types found in the game, e.g. ``df.pronoun_type`` which we will be using.
+"The game" is in the global variable `df <lua-df>`. The game's memory can be
+found in ``df.global``, containing things like the list of all items, whether to
+reindex pathfinding, et cetera. Also relevant to us in ``df`` are the various
+types found in the game, e.g. ``df.pronoun_type`` which we will be using.
 
 Your first script
 -----------------
 
-So! It's time to write your first script. We are going to make a script that will get the pronoun type of the currently selected unit (there are many contexts where the function that gets the currently selected unit works).
+So! It's time to write your first script. We are going to make a script that
+will get the pronoun type of the currently selected unit (there are many
+contexts where the function that gets the currently selected unit works).
 
 First line, we get the unit. ::
 
     local unit = dfhack.gui.getSelectedUnit()
 
-If no unit is selected, an error message will be printed (which can be silenced by passing ``true`` to ``getSelectedUnit``) and ``unit`` will be ``nil``.
+If no unit is selected, an error message will be printed (which can be silenced
+by passing ``true`` to ``getSelectedUnit``) and ``unit`` will be ``nil``.
 
 If ``unit`` is ``nil``, we don't want the script to run anymore. ::
 
@@ -48,36 +77,60 @@ If ``unit`` is ``nil``, we don't want the script to run anymore. ::
         return
     end
 
-Now, the field ``sex`` in a unit is an integer, but each integer corresponds to a string value (it, she, or he). We get this value by indexing the bidirectional map ``df.pronoun_type`` with an integer from the unit. Indexing the other way, with one of the strings, will yield its corresponding number. So: ::
+Now, the field ``sex`` in a unit is an integer, but each integer corresponds to
+a string value (it, she, or he). We get this value by indexing the bidirectional
+map ``df.pronoun_type`` with an integer from the unit. Indexing the other way,
+with one of the strings, will yield its corresponding number. So: ::
 
     local pronounTypeString = df.pronoun_type[unit.sex]
     print(pronounTypeString)
 
-Simple. Save this as a Lua file in your own scripts directory and run it as shown before when focused on a unit one way or another.
+Simple. Save this as a Lua file in your own scripts directory and run it as
+shown before when focused on a unit one way or another.
 
 Getting used to gm-editor and df-structures exploration
 -------------------------------------------------------
 
-So how could you have known about the field and type we just used? Well, there are two main tools for discovering the various fields in the game's data structures. The first is the ``df-structures`` repository (at https://github.com/DFHack/df-structures) that contains XML files denoting the contents of the game's structures. The second is the script ``gui/gm-editor`` which is an interactive data explorer. You can run the script while objects like units are selected to view the data within them. You can also pass ``scr`` as an argument to the script to view the data for the current screen. Press ? while the script is active to view help.
+So how could you have known about the field and type we just used? Well, there
+are two main tools for discovering the various fields in the game's data
+structures. The first is the ``df-structures`` repository
+(at https://github.com/DFHack/df-structures) that contains XML files denoting
+the contents of the game's structures. The second is the script
+``gui/gm-editor`` which is an interactive data explorer. You can run the script
+while objects like units are selected to view the data within them. You can also
+pass ``scr`` as an argument to the script to view the data for the current
+screen. Press ? while the script is active to view help.
 
-Familiarising yourself with the many structs of the game will help with ideas immensely, and you can always ask for help in the right places (e.g. DFHack's Discord).
+Familiarising yourself with the many structs of the game will help with ideas
+immensely, and you can always ask for help in the right places (e.g. DFHack's
+Discord).
 
 Detecting triggers
 ------------------
 
-One main method for getting new behaviour into the game is callback functions. There are two main libraries for this, ``repeat-util`` and ``eventful``. ``repeat-util`` is used to run a function once per configurable number of frames (paused or unpaused), ticks (unpaused), in-game days, months, or years. For adding behaviour you will most often want something to run once a tick. ``eventful`` is used to get code to run (with special parameters!) when something happens in the game, like a reaction or job being completed or a projectile moving.
+One main method for getting new behaviour into the game is callback functions.
+There are two main libraries for this, ``repeat-util`` and ``eventful``.
+``repeat-util`` is used to run a function once per configurable number of frames
+(paused or unpaused), ticks (unpaused), in-game days, months, or years. For
+adding behaviour you will most often want something to run once a tick.
+``eventful`` is used to get code to run (with special parameters!) when
+something happens in the game, like a reaction or job being completed or a
+projectile moving.
 
-To get something to run once per tick, we would want to call ``repeat-util``'s ``scheduleEvery`` function.
+To get something to run once per tick, we would want to call ``repeat-util``'s
+``scheduleEvery`` function.
 
 First, we load the module: ::
 
     local repeatUtil = require("repeat-util")
 
-Both ``repeat-util`` and ``eventful`` require keys for registered callbacks. It's recommended to use something like a mod id. ::
+Both ``repeat-util`` and ``eventful`` require keys for registered callbacks.
+It's recommended to use something like a mod id. ::
 
     local modId = "callback-example-mod"
 
-Then, we pass the key, amount of time units between function calls, what the time units are, and finally the callback function itself: ::
+Then, we pass the key, amount of time units between function calls, what the
+time units are, and finally the callback function itself: ::
 
     repeatUtil.scheduleEvery(modId, 1, "ticks", function()
         -- Do something like iterating over all active units
@@ -90,20 +143,29 @@ Then, we pass the key, amount of time units between function calls, what the tim
 
     local eventful = require("plugins.eventful")
 
-``eventful`` contains a table for each event which you populate with functions. Each function in the table is then called with the appropriate arguments when the event occurs. So, for example, to print the position of a moving (item) projectile: ::
+``eventful`` contains a table for each event which you populate with functions.
+Each function in the table is then called with the appropriate arguments when
+the event occurs. So, for example, to print the position of a moving (item)
+projectile: ::
 
     eventful.onProjItemCheckMovement[modId] = function(projectile)
         print(projectile.cur_pos.x, projectile.cur_pos.y, projectile.cur_pos.z)
     end
 
-Check the full list of events at https://docs.dfhack.org/en/stable/docs/Lua%20API.html#list-of-events.
+Check the full list of events at
+https://docs.dfhack.org/en/stable/docs/Lua%20API.html#list-of-events.
 
 Custom raw tokens
 -----------------
 
-In this section, we are going to use `custom raw tokens <custom-raw-tokens>` applied to a reaction to transfer the material of a reagent to a product as a handle improvement (like on artifact buckets), and then we are going to see how you could make boots that make units go faster when worn. Both of these involve custom raw tokens.
+In this section, we are going to use `custom raw tokens <custom-raw-tokens>`
+applied to a reaction to transfer the material of a reagent to a product as a
+handle improvement (like on artifact buckets), and then we are going to see how
+you could make boots that make units go faster when worn. Both of these involve
+custom raw tokens.
 
-First, let's define a custom crossbow with its own custom reaction. The crossbow: ::
+First, let's define a custom crossbow with its own custom reaction. The
+crossbow: ::
 
     [ITEM_WEAPON:ITEM_WEAPON_CROSSBOW_SIEGE]
         [NAME:crossbow:crossbows]
@@ -119,7 +181,8 @@ First, let's define a custom crossbow with its own custom reaction. The crossbow
             [ATTACK_PREPARE_AND_RECOVER:3:3]
         [SIEGE_CROSSBOW_MOD_FIRE_RATE_MULTIPLIER:2] custom token (you'll see)
 
-The reaction to make it (you would add the reaction and not the weapon to an entity raw): ::
+The reaction to make it (you would add the reaction and not the weapon to an
+entity raw): ::
 
     [REACTION:MAKE_SIEGE_CROSSBOW]
         [NAME:make siege crossbow]
@@ -132,10 +195,13 @@ The reaction to make it (you would add the reaction and not the weapon to an ent
             [ANY_PLANT_MATERIAL]
         [REAGENT:handle 2:1:BLOCKS:NONE:NONE:NONE]
             [ANY_PLANT_MATERIAL]
-        [SIEGE_CROSSBOW_MOD_TRANSFER_HANDLE_MATERIAL_TO_PRODUCT_IMPROVEMENT:1] another custom token
+        [SIEGE_CROSSBOW_MOD_TRANSFER_HANDLE_MATERIAL_TO_PRODUCT_IMPROVEMENT:1]
+            another custom token
         [PRODUCT:100:1:WEAPON:ITEM_WEAPON_CROSSBOW_SIEGE:GET_MATERIAL_FROM_REAGENT:bar:NONE]
 
-So, we are going to use the ``eventful`` module to make it so that (after the script is run) when this crossbow is crafted, it will have two handles, each with the material given by the block reagents.
+So, we are going to use the ``eventful`` module to make it so that (after the
+script is run) when this crossbow is crafted, it will have two handles, each
+with the material given by the block reagents.
 
 First, require the modules we are going to use. ::
 
@@ -145,15 +211,20 @@ First, require the modules we are going to use. ::
 Now, let's make a callback: ::
 
     local modId = "siege-crossbow-mod"
-    eventful.onReactionComplete[modId] = function(reaction, reactionProduct, unit, inputItems, inputReagents, outputItems)
+    eventful.onReactionComplete[modId] = function(reaction, reactionProduct,
+    unit, inputItems, inputReagents, outputItems)
 
-First, we check to see if it the reaction that just happened is relevant to this callback: ::
+First, we check to see if it the reaction that just happened is relevant to this
+callback: ::
 
-    if not customRawTokens.getToken(reaction, "SIEGE_CROSSBOW_MOD_TRANSFER_HANDLE_MATERIAL_TO_PRODUCT_IMPROVEMENT") then
+    if not customRawTokens.getToken(reaction,
+        "SIEGE_CROSSBOW_MOD_TRANSFER_HANDLE_MATERIAL_TO_PRODUCT_IMPROVEMENT")
+    then
         return
     end
 
-Then, we get the product number listed. Next, for every reagent, if the reagent name starts with "handle" then we get the corresponding item, and... ::
+Then, we get the product number listed. Next, for every reagent, if the reagent
+name starts with "handle" then we get the corresponding item, and... ::
 
     for i, reagent in ipairs(inputReagents) do
         if reagent.code:sub(1, #"handle") == "handle" then
@@ -167,9 +238,9 @@ Then, we get the product number listed. Next, for every reagent, if the reagent
     -- new.maker = outputItems[0].maker -- not a typical improvement
     new.type = df.itemimprovement_specific_type.HANDLE
     outputItems[productNumber - 1].improvements:insert("#", new)
-    -- break -- multiple handles, multiple "the handle is made from"s, so no break
 
-It's all a bit loose and hacky but it works, at least if you don't have multiple stacks filling up one reagent.
+It's all a bit loose and hacky but it works, at least if you don't have multiple
+stacks filling up one reagent.
 
 Let's also make some code to modify the fire rate of the siege crossbow. ::
 
@@ -189,10 +260,12 @@ Let's also make some code to modify the fire rate of the siege crossbow. ::
         end
 
         local multiplier = tonumber(customRawTokens.getToken(weapon.subtype, "SIEGE_CROSSBOW_MOD_FIRE_RATE_MULTIPLIER")) or 1
-        firer.counters.think_counter = math.floor(firer.counters.think_counter * multiplier)
+        firer.counters.think_counter = math.floor(firer.counters.think_counter *
+            multiplier)
     end
 
-Now, let's see how we could make some "pegasus boots". First, let's define the item in the raws: ::
+Now, let's see how we could make some "pegasus boots". First, let's define the
+item in the raws: ::
 
     [ITEM_SHOES:ITEM_SHOES_BOOTS_PEGASUS]
         [NAME:pegasus boot:pegasus boots]
@@ -207,13 +280,16 @@ Now, let's see how we could make some "pegasus boots". First, let's define the i
         [METAL]
         [LEATHER]
         [HARD]
-        [PEGASUS_BOOTS_MOD_MOVEMENT_TIMER_REDUCTION_PER_TICK:5] custom raw token (you don't have to comment this every time)
+        [PEGASUS_BOOTS_MOD_MOVEMENT_TIMER_REDUCTION_PER_TICK:5] custom raw token
+            (you don't have to comment this every time)
 
 Then, let's make a ``repeat-util`` callback for once a tick: ::
 
     repeatUtil.scheduleEvery(modId, 1, "ticks", function()
 
-Let's iterate over every active unit, and for every unit, initialise a variable for how much we are going to take from their movement timer and iterate over all their worn items: ::
+Let's iterate over every active unit, and for every unit, initialise a variable
+for how much we are going to take from their movement timer and iterate over all
+their worn items: ::
 
     for _, unit in ipairs(df.global.world.units.active) do
         local amount = 0
@@ -225,25 +301,44 @@ Now, we will add up the effect of all speed-increasing gear and apply it: ::
             amount = amount + tonumber((customRawTokens.getToken(entry.item, "PEGASUS_BOOTS_MOD_MOVEMENT_TIMER_REDUCTION_PER_TICK")) or 0)
         end
     end
-    dfhack.units.addMoveTimer(-amount) -- Subtract amount from movement timer if currently moving
+    dfhack.units.addMoveTimer(-amount) -- Subtract amount from movement timer if
+    currently moving
 
 The structure of a full mod
 ---------------------------
 
-Now, you may have noticed that you won't be able to run multiple functions on tick/as event callbacks with that ``modId`` idea alone. To solve that we can just define all the functions we want and call them from a single function. Alternatively you can create multiple callbacks with your mod ID being a prefix, though this way there is no guarantee about the order if that is important. You will have to use your mod ID as a prefix if you register multiple ``repeat-util`` callbacks, though.
+Now, you may have noticed that you won't be able to run multiple functions on
+tick/as event callbacks with that ``modId`` idea alone. To solve that we can
+just define all the functions we want and call them from a single function.
+Alternatively you can create multiple callbacks with your mod ID being a prefix,
+though this way there is no guarantee about the order if that is important. You
+will have to use your mod ID as a prefix if you register multiple
+``repeat-util`` callbacks, though.
 
-Create a folder for mod projects somewhere (e.g. ``hack/my-scripts/mods/``, or maybe somewhere outside your Dwarf Fortress installation) and use your mod ID (in hyphen-case) as the name for the mod folders within it. The structure of and environment for fully-functioning modular mods are as follows:
+Create a folder for mod projects somewhere (e.g. ``hack/my-scripts/mods/``, or
+maybe somewhere outside your Dwarf Fortress installation) and use your mod ID
+(in hyphen-case) as the name for the mod folders within it. The structure of and
+environment for fully-functioning modular mods are as follows:
 
 * The main content of the mod would be in the ``raw`` folder:
 
-  * A Lua file in ``raw/init.d/`` to initialise the mod by calling ``your-mod-id/main/ enable``.
+  * A Lua file in ``raw/init.d/`` to initialise the mod by calling
+    ``your-mod-id/main/ enable``.
   * Raw content (potentially with custom raw tokens) in ``raw/objects/``.
-  * A subfolder for your mod in ``raw/scripts/`` containing a ``main.lua`` file (an example of which we will see) and all the modules containing the functions used in callbacks to ``repeat-util`` and ``eventful``. Potentially a file containing constant definitions used by your mod (perhaps defined by the game, like the acceleration of parabolic projectiles due to gravity (``4900``)) too.
+  * A subfolder for your mod in ``raw/scripts/`` containing a ``main.lua`` file
+    (an example of which we will see) and all the modules containing the functions
+    used in callbacks to ``repeat-util`` and ``eventful``. Potentially a file
+    containing constant definitions used by your mod (perhaps defined by the
+    game, like the acceleration of parabolic projectiles due to gravity
+    (``4900``)) too.
 
 * Using git within each mod folder is recommended, but not required.
 * A ``readme.md`` markdown file is also recommended.
-* An ``addToEntity.txt`` file containing lines to add to entity definitions for access to mod content would be needed if applicable.
-* Unless you want to merge your ``raw`` folder with your worlds every time you make a change to your scripts, you should add ``path/to/your-mod/raw/scripts/`` to your script paths.
+* An ``addToEntity.txt`` file containing lines to add to entity definitions for
+  access to mod content would be needed if applicable.
+* Unless you want to merge your ``raw`` folder with your worlds every time you
+  make a change to your scripts, you should add
+  ``path/to/your-mod/raw/scripts/`` to your script paths.
 
 Now, let's take a look at an example ``main.lua`` file. ::
 
@@ -256,13 +351,19 @@ Now, let's take a look at an example ``main.lua`` file. ::
     if args[1] == "enable" then
         -- The modules and what they link into the environment with
         -- Each module exports functions named the way they are to be used
-        local moduleA = dfhack.reqscript("example-mod/module-a") -- on load, every tick
-        local moduleB = dfhack.reqscript("example-mod/module-b") -- on load, on unload, onReactionComplete
-        local moduleC = dfhack.reqscript("example-mod/module-c") -- onReactionComplete
-        local moduleD = dfhack.reqscript("example-mod/module-d") -- every 100 frames, onProjItemCheckMovement, onProjUnitCheckMovement
+        local moduleA = dfhack.reqscript("example-mod/module-a") -- on load,
+            -- every tick
+        local moduleB = dfhack.reqscript("example-mod/module-b") -- on load,
+            -- on unload, onReactionComplete
+        local moduleC = dfhack.reqscript("example-mod/module-c")
+            -- onReactionComplete
+        local moduleD = dfhack.reqscript("example-mod/module-d") -- every 100
+            -- frames, onProjItemCheckMovement, onProjUnitCheckMovement
 
         -- Set up the modules
-        -- Order: on load, repeat-util ticks (from smallest interval to largest), days, months, years, and frames, then eventful callbacks in the same order as the first modules to use them
+        -- Order: on load, repeat-util ticks (from smallest interval to
+        -- largest), days, months, years, and frames, then eventful callbacks in
+        -- the same order as the first modules to use them
 
         moduleA.onLoad()
         moduleB.onLoad()
@@ -291,7 +392,8 @@ Now, let's take a look at an example ``main.lua`` file. ::
 
         print("Example mod enabled")
     elseif args[1] == "disable" then
-        -- Order: on unload, then cancel the callbacks in the same order as above
+        -- Order: on unload, then cancel the callbacks in the same order as
+        -- above
 
         moduleA.onUnload()
 
@@ -306,14 +408,18 @@ Now, let's take a look at an example ``main.lua`` file. ::
     elseif not args[1] then
         dfhack.printerr("No argument given to example-mod/main")
     else
-        dfhack.printerr("Unknown argument \"" .. args[1] .. "\" to example-mod/main")
+        dfhack.printerr("Unknown argument \"" .. args[1] ..
+            "\" to example-mod/main")
     end
 
-You can see there are four cases depending on arguments. Set up the callbacks and call on-load functions if enabled, dismantle the callbacks and call on-unload functions if disabled, no arguments given, and invalid argument(s) given.
+You can see there are four cases depending on arguments. Set up the callbacks
+and call on load functions if enabled, dismantle the callbacks and call on
+unload functions if disabled, no arguments given, and invalid argument(s) given.
 
 Here is an example of an ``raw/init.d/`` file: ::
 
-    dfhack.run_command("example-mod/main enable") -- Very simple. Could be called "init-example-mod.lua"
+    dfhack.run_command("example-mod/main enable") -- Very simple. Could be
+        -- called "init-example-mod.lua"
 
 Here is what ``raw/scripts/module-a.lua`` would look like: ::
 
@@ -334,4 +440,7 @@ Here is what ``raw/scripts/module-a.lua`` would look like: ::
         end
     end
 
-It is recommended to check `reqscript <reqscript>`'s documentation. ``reqscript`` caches scripts but will reload scripts that have changed (it checks the file's last modification date) so you can do live editing *and* have common tables et cetera between scripts that require the same module.
+It is recommended to check `reqscript <reqscript>`'s documentation.
+``reqscript`` caches scripts but will reload scripts that have changed (it
+checks the file's last modification date) so you can do live editing *and* have
+common tables et cetera between scripts that require the same module.

From 7cf5a7dac90a5675c90336e67de56dad94d22aa9 Mon Sep 17 00:00:00 2001
From: Tachytaenius <henryfthomson@gmail.com>
Date: Fri, 15 Jul 2022 19:44:21 +0100
Subject: [PATCH 211/854] main.lua --> raw/scripts/main.lua

---
 docs/guides/modding-guide.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/guides/modding-guide.rst b/docs/guides/modding-guide.rst
index cebd34745..e35422aef 100644
--- a/docs/guides/modding-guide.rst
+++ b/docs/guides/modding-guide.rst
@@ -340,7 +340,7 @@ environment for fully-functioning modular mods are as follows:
   make a change to your scripts, you should add
   ``path/to/your-mod/raw/scripts/`` to your script paths.
 
-Now, let's take a look at an example ``main.lua`` file. ::
+Now, let's take a look at an example ``raw/scripts/main.lua`` file. ::
 
     local repeatUtil = require("repeat-util")
     local eventful = require("plugins.eventful")

From 9b340a76306e2b5aaebaf83fcd787c3ecf81502a Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Fri, 15 Jul 2022 13:46:01 -0700
Subject: [PATCH 212/854] support submit2 for EditFields

---
 docs/Lua API.rst            |  1 +
 library/lua/gui/widgets.lua | 12 ++++++++++++
 2 files changed, 13 insertions(+)

diff --git a/docs/Lua API.rst b/docs/Lua API.rst
index fb2b18291..6ebdce99c 100644
--- a/docs/Lua API.rst	
+++ b/docs/Lua API.rst	
@@ -3882,6 +3882,7 @@ Attributes:
           If it returns false, the character is ignored.
 :on_change: Change notification callback; used as ``on_change(new_text,old_text)``.
 :on_submit: Enter key callback; if set the field will handle the key and call ``on_submit(text)``.
+:on_submit2: Shift-Enter key callback; if set the field will handle the key and call ``on_submit2(text)``.
 :key: If specified, the field is disabled until this key is pressed. Must be given as a string.
 :key_sep: If specified, will be used to customize how the activation key is
           displayed. See ``token.key_sep`` in the ``Label`` documentation below.
diff --git a/library/lua/gui/widgets.lua b/library/lua/gui/widgets.lua
index d5d94ffd9..07ce3422d 100644
--- a/library/lua/gui/widgets.lua
+++ b/library/lua/gui/widgets.lua
@@ -184,6 +184,7 @@ EditField.ATTRS{
     on_char = DEFAULT_NIL,
     on_change = DEFAULT_NIL,
     on_submit = DEFAULT_NIL,
+    on_submit2 = DEFAULT_NIL,
     key = DEFAULT_NIL,
     key_sep = DEFAULT_NIL,
     frame = {h=1},
@@ -253,6 +254,17 @@ function EditField:onInput(keys)
         return not not self.key
     end
 
+    if keys.SEC_SELECT then
+        if self.key then
+            self:setFocus(false)
+        end
+        if self.on_submit2 then
+            self.on_submit2(self.text)
+            return true
+        end
+        return not not self.key
+    end
+
     if keys._STRING then
         local old = self.text
         if keys._STRING == 0 then

From 585f6aad333557153be659c2466068dd3e3eaf46 Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Fri, 15 Jul 2022 15:45:03 -0700
Subject: [PATCH 213/854] fix extra space within bold segment for keybindings

---
 conf.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/conf.py b/conf.py
index 461fa789b..831833e26 100644
--- a/conf.py
+++ b/conf.py
@@ -69,7 +69,8 @@ def dfhack_keybind_role_func(role, rawtext, text, lineno, inliner,
     for cmd, key, ctx in KEYBINDS[text]:
         n = nodes.paragraph()
         newnode += n
-        n += nodes.strong('Keybinding: ', 'Keybinding: ')
+        n += nodes.strong('Keybinding:', 'Keybinding:')
+        n += nodes.inline(' ', ' ')
         for k in key:
             n += nodes.inline(k, k, classes=['kbd'])
         if cmd != text:

From 27425e47f633356135a21a74a6f5f59a1002e4ea Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Fri, 15 Jul 2022 22:22:51 -0700
Subject: [PATCH 214/854] support cursor movement in EditFields

---
 docs/Lua API.rst            |  7 ++++
 library/lua/gui/widgets.lua | 77 +++++++++++++++++++++++++++++++------
 2 files changed, 72 insertions(+), 12 deletions(-)

diff --git a/docs/Lua API.rst b/docs/Lua API.rst
index 6ebdce99c..e884383d5 100644
--- a/docs/Lua API.rst	
+++ b/docs/Lua API.rst	
@@ -3904,6 +3904,13 @@ and then call the ``on_submit`` callback. Pressing the Escape key will also
 release keyboard focus, but first it will restore the text that was displayed
 before the ``EditField`` gained focus and then call the ``on_change`` callback.
 
+The ``EditField`` cursor can be moved to where you want to insert/remove text.
+The following cursor movement keys are recognized:
+
+- Left/Right arrow: move the cursor one character to the left or right.
+- Ctrl-Left/Right arrow: move the cursor one word to the left or right.
+- Alt-Left/Right arrow: move the cursor to the beginning/end of the text.
+
 Label class
 -----------
 
diff --git a/library/lua/gui/widgets.lua b/library/lua/gui/widgets.lua
index 07ce3422d..d09bdf9cd 100644
--- a/library/lua/gui/widgets.lua
+++ b/library/lua/gui/widgets.lua
@@ -197,6 +197,8 @@ function EditField:init()
         self:setFocus(true)
     end
 
+    self.cursor = 1
+
     self:addviews{HotkeyLabel{frame={t=0,l=0},
                               key=self.key,
                               key_sep=self.key_sep,
@@ -208,6 +210,19 @@ function EditField:getPreferredFocusState()
     return not self.key
 end
 
+function EditField:setCursor(cursor)
+    if not cursor or cursor > #self.text then
+        self.cursor = #self.text + 1
+        return
+    end
+    self.cursor = math.max(1, cursor)
+end
+
+function EditField:setText(text, cursor)
+    self.text = text
+    self:setCursor(cursor)
+end
+
 function EditField:postUpdateLayout()
     self.text_offset = self.subviews[1]:getTextWidth()
 end
@@ -215,14 +230,29 @@ end
 function EditField:onRenderBody(dc)
     dc:pen(self.text_pen or COLOR_LIGHTCYAN):fill(0,0,dc.width-1,0)
 
-    local cursor = '_'
+    local cursor_char = '_'
     if not self.active or not self.focus or gui.blink_visible(300) then
-        cursor = ' '
+        cursor_char = (self.cursor > #self.text) and ' ' or
+                                        self.text:sub(self.cursor, self.cursor)
     end
-    local txt = self.text .. cursor
+    local txt = self.text:sub(1, self.cursor - 1) .. cursor_char ..
+                                                self.text:sub(self.cursor + 1)
     local max_width = dc.width - self.text_offset
     if #txt > max_width then
-        txt = string.char(27)..string.sub(txt, #txt-max_width+2)
+        -- get the substring in the vicinity of the cursor
+        max_width = max_width - 2
+        local half_width = math.floor(max_width/2)
+        local start_pos = math.max(1, self.cursor-half_width)
+        local end_pos = math.min(#txt, self.cursor+half_width-1)
+        if self.cursor + half_width > #txt then
+            start_pos = #txt - max_width
+        end
+        if self.cursor - half_width <= 1 then
+            end_pos = max_width + 1
+        end
+        txt = ('%s%s%s'):format(start_pos == 1 and '' or string.char(27),
+                                txt:sub(start_pos, end_pos),
+                                end_pos == #txt and '' or string.char(26))
     end
     dc:advance(self.text_offset):string(txt)
 end
@@ -252,9 +282,7 @@ function EditField:onInput(keys)
             return true
         end
         return not not self.key
-    end
-
-    if keys.SEC_SELECT then
+    elseif keys.SEC_SELECT then
         if self.key then
             self:setFocus(false)
         end
@@ -263,17 +291,42 @@ function EditField:onInput(keys)
             return true
         end
         return not not self.key
-    end
-
-    if keys._STRING then
+    elseif keys.CURSOR_LEFT then
+        self.cursor = math.max(1, self.cursor - 1)
+        return true
+    elseif keys.A_MOVE_W_DOWN then -- Ctrl-Left (prev word start)
+        local _, prev_word_start = self.text:sub(1, self.cursor-1):
+                                                    find('.*[^%w_%-]+[%w_%-]')
+        self.cursor = prev_word_start or 1
+        return true
+    elseif keys.A_CARE_MOVE_W then -- Alt-Left (home)
+        self.cursor = 1
+        return true
+    elseif keys.CURSOR_RIGHT then
+        self.cursor = math.min(self.cursor + 1, #self.text + 1)
+        return true
+    elseif keys.A_MOVE_E_DOWN then -- Ctrl-Right (next word end)
+        local _, next_word_end = self.text:find('[%w_%-]+[^%w_%-]', self.cursor)
+        self.cursor = next_word_end or #self.text + 1
+        return true
+    elseif keys.A_CARE_MOVE_E then -- Alt-Right (end)
+        self.cursor = #self.text + 1
+        return true
+    elseif keys._STRING then
         local old = self.text
         if keys._STRING == 0 then
             -- handle backspace
-            self.text = string.sub(old, 1, #old-1)
+            local del_pos = self.cursor - 1
+            if del_pos > 0 then
+                self.text = old:sub(1, del_pos-1) .. old:sub(del_pos+1)
+                self.cursor = del_pos
+            end
         else
             local cv = string.char(keys._STRING)
             if not self.on_char or self.on_char(cv, old) then
-                self.text = old .. cv
+                self.text = old:sub(1, self.cursor-1) .. cv ..
+                                                        old:sub(self.cursor)
+                self.cursor = self.cursor + 1
             end
         end
         if self.on_change and self.text ~= old then

From f65f36ffee84e5671b96249426d1e6724e898357 Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Sat, 16 Jul 2022 22:03:39 -0700
Subject: [PATCH 215/854] move the cursor in an EditField on mouse lclick

---
 library/lua/gui/widgets.lua | 29 +++++++++++++++++------------
 1 file changed, 17 insertions(+), 12 deletions(-)

diff --git a/library/lua/gui/widgets.lua b/library/lua/gui/widgets.lua
index d09bdf9cd..2dc197064 100644
--- a/library/lua/gui/widgets.lua
+++ b/library/lua/gui/widgets.lua
@@ -265,7 +265,7 @@ function EditField:onInput(keys)
 
     if self.key and keys.LEAVESCREEN then
         local old = self.text
-        self.text = self.saved_text
+        self:setText(self.saved_text)
         if self.on_change and old ~= self.saved_text then
             self.on_change(self.text, old)
         end
@@ -291,26 +291,32 @@ function EditField:onInput(keys)
             return true
         end
         return not not self.key
+    elseif keys._MOUSE_L then
+        local mouse_x, mouse_y = self:getMousePos()
+        if mouse_x then
+            self:setCursor(mouse_x)
+            return true
+        end
     elseif keys.CURSOR_LEFT then
-        self.cursor = math.max(1, self.cursor - 1)
+        self:setCursor(self.cursor - 1)
         return true
     elseif keys.A_MOVE_W_DOWN then -- Ctrl-Left (prev word start)
         local _, prev_word_start = self.text:sub(1, self.cursor-1):
                                                     find('.*[^%w_%-]+[%w_%-]')
-        self.cursor = prev_word_start or 1
+        self:setCursor(prev_word_start or 1)
         return true
     elseif keys.A_CARE_MOVE_W then -- Alt-Left (home)
-        self.cursor = 1
+        self:setCursor(1)
         return true
     elseif keys.CURSOR_RIGHT then
-        self.cursor = math.min(self.cursor + 1, #self.text + 1)
+        self:setCursor(self.cursor + 1)
         return true
     elseif keys.A_MOVE_E_DOWN then -- Ctrl-Right (next word end)
         local _, next_word_end = self.text:find('[%w_%-]+[^%w_%-]', self.cursor)
-        self.cursor = next_word_end or #self.text + 1
+        self:setCursor(next_word_end)
         return true
     elseif keys.A_CARE_MOVE_E then -- Alt-Right (end)
-        self.cursor = #self.text + 1
+        self:setCursor()
         return true
     elseif keys._STRING then
         local old = self.text
@@ -318,15 +324,14 @@ function EditField:onInput(keys)
             -- handle backspace
             local del_pos = self.cursor - 1
             if del_pos > 0 then
-                self.text = old:sub(1, del_pos-1) .. old:sub(del_pos+1)
-                self.cursor = del_pos
+                self:setText(old:sub(1, del_pos-1) .. old:sub(del_pos+1),
+                             del_pos)
             end
         else
             local cv = string.char(keys._STRING)
             if not self.on_char or self.on_char(cv, old) then
-                self.text = old:sub(1, self.cursor-1) .. cv ..
-                                                        old:sub(self.cursor)
-                self.cursor = self.cursor + 1
+                self:setText(old:sub(1,self.cursor-1)..cv..old:sub(self.cursor),
+                             self.cursor + 1)
             end
         end
         if self.on_change and self.text ~= old then

From 805456e82b568d5601a14e643f8b09040bd66659 Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Sat, 16 Jul 2022 22:18:38 -0700
Subject: [PATCH 216/854] allow mouse lclick to select a List item

---
 library/lua/gui/widgets.lua | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/library/lua/gui/widgets.lua b/library/lua/gui/widgets.lua
index 2dc197064..d6505d862 100644
--- a/library/lua/gui/widgets.lua
+++ b/library/lua/gui/widgets.lua
@@ -1019,6 +1019,15 @@ function List:onInput(keys)
     elseif self.on_submit2 and keys.SEC_SELECT then
         self:submit2()
         return true
+    elseif keys._MOUSE_L then
+        local _, mouse_y = self:getMousePos()
+        if mouse_y and #self.choices > 0 and
+                mouse_y < (#self.choices-self.page_top+1) * self.row_height then
+            local idx = self.page_top + math.floor(mouse_y/self.row_height)
+            self:setSelected(idx)
+            self:submit()
+            return true
+        end
     else
         for k,v in pairs(self.scroll_keys) do
             if keys[k] then

From f35420072837b32e6a2f563b11c43c6fbc32cbbb Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Sat, 16 Jul 2022 22:23:22 -0700
Subject: [PATCH 217/854] update widget docs

---
 docs/Lua API.rst | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/docs/Lua API.rst b/docs/Lua API.rst
index e884383d5..107a0ba2e 100644
--- a/docs/Lua API.rst	
+++ b/docs/Lua API.rst	
@@ -3904,8 +3904,9 @@ and then call the ``on_submit`` callback. Pressing the Escape key will also
 release keyboard focus, but first it will restore the text that was displayed
 before the ``EditField`` gained focus and then call the ``on_change`` callback.
 
-The ``EditField`` cursor can be moved to where you want to insert/remove text.
-The following cursor movement keys are recognized:
+The ``EditField`` cursor can be moved to where you want to insert/remove text
+by clicking the mouse at that position. In addition, the following cursor
+movement keys are recognized:
 
 - Left/Right arrow: move the cursor one character to the left or right.
 - Ctrl-Left/Right arrow: move the cursor one word to the left or right.
@@ -4135,10 +4136,10 @@ It has the following attributes:
 :on_select: Selection change callback; called as ``on_select(index,choice)``.
             This is also called with *nil* arguments if ``setChoices`` is called
             with an empty list.
-:on_submit: Enter key callback; if specified, the list reacts to the key
-            and calls it as ``on_submit(index,choice)``.
-:on_submit2: Shift-Enter key callback; if specified, the list reacts to the key
-             and calls it as ``on_submit2(index,choice)``.
+:on_submit: Enter key or mouse click callback; if specified, the list calls it
+            as ``on_submit(index,choice)``.
+:on_submit2: Shift-Enter key callback; if specified, the list calls it as
+             ``on_submit2(index,choice)``.
 :row_height: Height of every row in text lines.
 :icon_width: If not *nil*, the specified number of character columns
              are reserved to the left of the list item for the icons.

From 28161ed63d11a4ec7b4bb0263801015894357ec3 Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Sun, 17 Jul 2022 09:12:20 -0700
Subject: [PATCH 218/854] add command frequency file based on survey results

used for ordering launcher autocomplete results
---
 dfhack-config/command_counts.json | 145 ++++++++++++++++++++++++++++++
 1 file changed, 145 insertions(+)
 create mode 100644 dfhack-config/command_counts.json

diff --git a/dfhack-config/command_counts.json b/dfhack-config/command_counts.json
new file mode 100644
index 000000000..6acfda21b
--- /dev/null
+++ b/dfhack-config/command_counts.json
@@ -0,0 +1,145 @@
+{
+	"manipulator": 75,
+	"autolabor": 59,
+	"reveal": 51,
+	"help": 50,
+	"ls": 50,
+	"die": 50,
+	"tags": 50,
+	"embark-assistant": 42,
+	"prospect": 37,
+	"autodump": 36,
+	"clean": 35,
+	"gui/workflow": 28,
+	"workflow": 28,
+	"exportlegends": 26,
+	"gui/autobutcher": 25,
+	"autobutcher": 25,
+	"digv": 24,
+	"fastdwarf": 22,
+	"autonestbox": 20,
+	"showmood": 19,
+	"gui/liquids": 18,
+	"liquids": 18,
+	"search": 18,
+	"gui/quickfort": 15,
+	"quickfort": 15,
+	"createitem": 14,
+	"stocks": 14,
+	"autofarm": 12,
+	"autochop": 12,
+	"tiletypes": 12,
+	"exterminate": 12,
+	"buildingplan": 12,
+	"quicksave": 11,
+	"gui/gm-editor": 11,
+	"cleanowned": 10,
+	"gui/autogems": 9,
+	"autogems": 9,
+	"stonesense": 9,
+	"gui/stockpiles": 8,
+	"stockpiles": 8,
+	"changevein": 8,
+	"gui/teleport": 7,
+	"teleport": 7,
+	"seedwatch": 6,
+	"automelt": 6,
+	"embark-tools": 6,
+	"cursecheck": 5,
+	"open-legends": 5,
+	"ban-cooking": 5,
+	"burial": 5,
+	"automaterial": 5,
+	"remove-stress": 5,
+	"gui/blueprint": 5,
+	"blueprint": 5,
+	"tailor": 4,
+	"startdwarf": 4,
+	"3dveins": 4,
+	"digcircle": 4,
+	"nestboxes": 3,
+	"deathcause": 3,
+	"list-agreements": 3,
+	"gui/room-list": 3,
+	"points": 3,
+	"region-pops": 3,
+	"gui/advfort": 3,
+	"unsuspend": 3,
+	"locate-ore": 3,
+	"changelayer": 3,
+	"source": 3,
+	"gui/gm-unit": 3,
+	"combine-drinks": 3,
+	"combine-plants": 3,
+	"deteriorate": 3,
+	"warn-starving": 3,
+	"gaydar": 2,
+	"gui/dfstatus": 2,
+	"gui/rename": 2,
+	"rename": 2,
+	"fix-ster": 2,
+	"job-material": 2,
+	"stockflow": 2,
+	"drain-aquifer": 2,
+	"full-heal": 2,
+	"spawnunit": 2,
+	"flashstep": 2,
+	"gui/family-affairs": 2,
+	"caravan": 2,
+	"mousequery": 2,
+	"tweak": 2,
+	"confirm": 2,
+	"autoclothing": 1,
+	"autounsuspend": 1,
+	"prioritize": 1,
+	"dwarfmonitor": 1,
+	"show-unit-syndromes": 1,
+	"troubleshoot-item": 1,
+	"gui/mechanisms": 1,
+	"gui/pathable": 1,
+	"hotkeys": 1,
+	"infiniteSky": 1,
+	"force": 1,
+	"hermit": 1,
+	"strangemood": 1,
+	"weather": 1,
+	"add-recipe": 1,
+	"autotrade": 1,
+	"zone": 1,
+	"autonick": 1,
+	"stripcaged": 1,
+	"unforbid": 1,
+	"workorder": 1,
+	"gui/mod-manager": 1,
+	"spotclean": 1,
+	"plant": 1,
+	"regrass": 1,
+	"dig-now": 1,
+	"build-now": 1,
+	"clear-webs": 1,
+	"gui/siege-engine": 1,
+	"assign-skills": 1,
+	"brainwash": 1,
+	"elevate-mental": 1,
+	"elevate-physical": 1,
+	"launch": 1,
+	"linger": 1,
+	"make-legendary": 1,
+	"rejuvenate": 1,
+	"resurrect-adv": 1,
+	"questport": 1,
+	"getplants": 1,
+	"gui/stamper": 1,
+	"tweak": 1,
+	"fixveins": 1,
+	"deramp": 1,
+	"fix/dead-units": 1,
+	"fix/fat-dwarves": 1,
+	"fix/loyaltycascade": 1,
+	"fix/retrieve-units": 1,
+	"tweak": 1,
+	"sort-items": 1,
+	"gui/color-schemes": 1,
+	"color-schemes": 1,
+	"season-palette": 1
+}

From 5723b76585985fff5bef29a2b2702dccbb42b36d Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Sun, 17 Jul 2022 15:43:58 -0700
Subject: [PATCH 219/854] click to correct cursor position on long strings

where the left side of the string has been trimmed
---
 library/lua/gui/widgets.lua | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/library/lua/gui/widgets.lua b/library/lua/gui/widgets.lua
index d6505d862..f4573a185 100644
--- a/library/lua/gui/widgets.lua
+++ b/library/lua/gui/widgets.lua
@@ -197,6 +197,7 @@ function EditField:init()
         self:setFocus(true)
     end
 
+    self.start_pos = 1
     self.cursor = 1
 
     self:addviews{HotkeyLabel{frame={t=0,l=0},
@@ -238,6 +239,7 @@ function EditField:onRenderBody(dc)
     local txt = self.text:sub(1, self.cursor - 1) .. cursor_char ..
                                                 self.text:sub(self.cursor + 1)
     local max_width = dc.width - self.text_offset
+    self.start_pos = 1
     if #txt > max_width then
         -- get the substring in the vicinity of the cursor
         max_width = max_width - 2
@@ -245,11 +247,12 @@ function EditField:onRenderBody(dc)
         local start_pos = math.max(1, self.cursor-half_width)
         local end_pos = math.min(#txt, self.cursor+half_width-1)
         if self.cursor + half_width > #txt then
-            start_pos = #txt - max_width
+            start_pos = #txt - (max_width - 1)
         end
         if self.cursor - half_width <= 1 then
             end_pos = max_width + 1
         end
+        self.start_pos = start_pos > 1 and start_pos - 1 or start_pos
         txt = ('%s%s%s'):format(start_pos == 1 and '' or string.char(27),
                                 txt:sub(start_pos, end_pos),
                                 end_pos == #txt and '' or string.char(26))
@@ -294,7 +297,7 @@ function EditField:onInput(keys)
     elseif keys._MOUSE_L then
         local mouse_x, mouse_y = self:getMousePos()
         if mouse_x then
-            self:setCursor(mouse_x)
+            self:setCursor(self.start_pos + mouse_x)
             return true
         end
     elseif keys.CURSOR_LEFT then

From 7f302888ec0b5b8a16185d9e507fca431c7d5454 Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Sun, 17 Jul 2022 16:04:36 -0700
Subject: [PATCH 220/854] make HotkeyLabels react to clicking

also be better about initializing EditField frame height
---
 library/lua/gui/widgets.lua | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/library/lua/gui/widgets.lua b/library/lua/gui/widgets.lua
index f4573a185..aea62bf87 100644
--- a/library/lua/gui/widgets.lua
+++ b/library/lua/gui/widgets.lua
@@ -187,10 +187,14 @@ EditField.ATTRS{
     on_submit2 = DEFAULT_NIL,
     key = DEFAULT_NIL,
     key_sep = DEFAULT_NIL,
-    frame = {h=1},
     modal = false,
 }
 
+function EditField:preinit(init_table)
+    local frame = init_table.frame or {}
+    frame.h = frame.h or 1
+end
+
 function EditField:init()
     local function on_activate()
         self.saved_text = self.text
@@ -744,6 +748,16 @@ function HotkeyLabel:init()
                   on_activate=self.on_activate}}
 end
 
+function HotkeyLabel:onInput(keys)
+    if HotkeyLabel.super.onInput(self, keys) then
+        return true
+    elseif keys._MOUSE_L and self:getMousePos() then
+        self.on_activate()
+        return true
+    end
+
+end
+
 ----------------------
 -- CycleHotkeyLabel --
 ----------------------

From e650bd094292ab28810b457aec3f9a9c04a78cfc Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Sun, 17 Jul 2022 17:05:29 -0700
Subject: [PATCH 221/854] add comment about plugin docs

---
 library/LuaApi.cpp              | 5 ++++-
 library/include/PluginManager.h | 4 ++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/library/LuaApi.cpp b/library/LuaApi.cpp
index 649ceb2dc..c332933a2 100644
--- a/library/LuaApi.cpp
+++ b/library/LuaApi.cpp
@@ -3133,7 +3133,10 @@ static int internal_getCommandHelp(lua_State *L)
             {
                 help += ".";
             }
-            help += "\n" + pc.usage;
+            if (pc.usage.size())
+            {
+                help += "\n" + pc.usage;
+            }
             lua_pushstring(L, help.c_str());
             return 1;
         }
diff --git a/library/include/PluginManager.h b/library/include/PluginManager.h
index f168d7e47..79b7e0492 100644
--- a/library/include/PluginManager.h
+++ b/library/include/PluginManager.h
@@ -97,6 +97,10 @@ namespace DFHack
         /// create a command with a name, description, function pointer to its code
         /// and saying if it needs an interactive terminal
         /// Most commands shouldn't require an interactive terminal!
+        /// Note that the description and usage fields are only used for
+        /// out-of-tree plugins that do not have rendered help installed in
+        /// the hack/docs directory. Help for all internal plugins comes from
+        /// the rendered .rst files.
         PluginCommand(const char * _name,
                       const char * _description,
                       command_function function_,

From 301c8e93a19a515a720a69c137a85e7640932290 Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Mon, 18 Jul 2022 10:58:35 -0700
Subject: [PATCH 222/854] move builtin docs to individual files

---
 conf.py                          |   3 +
 docs/Builtin.rst                 | 280 -------------------------------
 docs/Tags.rst                    |   2 +
 docs/builtins/alias.rst          |  29 ++++
 docs/builtins/clear.rst          |   4 +
 docs/builtins/cls.rst            |   5 +
 docs/builtins/devel/dump-rpc.rst |   8 +
 docs/builtins/die.rst            |   4 +
 docs/builtins/dir.rst            |   4 +
 docs/builtins/disable.rst        |  20 +++
 docs/builtins/enable.rst         |  20 +++
 docs/builtins/fpause.rst         |   5 +
 docs/builtins/help.rst           |  19 +++
 docs/builtins/hide.rst           |   8 +
 docs/builtins/keybinding.rst     |  56 +++++++
 docs/builtins/kill-lua.rst       |   6 +
 docs/builtins/load.rst           |  13 ++
 docs/builtins/ls.rst             |  34 ++++
 docs/builtins/plug.rst           |  12 ++
 docs/builtins/reload.rst         |  14 ++
 docs/builtins/sc-script.rst      |   9 +
 docs/builtins/script.rst         |  19 +++
 docs/builtins/show.rst           |   9 +
 docs/builtins/tags.rst           |   9 +
 docs/builtins/type.rst           |  10 ++
 docs/builtins/unload.rst         |  11 ++
 docs/index-tools.rst             |  15 +-
 index.rst                        |  20 ++-
 library/lua/helpdb.lua           |  74 ++++----
 29 files changed, 390 insertions(+), 332 deletions(-)
 delete mode 100644 docs/Builtin.rst
 create mode 100644 docs/builtins/alias.rst
 create mode 100644 docs/builtins/clear.rst
 create mode 100644 docs/builtins/cls.rst
 create mode 100644 docs/builtins/devel/dump-rpc.rst
 create mode 100644 docs/builtins/die.rst
 create mode 100644 docs/builtins/dir.rst
 create mode 100644 docs/builtins/disable.rst
 create mode 100644 docs/builtins/enable.rst
 create mode 100644 docs/builtins/fpause.rst
 create mode 100644 docs/builtins/help.rst
 create mode 100644 docs/builtins/hide.rst
 create mode 100644 docs/builtins/keybinding.rst
 create mode 100644 docs/builtins/kill-lua.rst
 create mode 100644 docs/builtins/load.rst
 create mode 100644 docs/builtins/ls.rst
 create mode 100644 docs/builtins/plug.rst
 create mode 100644 docs/builtins/reload.rst
 create mode 100644 docs/builtins/sc-script.rst
 create mode 100644 docs/builtins/script.rst
 create mode 100644 docs/builtins/show.rst
 create mode 100644 docs/builtins/tags.rst
 create mode 100644 docs/builtins/type.rst
 create mode 100644 docs/builtins/unload.rst

diff --git a/conf.py b/conf.py
index 831833e26..7cf4a3a32 100644
--- a/conf.py
+++ b/conf.py
@@ -105,6 +105,8 @@ def doc_all_dirs():
     # TODO: as we scan the docs, parse out the tags and short descriptions and
     # build a map for use in generating the tags pages and links in the tool
     # doc footers
+    for root, _, files in os.walk('docs/builtins'):
+        tools.extend(doc_dir(root, files, os.path.relpath(root, 'docs/builtins')))
     for root, _, files in os.walk('docs/plugins'):
         tools.extend(doc_dir(root, files, os.path.relpath(root, 'docs/plugins')))
     for root, _, files in os.walk('scripts/docs'):
@@ -266,6 +268,7 @@ exclude_patterns = [
     'depends/*',
     'docs/html/*',
     'docs/text/*',
+    'docs/builtins/*',
     'docs/plugins/*',
     'scripts/docs/*',
     ]
diff --git a/docs/Builtin.rst b/docs/Builtin.rst
deleted file mode 100644
index 8e59840b4..000000000
--- a/docs/Builtin.rst
+++ /dev/null
@@ -1,280 +0,0 @@
-.. _built-in-commands:
-
-Built-in Commands
-=================
-The following commands are provided by the 'core' components of DFHack, rather
-than plugins or scripts.
-
-.. contents::
-   :local:
-
-.. _alias:
-
-alias
------
-The ``alias`` command allows configuring aliases to other DFHack commands.
-Aliases are resolved immediately after built-in commands, which means that an
-alias cannot override a built-in command, but can override a command implemented
-by a plugin or script.
-
-Usage:
-
-:``alias list``: lists all configured aliases
-:``alias add <name> <command> [arguments...]``: adds an alias
-:``alias replace <name> <command> [arguments...]``: replaces an existing
-    alias with a new command, or adds the alias if it does not already exist
-:``alias delete <name>``: removes the specified alias
-
-Aliases can be given additional arguments when created and invoked, which will
-be passed to the underlying command in order. An example with
-`devel/print-args`::
-
-    [DFHack]# alias add pargs devel/print-args example
-    [DFHack]# pargs text
-    example
-    text
-
-
-.. _cls:
-
-cls
----
-Clear the terminal. Does not delete command history.
-
-
-.. _die:
-
-die
----
-Instantly kills DF without saving.
-
-
-.. _disable:
-.. _enable:
-
-enable
-------
-Many plugins and scripts can be in a distinct enabled or disabled state. Some of
-them activate and deactivate automatically depending on the contents of the
-world raws. Others store their state in world data. However a number of them
-have to be enabled globally, and the init file is the right place to do it.
-
-Most such plugins or scripts support the built-in ``enable`` and ``disable``
-commands. Calling them at any time without arguments prints a list of enabled
-and disabled plugins, and shows whether that can be changed through the same
-commands. Passing plugin names to these commands will enable or disable the
-specified plugins. For example, to enable the `manipulator` plugin::
-
-  enable manipulator
-
-It is also possible to enable or disable multiple plugins at once::
-
-  enable manipulator search
-
-
-.. _fpause:
-
-fpause
-------
-Forces DF to pause. This is useful when your FPS drops below 1 and you lose
-control of the game.
-
-
-.. _help:
-
-help
-----
-Most commands support using the ``help <command>`` built-in command to retrieve
-further help without having to look online. ``? <cmd>`` and ``man <cmd>`` are
-aliases.
-
-Some commands (including many scripts) instead take ``help`` or ``?`` as an
-option on their command line - ie ``<cmd> help``.
-
-
-.. _hide:
-
-hide
-----
-Hides the DFHack terminal window. Only available on Windows.
-
-
-.. _keybinding:
-
-keybinding
-----------
-To set keybindings, use the built-in ``keybinding`` command. Like any other
-command it can be used at any time from the console, but bindings are not
-remembered between runs of the game unless re-created in `dfhack.init`.
-
-Currently, any combinations of Ctrl/Alt/Shift with A-Z, 0-9, F1-F12, or ``\```
-are supported.
-
-Possible ways to call the command:
-
-``keybinding list <key>``
-  List bindings active for the key combination.
-``keybinding clear <key> <key>...``
-  Remove bindings for the specified keys.
-``keybinding add <key> "cmdline" "cmdline"...``
-  Add bindings for the specified key.
-``keybinding set <key> "cmdline" "cmdline"...``
-  Clear, and then add bindings for the specified key.
-
-The ``<key>`` parameter above has the following *case-sensitive* syntax::
-
-    [Ctrl-][Alt-][Shift-]KEY[@context[|context...]]
-
-where the *KEY* part can be any recognized key and [] denote optional parts.
-
-When multiple commands are bound to the same key combination, DFHack selects
-the first applicable one. Later ``add`` commands, and earlier entries within one
-``add`` command have priority. Commands that are not specifically intended for
-use as a hotkey are always considered applicable.
-
-The ``context`` part in the key specifier above can be used to explicitly
-restrict the UI state where the binding would be applicable. If called without
-parameters, the ``keybinding`` command among other things prints the current
-context string.
-
-Only bindings with a ``context`` tag that either matches the current context
-fully, or is a prefix ending at a ``/`` boundary would be considered for
-execution, i.e. when in context ``foo/bar/baz``, keybindings restricted to any
-of ``@foo/bar/baz``, ``@foo/bar``, ``@foo`` or none will be active.
-
-Multiple contexts can be specified by separating them with a pipe (``|``) - for
-example, ``@foo|bar|baz/foo`` would match anything under ``@foo``, ``@bar``, or
-``@baz/foo``.
-
-Interactive commands like `liquids` cannot be used as hotkeys.
-
-
-.. _kill-lua:
-
-kill-lua
---------
-Stops any currently-running Lua scripts. By default, scripts can only be
-interrupted every 256 instructions. Use ``kill-lua force`` to interrupt the next
-instruction.
-
-
-.. _load:
-.. _unload:
-.. _reload:
-
-load
-----
-``load``, ``unload``, and ``reload`` control whether a plugin is loaded into
-memory - note that plugins are loaded but disabled unless you explicitly enable
-them. Usage::
-
-    load|unload|reload PLUGIN|(-a|--all)
-
-Allows dealing with plugins individually by name, or all at once.
-
-Note that plugins do not maintain their enabled state if they are reloaded, so
-you may need to use `enable` to re-enable a plugin after reloading it.
-
-
-.. _ls:
-.. _dir:
-
-ls
---
-``ls`` (or ``dir``) does not list files like the Unix command, but rather
-available commands. In order to group related commands, each command is
-associated with a list of tags. You can filter the listed commands by a
-tag or a substring of the command name. Usage:
-
-:``ls``: Lists all available commands and the tags associated with them
-    (if any).
-:``ls TAG``: Shows only commands that have the given tag. Use the `tags` command
-    to see the list of available tags.
-:``ls STRING``: Shows commands that include the given string. E.g. ``ls auto``
-    will show all the commands with "auto" in their names. If the string is also
-    the name of a tag, then it will be interpreted as a tag name.
-
-You can also pass some optional parameters to change how ``ls`` behaves:
-
-:``--notags``: Don't print out the tags associated with each command.
-:``--dev``: Include commands intended for developers and modders.
-
-
-.. _plug:
-
-plug
-----
-Lists available plugins and whether they are enabled.
-
-``plug``
-        Lists available plugins (*not* commands implemented by plugins)
-``plug [PLUGIN] [PLUGIN] ...``
-        List state and detailed description of the given plugins,
-        including commands implemented by the plugin.
-
-
-.. _sc-script:
-
-sc-script
----------
-Allows additional scripts to be run when certain events occur (similar to
-onLoad\*.init scripts)
-
-
-.. _script:
-
-script
-------
-Reads a text file, and runs each line as a DFHack command as if it had been
-typed in by the user - treating the input like `an init file <init-files>`.
-
-Some other tools, such as `autobutcher` and `workflow`, export their settings as
-the commands to create them - which can later be reloaded with ``script``.
-
-
-.. _show:
-
-show
-----
-Shows the terminal window after it has been `hidden <hide>`. Only available on
-Windows. You'll need to use it from a `keybinding` set beforehand, or the
-in-game `command-prompt`.
-
-
-.. _tags:
-
-tags
-----
-
-List the strings that the DFHack tools can be tagged with. You can find groups
-of related tools by passing the tag name to `ls`.
-
-.. _type:
-
-type
-----
-``type command`` shows where ``command`` is implemented.
-
-.. _devel/dump-rpc:
-
-devel/dump-rpc
---------------
-
-Writes RPC endpoint information to the specified file.
-
-Usage::
-
-    devel/dump-rpc FILENAME
-
-Other Commands
---------------
-The following commands are *not* built-in, but offer similarly useful functions.
-
-* `command-prompt`
-* `hotkeys`
-* `lua`
-* `multicmd`
-* `nopause`
-* `quicksave`
-* `rb`
-* `repeat`
diff --git a/docs/Tags.rst b/docs/Tags.rst
index effc0ad23..7a5288cbf 100644
--- a/docs/Tags.rst
+++ b/docs/Tags.rst
@@ -1,3 +1,5 @@
+.. _tags:
+
 Tags
 ====
 
diff --git a/docs/builtins/alias.rst b/docs/builtins/alias.rst
new file mode 100644
index 000000000..8ca1f014c
--- /dev/null
+++ b/docs/builtins/alias.rst
@@ -0,0 +1,29 @@
+alias
+-----
+
+Configure helper aliases for other DFHack commands. Aliases are resolved
+immediately after built-in commands, which means that an alias cannot override
+a built-in command, but can override a command implemented by a plugin or
+script.
+
+Usage:
+
+- ``alias list``
+  lists all configured aliases
+- ``alias add <name> <command> [arguments...]``
+  adds an alias
+- ``alias replace <name> <command> [arguments...]``
+  replaces an existing alias with a new command, or adds the alias if it does
+  not already exist
+- ``alias delete <name>``
+  removes the specified alias
+
+Aliases can be given additional arguments when created and invoked, which will
+be passed to the underlying command in order.
+
+Example::
+
+    [DFHack]# alias add pargs devel/print-args example
+    [DFHack]# pargs text
+    example
+    text
diff --git a/docs/builtins/clear.rst b/docs/builtins/clear.rst
new file mode 100644
index 000000000..b964a8b3f
--- /dev/null
+++ b/docs/builtins/clear.rst
@@ -0,0 +1,4 @@
+clear
+-----
+
+Clear the terminal screen. This command is an alias for `cls`.
diff --git a/docs/builtins/cls.rst b/docs/builtins/cls.rst
new file mode 100644
index 000000000..b05354d5a
--- /dev/null
+++ b/docs/builtins/cls.rst
@@ -0,0 +1,5 @@
+cls
+---
+
+Clear the terminal screen. Can also be invoked as ``clear``. Note that this
+command does not delete command history. It just clears the text on the screen.
diff --git a/docs/builtins/devel/dump-rpc.rst b/docs/builtins/devel/dump-rpc.rst
new file mode 100644
index 000000000..af173a179
--- /dev/null
+++ b/docs/builtins/devel/dump-rpc.rst
@@ -0,0 +1,8 @@
+devel/dump-rpc
+--------------
+
+Writes RPC endpoint information to the specified file.
+
+Usage::
+
+    devel/dump-rpc <filename>
diff --git a/docs/builtins/die.rst b/docs/builtins/die.rst
new file mode 100644
index 000000000..d2dae484f
--- /dev/null
+++ b/docs/builtins/die.rst
@@ -0,0 +1,4 @@
+die
+---
+
+Instantly exits DF without saving.
diff --git a/docs/builtins/dir.rst b/docs/builtins/dir.rst
new file mode 100644
index 000000000..5c2059099
--- /dev/null
+++ b/docs/builtins/dir.rst
@@ -0,0 +1,4 @@
+dir
+---
+
+List available DFHack commands. This is an alias of the `ls` command.
diff --git a/docs/builtins/disable.rst b/docs/builtins/disable.rst
new file mode 100644
index 000000000..11077c883
--- /dev/null
+++ b/docs/builtins/disable.rst
@@ -0,0 +1,20 @@
+disable
+-------
+
+Deactivate a DFHack tool that has some persistent effect. Many plugins and
+scripts can be in a distinct enabled or disabled state. Some of them activate
+and deactivate automatically depending on the contents of the world raws. Others
+store their state in world data. However a number of them have to be enabled
+globally, and the init file is the right place to do it.
+
+Most such plugins or scripts support the built-in ``enable`` and ``disable``
+commands. Calling them at any time without arguments prints a list of enabled
+and disabled plugins, and shows whether that can be changed through the same
+commands. Passing plugin names to these commands will enable or disable the
+specified plugins. For example, to disable the `manipulator` plugin::
+
+  disable manipulator
+
+It is also possible to enable or disable multiple plugins at once::
+
+  disable manipulator search
diff --git a/docs/builtins/enable.rst b/docs/builtins/enable.rst
new file mode 100644
index 000000000..eef76c45d
--- /dev/null
+++ b/docs/builtins/enable.rst
@@ -0,0 +1,20 @@
+enable
+------
+
+Activate a DFHack tool that has some persistent effect. Many plugins and scripts
+can be in a distinct enabled or disabled state. Some of them activate and
+deactivate automatically depending on the contents of the world raws. Others
+store their state in world data. However a number of them have to be enabled
+globally, and the init file is the right place to do it.
+
+Most such plugins or scripts support the built-in ``enable`` and ``disable``
+commands. Calling them at any time without arguments prints a list of enabled
+and disabled plugins, and shows whether that can be changed through the same
+commands. Passing plugin names to these commands will enable or disable the
+specified plugins. For example, to enable the `manipulator` plugin::
+
+  enable manipulator
+
+It is also possible to enable or disable multiple plugins at once::
+
+  enable manipulator search
diff --git a/docs/builtins/fpause.rst b/docs/builtins/fpause.rst
new file mode 100644
index 000000000..68e4eb07e
--- /dev/null
+++ b/docs/builtins/fpause.rst
@@ -0,0 +1,5 @@
+fpause
+------
+
+Forces DF to pause. This is useful when your FPS drops below 1 and you lose
+control of the game.
diff --git a/docs/builtins/help.rst b/docs/builtins/help.rst
new file mode 100644
index 000000000..aa9e4b170
--- /dev/null
+++ b/docs/builtins/help.rst
@@ -0,0 +1,19 @@
+help
+----
+
+Display help about a command or plugin.
+
+Usage::
+
+    help|?|man
+    help|?|man <command or plugin>
+
+Examples::
+
+    help blueprint
+    man blueprint
+
+Both examples above will display the help text for the `blueprint` command.
+
+Some commands also take ``help`` or ``?`` as an option on their command line
+for the same effect - e.g. ``blueprint help``.
diff --git a/docs/builtins/hide.rst b/docs/builtins/hide.rst
new file mode 100644
index 000000000..5c8d08452
--- /dev/null
+++ b/docs/builtins/hide.rst
@@ -0,0 +1,8 @@
+hide
+----
+
+Hides the DFHack terminal window. You can show it again with the `show`
+command, though you'll need to use it from a `keybinding` set beforehand or the
+in-game `command-prompt`.
+
+Only available on Windows.
diff --git a/docs/builtins/keybinding.rst b/docs/builtins/keybinding.rst
new file mode 100644
index 000000000..bce450e46
--- /dev/null
+++ b/docs/builtins/keybinding.rst
@@ -0,0 +1,56 @@
+keybinding
+----------
+
+Create hotkeys that will run DFHack commands. Like any other command it can be
+used at any time from the console, but bindings are not remembered between runs
+of the game unless re-created in `dfhack.init`.
+
+Hotkeys can be any combinations of Ctrl/Alt/Shift with A-Z, 0-9, F1-F12, or
+``\```.
+
+Usage:
+
+- ``keybinding``
+  Show some useful information, including the current game context.
+- ``keybinding list <key>``
+  List bindings active for the key combination.
+- ``keybinding clear <key> [<key>...]``
+  Remove bindings for the specified keys.
+- ``keybinding add <key> "cmdline" ["cmdline"...]``
+  Add bindings for the specified key.
+- ``keybinding set <key> "cmdline" ["cmdline"...]``
+  Clear, and then add bindings for the specified key.
+
+The ``<key>`` parameter above has the following **case-sensitive** syntax::
+
+    [Ctrl-][Alt-][Shift-]KEY[@context[|context...]]
+
+where the ``KEY`` part can be any recognized key and [] denote optional parts.
+
+When multiple commands are bound to the same key combination, DFHack selects
+the first applicable one. Later ``add`` commands, and earlier entries within one
+``add`` command have priority. Commands that are not specifically intended for
+use as a hotkey are always considered applicable.
+
+The ``context`` part in the key specifier above can be used to explicitly
+restrict the UI state where the binding would be applicable.
+
+Only bindings with a ``context`` tag that either matches the current context
+fully, or is a prefix ending at a ``/`` boundary would be considered for
+execution, i.e. when in context ``foo/bar/baz``, keybindings restricted to any
+of ``@foo/bar/baz``, ``@foo/bar``, ``@foo``, or none will be active.
+
+Multiple contexts can be specified by separating them with a pipe (``|``) - for
+example, ``@foo|bar|baz/foo`` would match anything under ``@foo``, ``@bar``, or
+``@baz/foo``.
+
+Interactive commands like `liquids` cannot be used as hotkeys.
+
+Examples:
+
+- ``keybinding add Alt-F1 hotkeys``
+  Bind Alt-F1 to run the `hotkeys` command on any screen at any time.
+- ``keybinding add Alt-F@dwarfmode gui/quickfort``
+  Bind Alt-F to run `gui/quickfort`, but only when on a screen that shows the
+  main map.
+
diff --git a/docs/builtins/kill-lua.rst b/docs/builtins/kill-lua.rst
new file mode 100644
index 000000000..ee354846a
--- /dev/null
+++ b/docs/builtins/kill-lua.rst
@@ -0,0 +1,6 @@
+kill-lua
+--------
+
+Gracefully stops any currently-running Lua scripts. Use this command to stop
+a misbehaving script that appears to be stuck. Use ``kill-lua force`` if just
+``kill-lua`` doesn't work.
diff --git a/docs/builtins/load.rst b/docs/builtins/load.rst
new file mode 100644
index 000000000..fb654b8a4
--- /dev/null
+++ b/docs/builtins/load.rst
@@ -0,0 +1,13 @@
+load
+----
+
+Load and register a plugin library. Also see `unload` and `reload` for related
+actions.
+
+Usage::
+
+    load <plugin> [<plugin> ...]
+    load -a|--all
+
+You can load individual named plugins or all plugins at once. Note that plugins
+are disabled after loading/reloading until you explicitly `enable` them.
diff --git a/docs/builtins/ls.rst b/docs/builtins/ls.rst
new file mode 100644
index 000000000..5eaa9dc01
--- /dev/null
+++ b/docs/builtins/ls.rst
@@ -0,0 +1,34 @@
+ls
+--
+
+List available DFHack commands. In order to group related commands, each command
+is associated with a list of tags. You can filter the listed commands by a tag
+or a substring of the command name. The `dir` command is an alias of this
+command.
+
+Usage:
+
+- ``ls [<options>]``
+  Lists all available commands and the tags associated with them.
+- ``ls <tag> [<options>]``
+  Shows only commands that have the given tag. Use the `tags` command to see
+  the list of available tags.
+- ``ls <string> [<options>]``
+  Shows commands that include the given string. E.g. ``ls quick`` will show all
+  the commands with "quick" in their names. If the string is also the name of a
+  tag, then it will be interpreted as a tag name.
+
+You can also pass some optional parameters to change how ``ls`` behaves:
+
+- ``--notags``
+  Don't print out the tags associated with each command.
+- ``--dev``
+  Include commands intended for developers and modders.
+
+Examples:
+
+- ``ls adventure``
+  Lists all commands with the ``adventure`` tag.
+- ``ls --dev trigger``
+  Lists all commands, including developer and modding commands, that match the
+  substring "trigger"
diff --git a/docs/builtins/plug.rst b/docs/builtins/plug.rst
new file mode 100644
index 000000000..da0adb657
--- /dev/null
+++ b/docs/builtins/plug.rst
@@ -0,0 +1,12 @@
+plug
+----
+
+Lists available plugins and whether they are enabled.
+
+Usage:
+
+- ``plug``
+  Lists available plugins and whether they are enabled.
+- ``plug <plugin> [<plugin> ...]``
+  Shows the commands implemented by the named plugins and whether the plugins
+  are enabled.
diff --git a/docs/builtins/reload.rst b/docs/builtins/reload.rst
new file mode 100644
index 000000000..8f28e5ca6
--- /dev/null
+++ b/docs/builtins/reload.rst
@@ -0,0 +1,14 @@
+reload
+------
+
+Reload a loaded plugin. Developer use this command to reload a plugin that they
+are actively modifying. Also see `load` and `unload` for related actions.
+
+Usage::
+
+    reload <plugin> [<plugin> ...]
+    reload -a|--all
+
+You can reload individual named plugins or all plugins at once. Note that
+plugins are disabled after loading/reloading until you explicitly `enable`
+them.
diff --git a/docs/builtins/sc-script.rst b/docs/builtins/sc-script.rst
new file mode 100644
index 000000000..1d5d177c7
--- /dev/null
+++ b/docs/builtins/sc-script.rst
@@ -0,0 +1,9 @@
+sc-script
+---------
+
+Runs commands when game state changes occur. This is similar to the static
+`init-files` but can be set dynamically.
+
+Usage::
+
+    sc-script 
diff --git a/docs/builtins/script.rst b/docs/builtins/script.rst
new file mode 100644
index 000000000..ae2b9f0f4
--- /dev/null
+++ b/docs/builtins/script.rst
@@ -0,0 +1,19 @@
+script
+------
+
+Executes a batch file of DFHack commands. It reads a text file and runs each
+line as a DFHack command as if it had been typed in by the user - treating the
+input like `an init file <init-files>`.
+
+Some other tools, such as `autobutcher` and `workflow`, export their settings as
+the commands to create them - which can later be reloaded with ``script``.
+
+Usage::
+
+    script <filename>
+
+Examples:
+
+- ``script startup.txt``
+  Executes the commands in ``startup.txt``, which exists in your DF game
+  directory.
diff --git a/docs/builtins/show.rst b/docs/builtins/show.rst
new file mode 100644
index 000000000..8a6f9b446
--- /dev/null
+++ b/docs/builtins/show.rst
@@ -0,0 +1,9 @@
+show
+----
+
+Unhides the DFHack terminal window. Useful if you have hidden the terminal with
+`hide` and you want it back. Since the terminal window won't be available to run
+this command, you'll need to use it from a `keybinding` set beforehand or the
+in-game `command-prompt`.
+
+Only available on Windows.
diff --git a/docs/builtins/tags.rst b/docs/builtins/tags.rst
new file mode 100644
index 000000000..9de0f8df3
--- /dev/null
+++ b/docs/builtins/tags.rst
@@ -0,0 +1,9 @@
+tags
+----
+
+List the strings that DFHack tools can be tagged with. You can find groups of
+related tools by passing the tag name to the `ls` command.
+
+Usage::
+
+    tags
diff --git a/docs/builtins/type.rst b/docs/builtins/type.rst
new file mode 100644
index 000000000..c4c752bef
--- /dev/null
+++ b/docs/builtins/type.rst
@@ -0,0 +1,10 @@
+type
+----
+
+Describes how a command is implemented. DFHack commands can be provided by
+plugins, scripts, or by the core library itself. The ``type`` command can tell
+you which is the source of a particular command.
+
+Usage::
+
+    type <command>
diff --git a/docs/builtins/unload.rst b/docs/builtins/unload.rst
new file mode 100644
index 000000000..f4069ed88
--- /dev/null
+++ b/docs/builtins/unload.rst
@@ -0,0 +1,11 @@
+unload
+------
+
+Unload a plugin from memory. Also see `load` and `reload` for related actions.
+
+Usage::
+
+    unload <plugin> [<plugin> ...]
+    unload -a|--all
+
+You can unload individual named plugins or all plugins at once.
diff --git a/docs/index-tools.rst b/docs/index-tools.rst
index dca14ae3b..a9c540d66 100644
--- a/docs/index-tools.rst
+++ b/docs/index-tools.rst
@@ -1,24 +1,15 @@
 .. _tools-index:
 
-============
-DFHack Tools
-============
+==================
+DFHack Tools Index
+==================
 
 These pages contain information about the plugins, scripts, and built-in
 commands distributed with DFHack.
 
-.. note::
-    In order to avoid user confusion, as a matter of policy all GUI tools
-    display the word :guilabel:`DFHack` on the screen somewhere while active.
-
-    When that is not appropriate because they merely add keybinding hints to
-    existing DF screens, they deliberately use red instead of green for the key.
-
 .. toctree::
    :titlesonly:
    :glob:
 
-   /docs/Tags
-   /docs/Builtin
    /docs/tools/*
    /docs/tools/*/*
diff --git a/index.rst b/index.rst
index 29ac3c129..3e5cdec5d 100644
--- a/index.rst
+++ b/index.rst
@@ -30,7 +30,25 @@ User Manual
    /docs/Installing
    /docs/Support
    /docs/Core
-   /docs/index-tools
    /docs/guides/index
    /docs/index-about
    /docs/index-dev
+
+Tools
+=====
+
+DFHack commands, plugins, and scripts are grouped by tags to make it easier to
+find groups of related tools.
+
+.. note::
+    In order to avoid user confusion, as a matter of policy all GUI tools
+    display the word :guilabel:`DFHack` on the screen somewhere while active.
+
+    When that is not appropriate because they merely add keybinding hints to
+    existing DF screens, they deliberately use red instead of green for the key.
+
+.. toctree::
+   :maxdepth: 1
+
+   /docs/Tags
+   /docs/index-tools
diff --git a/library/lua/helpdb.lua b/library/lua/helpdb.lua
index b52f91f22..18ba5b746 100644
--- a/library/lua/helpdb.lua
+++ b/library/lua/helpdb.lua
@@ -16,7 +16,6 @@ local _ENV = mkmodule('helpdb')
 
 -- paths
 local RENDERED_PATH = 'hack/docs/docs/tools/'
-local BUILTIN_HELP = 'hack/docs/docs/Builtin.txt'
 local TAG_DEFINITIONS = 'hack/docs/docs/Tags.txt'
 
 -- used when reading help text embedded in script sources
@@ -25,6 +24,7 @@ local SCRIPT_DOC_END = ']====]'
 local SCRIPT_DOC_BEGIN_RUBY = '=begin'
 local SCRIPT_DOC_END_RUBY = '=end'
 
+-- enums
 local ENTRY_TYPES = {
     BUILTIN='builtin',
     PLUGIN='plugin',
@@ -38,6 +38,33 @@ local HELP_SOURCES = {
     SCRIPT='script',
 }
 
+-- builtins
+local BUILTINS = {
+    'alias',
+    'clear',
+    'cls',
+    'devel/dump-rpc',
+    'die',
+    'dir',
+    'disable',
+    'enable',
+    'fpause',
+    'help',
+    'hide',
+    'keybinding',
+    'kill-lua',
+    'load',
+    'ls',
+    'plug',
+    'reload',
+    'script',
+    'sc-script',
+    'show',
+    'tags',
+    'type',
+    'unload',
+}
+
 -- entry name -> {
 --   entry_types (set of ENTRY_TYPES),
 --   short_help (string),
@@ -246,46 +273,15 @@ local function update_db(old_db, db, source, entry_name, kwargs)
     end
 end
 
-local BUILTINS = {
-    alias='Configure helper aliases for other DFHack commands.',
-    cls='Clear the console screen.',
-    clear='Clear the console screen.',
-    ['devel/dump-rpc']='Write RPC endpoint information to a file.',
-    die='Force DF to close immediately, without saving.',
-    enable='Enable a plugin or persistent script.',
-    disable='Disable a plugin or persistent script.',
-    fpause='Force DF to pause.',
-    help='Usage help for the given plugin, command, or script.',
-    hide='Hide the terminal window (Windows only).',
-    keybinding='Modify bindings of commands to in-game key shortcuts.',
-    ['kill-lua']='Stop a misbehaving Lua script.',
-    ['load']='Load and register a plugin library.',
-    unload='Unregister and unload a plugin.',
-    reload='Unload and reload a plugin library.',
-    ls='List commands, optionally filtered by a tag or substring.',
-    dir='List commands, optionally filtered by a tag or substring.',
-    plug='List plugins and whether they are enabled.',
-    ['sc-script']='Automatically run specified scripts on state change events.',
-    script='Run commands specified in a file.',
-    show='Show a hidden terminal window (Windows only).',
-    tags='List the tags that the DFHack tools are grouped by.',
-    ['type']='Discover how a command is implemented.',
-}
-
 -- add the builtin commands to the db
 local function scan_builtins(old_db, db)
-    local entry = make_default_entry('builtin',
-                {[ENTRY_TYPES.BUILTIN]=true, [ENTRY_TYPES.COMMAND]=true},
-                HELP_SOURCES.RENDERED, 0, BUILTIN_HELP)
-    -- read in builtin help
-    local f = io.open(BUILTIN_HELP)
-    if f then
-        entry.long_help = f:read('*all')
-    end
-    for b,short_help in pairs(BUILTINS) do
-        local builtin_entry = copyall(entry)
-        builtin_entry.short_help = short_help
-        db[b] = builtin_entry
+    local entry_types = {[ENTRY_TYPES.BUILTIN]=true, [ENTRY_TYPES.COMMAND]=true}
+    for _,builtin in ipairs(BUILTINS) do
+        update_db(old_db, db,
+                    has_rendered_help(builtin) and
+                        HELP_SOURCES.RENDERED or HELP_SOURCES.STUB,
+                    builtin,
+                    {entry_types=entry_types})
     end
 end
 

From 019856883bce4c911ee01f2383b48c838ecdb002 Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Mon, 18 Jul 2022 11:10:56 -0700
Subject: [PATCH 223/854] update sc-script docs based on code spelunking

---
 docs/builtins/sc-script.rst | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/docs/builtins/sc-script.rst b/docs/builtins/sc-script.rst
index 1d5d177c7..4c99f3225 100644
--- a/docs/builtins/sc-script.rst
+++ b/docs/builtins/sc-script.rst
@@ -2,8 +2,19 @@ sc-script
 ---------
 
 Runs commands when game state changes occur. This is similar to the static
-`init-files` but can be set dynamically.
+`init-files` but is slightly more flexible since it can be set dynamically.
 
-Usage::
+Usage:
 
-    sc-script 
+- ``sc-script [help]``
+  Show the list of valid event names.
+- ``sc-script list [<event>]``
+  List the currently registered files for all events or the specified event.
+- ``sc-script add|remove <event> <file> [<file> ...]``
+  Register or unregister a file to be run for the specified event.
+
+Examples:
+
+- ``sc-script add SC_MAP_LOADED spawn_extra_monsters.init``
+  Registers the ``spawn_extra_monsters.init`` file to be run whenever a new map
+  is loaded.

From d27def7128f598a933edbbdf5342e44486414632 Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Mon, 18 Jul 2022 11:16:05 -0700
Subject: [PATCH 224/854] spacing is important

otherwise the usage and examples lists don't put the explanations on the
next line
---
 docs/builtins/alias.rst      | 10 +++++-----
 docs/builtins/disable.rst    |  4 ++--
 docs/builtins/enable.rst     |  4 ++--
 docs/builtins/keybinding.rst | 17 ++++++++---------
 docs/builtins/ls.rst         | 22 +++++++++++-----------
 docs/builtins/plug.rst       |  6 +++---
 docs/builtins/sc-script.rst  | 10 +++++-----
 docs/builtins/script.rst     |  4 ++--
 8 files changed, 38 insertions(+), 39 deletions(-)

diff --git a/docs/builtins/alias.rst b/docs/builtins/alias.rst
index 8ca1f014c..034d0f33a 100644
--- a/docs/builtins/alias.rst
+++ b/docs/builtins/alias.rst
@@ -9,14 +9,14 @@ script.
 Usage:
 
 - ``alias list``
-  lists all configured aliases
+    Lists all configured aliases
 - ``alias add <name> <command> [arguments...]``
-  adds an alias
+    Adds an alias
 - ``alias replace <name> <command> [arguments...]``
-  replaces an existing alias with a new command, or adds the alias if it does
-  not already exist
+    Replaces an existing alias with a new command, or adds the alias if it does
+    not already exist
 - ``alias delete <name>``
-  removes the specified alias
+    Removes the specified alias
 
 Aliases can be given additional arguments when created and invoked, which will
 be passed to the underlying command in order.
diff --git a/docs/builtins/disable.rst b/docs/builtins/disable.rst
index 11077c883..d871ff06e 100644
--- a/docs/builtins/disable.rst
+++ b/docs/builtins/disable.rst
@@ -13,8 +13,8 @@ and disabled plugins, and shows whether that can be changed through the same
 commands. Passing plugin names to these commands will enable or disable the
 specified plugins. For example, to disable the `manipulator` plugin::
 
-  disable manipulator
+    disable manipulator
 
 It is also possible to enable or disable multiple plugins at once::
 
-  disable manipulator search
+    disable manipulator search
diff --git a/docs/builtins/enable.rst b/docs/builtins/enable.rst
index eef76c45d..8338cc7f4 100644
--- a/docs/builtins/enable.rst
+++ b/docs/builtins/enable.rst
@@ -13,8 +13,8 @@ and disabled plugins, and shows whether that can be changed through the same
 commands. Passing plugin names to these commands will enable or disable the
 specified plugins. For example, to enable the `manipulator` plugin::
 
-  enable manipulator
+    enable manipulator
 
 It is also possible to enable or disable multiple plugins at once::
 
-  enable manipulator search
+    enable manipulator search
diff --git a/docs/builtins/keybinding.rst b/docs/builtins/keybinding.rst
index bce450e46..7ab92c206 100644
--- a/docs/builtins/keybinding.rst
+++ b/docs/builtins/keybinding.rst
@@ -11,15 +11,15 @@ Hotkeys can be any combinations of Ctrl/Alt/Shift with A-Z, 0-9, F1-F12, or
 Usage:
 
 - ``keybinding``
-  Show some useful information, including the current game context.
+    Show some useful information, including the current game context.
 - ``keybinding list <key>``
-  List bindings active for the key combination.
+    List bindings active for the key combination.
 - ``keybinding clear <key> [<key>...]``
-  Remove bindings for the specified keys.
+    Remove bindings for the specified keys.
 - ``keybinding add <key> "cmdline" ["cmdline"...]``
-  Add bindings for the specified key.
+    Add bindings for the specified key.
 - ``keybinding set <key> "cmdline" ["cmdline"...]``
-  Clear, and then add bindings for the specified key.
+    Clear, and then add bindings for the specified key.
 
 The ``<key>`` parameter above has the following **case-sensitive** syntax::
 
@@ -49,8 +49,7 @@ Interactive commands like `liquids` cannot be used as hotkeys.
 Examples:
 
 - ``keybinding add Alt-F1 hotkeys``
-  Bind Alt-F1 to run the `hotkeys` command on any screen at any time.
+    Bind Alt-F1 to run the `hotkeys` command on any screen at any time.
 - ``keybinding add Alt-F@dwarfmode gui/quickfort``
-  Bind Alt-F to run `gui/quickfort`, but only when on a screen that shows the
-  main map.
-
+    Bind Alt-F to run `gui/quickfort`, but only when on a screen that shows the
+    main map.
diff --git a/docs/builtins/ls.rst b/docs/builtins/ls.rst
index 5eaa9dc01..fd2e532ed 100644
--- a/docs/builtins/ls.rst
+++ b/docs/builtins/ls.rst
@@ -9,26 +9,26 @@ command.
 Usage:
 
 - ``ls [<options>]``
-  Lists all available commands and the tags associated with them.
+    Lists all available commands and the tags associated with them.
 - ``ls <tag> [<options>]``
-  Shows only commands that have the given tag. Use the `tags` command to see
-  the list of available tags.
+    Shows only commands that have the given tag. Use the `tags` command to see
+    the list of available tags.
 - ``ls <string> [<options>]``
-  Shows commands that include the given string. E.g. ``ls quick`` will show all
-  the commands with "quick" in their names. If the string is also the name of a
-  tag, then it will be interpreted as a tag name.
+    Shows commands that include the given string. E.g. ``ls quick`` will show
+    all the commands with "quick" in their names. If the string is also the
+    name of a tag, then it will be interpreted as a tag name.
 
 You can also pass some optional parameters to change how ``ls`` behaves:
 
 - ``--notags``
-  Don't print out the tags associated with each command.
+    Don't print out the tags associated with each command.
 - ``--dev``
-  Include commands intended for developers and modders.
+    Include commands intended for developers and modders.
 
 Examples:
 
 - ``ls adventure``
-  Lists all commands with the ``adventure`` tag.
+    Lists all commands with the ``adventure`` tag.
 - ``ls --dev trigger``
-  Lists all commands, including developer and modding commands, that match the
-  substring "trigger"
+    Lists all commands, including developer and modding commands, that match the
+    substring "trigger"
diff --git a/docs/builtins/plug.rst b/docs/builtins/plug.rst
index da0adb657..93bd452a7 100644
--- a/docs/builtins/plug.rst
+++ b/docs/builtins/plug.rst
@@ -6,7 +6,7 @@ Lists available plugins and whether they are enabled.
 Usage:
 
 - ``plug``
-  Lists available plugins and whether they are enabled.
+    Lists available plugins and whether they are enabled.
 - ``plug <plugin> [<plugin> ...]``
-  Shows the commands implemented by the named plugins and whether the plugins
-  are enabled.
+    Shows the commands implemented by the named plugins and whether the plugins
+    are enabled.
diff --git a/docs/builtins/sc-script.rst b/docs/builtins/sc-script.rst
index 4c99f3225..20a0e9497 100644
--- a/docs/builtins/sc-script.rst
+++ b/docs/builtins/sc-script.rst
@@ -7,14 +7,14 @@ Runs commands when game state changes occur. This is similar to the static
 Usage:
 
 - ``sc-script [help]``
-  Show the list of valid event names.
+    Show the list of valid event names.
 - ``sc-script list [<event>]``
-  List the currently registered files for all events or the specified event.
+    List the currently registered files for all events or the specified event.
 - ``sc-script add|remove <event> <file> [<file> ...]``
-  Register or unregister a file to be run for the specified event.
+    Register or unregister a file to be run for the specified event.
 
 Examples:
 
 - ``sc-script add SC_MAP_LOADED spawn_extra_monsters.init``
-  Registers the ``spawn_extra_monsters.init`` file to be run whenever a new map
-  is loaded.
+    Registers the ``spawn_extra_monsters.init`` file to be run whenever a new
+    map is loaded.
diff --git a/docs/builtins/script.rst b/docs/builtins/script.rst
index ae2b9f0f4..ae4017ca7 100644
--- a/docs/builtins/script.rst
+++ b/docs/builtins/script.rst
@@ -15,5 +15,5 @@ Usage::
 Examples:
 
 - ``script startup.txt``
-  Executes the commands in ``startup.txt``, which exists in your DF game
-  directory.
+    Executes the commands in ``startup.txt``, which exists in your DF game
+    directory.

From 2207f2699216a4a7d974ea423c1bb1d2bc5a9ea3 Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Mon, 18 Jul 2022 11:34:58 -0700
Subject: [PATCH 225/854] update docs for 3dveins

---
 docs/plugins/3dveins.rst | 33 +++++++++++++++++++++++----------
 plugins/3dveins.cpp      |  9 +++------
 2 files changed, 26 insertions(+), 16 deletions(-)

diff --git a/docs/plugins/3dveins.rst b/docs/plugins/3dveins.rst
index 0e6841792..9a074a4c8 100644
--- a/docs/plugins/3dveins.rst
+++ b/docs/plugins/3dveins.rst
@@ -1,14 +1,27 @@
 3dveins
 =======
-Removes all existing veins from the map and generates new ones using
-3D Perlin noise, in order to produce a layout that smoothly flows between
-Z levels. The vein distribution is based on the world seed, so running
-the command for the second time should produce no change. It is best to
-run it just once immediately after embark.
-
-This command is intended as only a cosmetic change, so it takes
-care to exactly preserve the mineral counts reported by `prospect` ``all``.
-The amounts of different layer stones may slightly change in some cases
-if vein mass shifts between Z layers.
+
+Rewrites layer veins to expand in 3D space. Existing, flat veins are removed
+and new 3D veins that naturally span z-levels are generated in their place.
+The transformation preserves the mineral counts reported by `prospect`.
+
+Usage::
+
+    3dveins [verbose]
+
+The ``verbose`` option prints out extra information to the console.
+
+Example::
+
+    3dveins
+
+New veins are generated using 3D Perlin noise in order to produce a layout that
+flows smoothly between z-levels. The vein distribution is based on the world
+seed, so running the command for the second time should produce no change. It is
+best to run it just once immediately after embark.
+
+This command is intended as only a cosmetic change, so it takes care to exactly
+preserve the mineral counts reported by ``prospect all``. The amounts of layer
+stones may slightly change in some cases if vein mass shifts between z layers.
 
 The only undo option is to restore your save from backup.
diff --git a/plugins/3dveins.cpp b/plugins/3dveins.cpp
index 929ee24f6..eaf741caf 100644
--- a/plugins/3dveins.cpp
+++ b/plugins/3dveins.cpp
@@ -52,12 +52,9 @@ command_result cmd_3dveins(color_ostream &out, std::vector <std::string> & param
 DFhackCExport command_result plugin_init ( color_ostream &out, std::vector <PluginCommand> &commands)
 {
     commands.push_back(PluginCommand(
-        "3dveins", "Rewrites the veins to make them extend in 3D space.",
-        cmd_3dveins, false,
-        "  Run this after embark to change all veins on the map to a shape\n"
-        "  that consistently spans Z levels. The operation preserves the\n"
-        "  mineral counts reported by prospect.\n"
-    ));
+        "3dveins",
+        "Rewrites the veins to make them extend in 3D space.",
+        cmd_3dveins));
     return CR_OK;
 }
 

From 02ba204f5b94eeca18e3c42a5ce4466516ebc02a Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Mon, 18 Jul 2022 11:39:52 -0700
Subject: [PATCH 226/854] update docs for add-spatter

---
 docs/plugins/add-spatter.rst | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/docs/plugins/add-spatter.rst b/docs/plugins/add-spatter.rst
index 15b99ff52..b6bb97cf7 100644
--- a/docs/plugins/add-spatter.rst
+++ b/docs/plugins/add-spatter.rst
@@ -1,6 +1,9 @@
 add-spatter
 ===========
-This plugin makes reactions with names starting with ``SPATTER_ADD_``
-produce contaminants on the items instead of improvements.  The plugin is
-intended to give some use to all those poisons that can be bought from caravans,
-so they're immune to being washed away by water or destroyed by `clean`.
+
+Make tagged reactions produce contaminants. The plugin is intended to give some
+use to all those poisons that can be bought from caravans. It automatically
+enables itself when you load a world with reactions that include names starting
+with ``SPATTER_ADD_``. These reactions will then produce contaminants on items
+instead of improvements. The contaminants are immune to being washed away by
+water or destroyed by `clean`.

From 5ff31e0cc13c5725e5158939b6fcf36b9ecd0a6e Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Mon, 18 Jul 2022 12:36:11 -0700
Subject: [PATCH 227/854] remove defunct advtools plugin

---
 docs/plugins/adv-bodyswap.rst |  12 -
 plugins/CMakeLists.txt        |   1 -
 plugins/advtools.cpp          | 827 ----------------------------------
 3 files changed, 840 deletions(-)
 delete mode 100644 docs/plugins/adv-bodyswap.rst
 delete mode 100644 plugins/advtools.cpp

diff --git a/docs/plugins/adv-bodyswap.rst b/docs/plugins/adv-bodyswap.rst
deleted file mode 100644
index 46b961517..000000000
--- a/docs/plugins/adv-bodyswap.rst
+++ /dev/null
@@ -1,12 +0,0 @@
-adv-bodyswap
-============
-This allows taking control over your followers and other creatures in adventure
-mode. For example, you can make them pick up new arms and armor and equip them
-properly.
-
-Usage:
-
-* When viewing unit details, body-swaps into that unit.
-* In the main adventure mode screen, reverts transient swap.
-
-:dfhack-keybind:`adv-bodyswap`
diff --git a/plugins/CMakeLists.txt b/plugins/CMakeLists.txt
index af646759f..b9d63839e 100644
--- a/plugins/CMakeLists.txt
+++ b/plugins/CMakeLists.txt
@@ -82,7 +82,6 @@ if(BUILD_SUPPORTED)
 
     dfhack_plugin(3dveins 3dveins.cpp)
     dfhack_plugin(add-spatter add-spatter.cpp)
-    # dfhack_plugin(advtools advtools.cpp)
     dfhack_plugin(autochop autochop.cpp)
     dfhack_plugin(autoclothing autoclothing.cpp)
     dfhack_plugin(autodump autodump.cpp)
diff --git a/plugins/advtools.cpp b/plugins/advtools.cpp
deleted file mode 100644
index a1965cba0..000000000
--- a/plugins/advtools.cpp
+++ /dev/null
@@ -1,827 +0,0 @@
-#include "Core.h"
-#include "Console.h"
-#include "Export.h"
-#include "PluginManager.h"
-#include "MiscUtils.h"
-#include "modules/World.h"
-#include "modules/Translation.h"
-#include "modules/Materials.h"
-#include "modules/Maps.h"
-#include "modules/Items.h"
-#include "modules/Gui.h"
-#include "modules/Units.h"
-
-#include "DataDefs.h"
-#include "df/world.h"
-#include "df/ui_advmode.h"
-#include "df/item.h"
-#include "df/unit.h"
-#include "df/unit_inventory_item.h"
-#include "df/unit_relationship_type.h"
-#include "df/map_block.h"
-#include "df/nemesis_record.h"
-#include "df/historical_figure.h"
-#include "df/general_ref_is_nemesisst.h"
-#include "df/general_ref_contains_itemst.h"
-#include "df/general_ref_contained_in_itemst.h"
-#include "df/general_ref_unit_holderst.h"
-#include "df/general_ref_building_civzone_assignedst.h"
-#include "df/material.h"
-#include "df/craft_material_class.h"
-#include "df/viewscreen_optionst.h"
-#include "df/viewscreen_dungeonmodest.h"
-#include "df/viewscreen_dungeon_monsterstatusst.h"
-#include "df/nemesis_flags.h"
-
-#include <math.h>
-
-using namespace DFHack;
-using namespace df::enums;
-
-using df::nemesis_record;
-using df::historical_figure;
-
-using namespace DFHack::Translation;
-/*
-advtools
-========
-A package of different adventure mode tools.  Usage:
-
-:list-equipped [all]:   List armor and weapons equipped by your companions.
-                        If all is specified, also lists non-metal clothing.
-:metal-detector [all-types] [non-trader]:
-                        Reveal metal armor and weapons in shops. The options
-                        disable the checks on item type and being in shop.
-*/
-
-DFHACK_PLUGIN("advtools");
-REQUIRE_GLOBAL(world);
-REQUIRE_GLOBAL(ui_advmode);
-
-/*********************
- *  PLUGIN INTERFACE *
- *********************/
-
-static bool bodyswap_hotkey(df::viewscreen *top);
-
-command_result adv_bodyswap (color_ostream &out, std::vector <std::string> & parameters);
-command_result adv_tools (color_ostream &out, std::vector <std::string> & parameters);
-
-DFhackCExport command_result plugin_init (color_ostream &out, std::vector <PluginCommand> &commands)
-{
-    if (!ui_advmode)
-        return CR_OK;
-
-    commands.push_back(PluginCommand(
-        "advtools", "Adventure mode tools.",
-        adv_tools, false,
-        "  list-equipped [all]\n"
-        "    List armor and weapons equipped by your companions.\n"
-        "    If all is specified, also lists non-metal clothing.\n"
-        "  metal-detector [all-types] [non-trader]\n"
-        "    Reveal metal armor and weapons in shops. The options\n"
-        "    disable the checks on item type and being in shop.\n"
-    ));
-
-    commands.push_back(PluginCommand(
-        "adv-bodyswap", "Change the adventurer unit.",
-        adv_bodyswap, bodyswap_hotkey,
-        " - When viewing unit details, body-swaps into that unit.\n"
-        " - In the main adventure mode screen, reverts transient swap.\n"
-        "Options:\n"
-        "  force\n"
-        "    Allow swapping into non-companion units.\n"
-        "  permanent\n"
-        "    Permanently change the unit to be the adventurer.\n"
-        "    Otherwise it will revert if adv-bodyswap is called\n"
-        "    in the main screen, or if the main menu, Fast Travel\n"
-        "    or Sleep/Wait screen is opened.\n"
-        "  noinherit\n"
-        "    In permanent mode, don't reassign companions to the new unit.\n"
-    ));
-
-    return CR_OK;
-}
-
-DFhackCExport command_result plugin_shutdown ( color_ostream &out )
-{
-    return CR_OK;
-}
-
-df::nemesis_record *getPlayerNemesis(color_ostream &out, bool restore_swap);
-
-DFHACK_PLUGIN_IS_ENABLED(in_transient_swap);
-
-DFhackCExport command_result plugin_onstatechange(color_ostream &out, state_change_event event)
-{
-    switch (event) {
-    case SC_WORLD_LOADED:
-    case SC_WORLD_UNLOADED:
-        in_transient_swap = false;
-        break;
-    default:
-        break;
-    }
-    return CR_OK;
-}
-
-DFhackCExport command_result plugin_onupdate ( color_ostream &out )
-{
-    // Revert transient swaps before trouble happens
-    if (in_transient_swap)
-    {
-        auto screen = Core::getTopViewscreen();
-        bool revert = false;
-
-        if (strict_virtual_cast<df::viewscreen_dungeonmodest>(screen))
-        {
-            using namespace df::enums::ui_advmode_menu;
-
-            switch (ui_advmode->menu)
-            {
-            case Travel:
-            // was also Sleep, now equivalent
-                revert = true;
-                break;
-            default:
-                break;
-            }
-        }
-        else if (strict_virtual_cast<df::viewscreen_optionst>(screen))
-        {
-            // Options may mean save game
-            revert = true;
-        }
-
-        if (revert)
-        {
-            getPlayerNemesis(out, true);
-            in_transient_swap = false;
-        }
-    }
-
-    return CR_OK;
-}
-
-/*********************
- * UTILITY FUNCTIONS *
- *********************/
-
-static bool bodyswap_hotkey(df::viewscreen *top)
-{
-    return !!virtual_cast<df::viewscreen_dungeonmodest>(top) ||
-           !!virtual_cast<df::viewscreen_dungeon_monsterstatusst>(top);
-}
-
-bool bodySwap(color_ostream &out, df::unit *player)
-{
-    if (!player)
-    {
-        out.printerr("Unit to swap is NULL\n");
-        return false;
-    }
-
-    auto &vec = world->units.active;
-
-    int idx = linear_index(vec, player);
-    if (idx < 0)
-    {
-        out.printerr("Unit to swap not found: %d\n", player->id);
-        return false;
-    }
-
-    if (idx != 0)
-        std::swap(vec[0], vec[idx]);
-
-    return true;
-}
-
-df::nemesis_record *getPlayerNemesis(color_ostream &out, bool restore_swap)
-{
-    auto real_nemesis = vector_get(world->nemesis.all, ui_advmode->player_id);
-    if (!real_nemesis || !real_nemesis->unit)
-    {
-        out.printerr("Invalid player nemesis id: %d\n", ui_advmode->player_id);
-        return NULL;
-    }
-
-    if (restore_swap)
-    {
-        df::unit *ctl = world->units.active[0];
-        auto ctl_nemesis = Units::getNemesis(ctl);
-
-        if (ctl_nemesis != real_nemesis)
-        {
-            if (!bodySwap(out, real_nemesis->unit))
-                return NULL;
-
-            auto name = TranslateName(&real_nemesis->unit->name, false);
-            out.print("Returned into the body of %s.\n", name.c_str());
-        }
-
-        real_nemesis->unit->relationship_ids[df::unit_relationship_type::GroupLeader] = -1;
-        in_transient_swap = false;
-    }
-
-    return real_nemesis;
-}
-
-void changeGroupLeader(df::nemesis_record *new_nemesis, df::nemesis_record *old_nemesis)
-{
-    auto &cvec = new_nemesis->companions;
-
-    // Swap companions
-    cvec.swap(old_nemesis->companions);
-
-    vector_erase_at(cvec, linear_index(cvec, new_nemesis->id));
-    insert_into_vector(cvec, old_nemesis->id);
-
-    // Update follow
-    new_nemesis->group_leader_id = -1;
-    new_nemesis->unit->relationship_ids[df::unit_relationship_type::GroupLeader] = -1;
-
-    for (unsigned i = 0; i < cvec.size(); i++)
-    {
-        auto nm = df::nemesis_record::find(cvec[i]);
-        if (!nm)
-            continue;
-
-        nm->group_leader_id = new_nemesis->id;
-        if (nm->unit)
-            nm->unit->relationship_ids[df::unit_relationship_type::GroupLeader] = new_nemesis->unit_id;
-    }
-}
-
-void copyAcquaintances(df::nemesis_record *new_nemesis, df::nemesis_record *old_nemesis)
-{
-    auto &svec = old_nemesis->unit->adventurer_knows;
-    auto &tvec = new_nemesis->unit->adventurer_knows;
-
-    for (unsigned i = 0; i < svec.size(); i++)
-        insert_into_vector(tvec, svec[i]);
-
-    insert_into_vector(tvec, old_nemesis->unit_id);
-}
-
-void sortCompanionNemesis(std::vector<nemesis_record*> *list, int player_id = -1)
-{
-    std::map<int, nemesis_record*> table;
-    std::vector<nemesis_record*> output;
-
-    output.reserve(list->size());
-
-    if (player_id < 0)
-    {
-        auto real_nemesis = vector_get(world->nemesis.all, ui_advmode->player_id);
-        if (real_nemesis)
-            player_id = real_nemesis->id;
-    }
-
-    // Index records; find the player
-    for (size_t i = 0; i < list->size(); i++)
-    {
-        auto item = (*list)[i];
-        if (item->id == player_id)
-            output.push_back(item);
-        else
-            table[item->figure->id] = item;
-    }
-
-    // Pull out the items by the persistent sort order
-    auto &order_vec = ui_advmode->companions.all_histfigs;
-    for (size_t i = 0; i < order_vec.size(); i++)
-    {
-        auto it = table.find(order_vec[i]);
-        if (it == table.end())
-            continue;
-        output.push_back(it->second);
-        table.erase(it);
-    }
-
-    // The remaining ones in reverse id order
-    for (auto it = table.rbegin(); it != table.rend(); ++it)
-        output.push_back(it->second);
-
-    list->swap(output);
-}
-
-void listCompanions(color_ostream &out, std::vector<nemesis_record*> *list, bool units = true)
-{
-    nemesis_record *player = getPlayerNemesis(out, false);
-    if (!player)
-        return;
-
-    list->push_back(player);
-
-    for (size_t i = 0; i < player->companions.size(); i++)
-    {
-        auto item = nemesis_record::find(player->companions[i]);
-        if (item && (item->unit || !units))
-            list->push_back(item);
-    }
-}
-
-std::string getUnitNameProfession(df::unit *unit)
-{
-    std::string name = TranslateName(&unit->name, false) + ", ";
-    if (unit->custom_profession.empty())
-        name += ENUM_ATTR_STR(profession, caption, unit->profession);
-    else
-        name += unit->custom_profession;
-    return name;
-}
-
-enum InventoryMode {
-    INV_HAULED,
-    INV_WEAPON,
-    INV_WORN,
-    INV_IN_CONTAINER
-};
-
-typedef std::pair<df::item*,InventoryMode> inv_item;
-
-static void listContainerInventory(std::vector<inv_item> *list, df::item *container)
-{
-    auto &refs = container->general_refs;
-    for (size_t i = 0; i < refs.size(); i++)
-    {
-        auto ref = refs[i];
-        if (!strict_virtual_cast<df::general_ref_contains_itemst>(ref))
-            continue;
-
-        df::item *child = ref->getItem();
-        if (!child) continue;
-
-        list->push_back(inv_item(child, INV_IN_CONTAINER));
-        listContainerInventory(list, child);
-    }
-}
-
-void listUnitInventory(std::vector<inv_item> *list, df::unit *unit)
-{
-    auto &items = unit->inventory;
-    for (size_t i = 0; i < items.size(); i++)
-    {
-        auto item = items[i];
-        InventoryMode mode;
-
-        switch (item->mode) {
-        case df::unit_inventory_item::Hauled:
-            mode = INV_HAULED;
-            break;
-        case df::unit_inventory_item::Weapon:
-            mode = INV_WEAPON;
-            break;
-        default:
-            mode = INV_WORN;
-        }
-
-        list->push_back(inv_item(item->item, mode));
-        listContainerInventory(list, item->item);
-    }
-}
-
-bool isShopItem(df::item *item)
-{
-    for (size_t k = 0; k < item->general_refs.size(); k++)
-    {
-        auto ref = item->general_refs[k];
-        if (virtual_cast<df::general_ref_building_civzone_assignedst>(ref))
-            return true;
-    }
-
-    return false;
-}
-
-bool isWeaponArmor(df::item *item)
-{
-    using namespace df::enums::item_type;
-
-    switch (item->getType()) {
-    case HELM:
-    case ARMOR:
-    case WEAPON:
-    case AMMO:
-    case GLOVES:
-    case PANTS:
-    case SHOES:
-        return true;
-    default:
-        return false;
-    }
-}
-
-int containsMetalItems(df::item *item, bool all, bool non_trader, bool rec = false)
-{
-    int cnt = 0;
-
-    auto &refs = item->general_refs;
-    for (size_t i = 0; i < refs.size(); i++)
-    {
-        auto ref = refs[i];
-
-        if (strict_virtual_cast<df::general_ref_unit_holderst>(ref))
-            return 0;
-        if (!rec && strict_virtual_cast<df::general_ref_contained_in_itemst>(ref))
-            return 0;
-
-        if (strict_virtual_cast<df::general_ref_contains_itemst>(ref))
-        {
-            df::item *child = ref->getItem();
-            if (!child) continue;
-
-            cnt += containsMetalItems(child, all, non_trader, true);
-        }
-    }
-
-    if (!non_trader && !isShopItem(item))
-        return cnt;
-    if (!all && !isWeaponArmor(item))
-        return cnt;
-
-    MaterialInfo minfo(item);
-    if (minfo.getCraftClass() != craft_material_class::Metal)
-        return cnt;
-
-    return ++cnt;
-}
-
-void joinCounts(std::map<df::coord, int> &counts)
-{
-    for (auto it = counts.begin(); it != counts.end(); it++)
-    {
-        df::coord pt = it->first;
-        while (pt.x > 0 && counts.count(pt - df::coord(1,0,0)))
-            pt.x--;
-        while (pt.y > 0 &&counts.count(pt - df::coord(0,1,0)))
-            pt.y--;
-        while (pt.x < 0 && counts.count(pt + df::coord(1,0,0)))
-            pt.x++;
-        while (pt.y < 0 &&counts.count(pt + df::coord(0,1,0)))
-            pt.y++;
-
-        if (pt == it->first)
-            continue;
-
-        counts[pt] += it->second;
-        it->second = 0;
-    }
-}
-
-/*********************
- *     FORMATTING    *
- *********************/
-
-static void printCompanionHeader(color_ostream &out, size_t i, df::unit *unit)
-{
-    out.color(COLOR_GREY);
-
-    if (i < 28)
-        out << char('a'+i);
-    else
-        out << i;
-
-    out << ": " << getUnitNameProfession(unit);
-    if (Units::isDead(unit))
-        out << " (DEAD)";
-    if (Units::isGhost(unit))
-        out << " (GHOST)";
-    out << endl;
-
-    out.reset_color();
-}
-
-static size_t formatSize(std::vector<std::string> *out, const std::map<std::string, int> in, size_t *cnt)
-{
-    size_t len = 0;
-
-    for (auto it = in.begin(); it != in.end(); ++it)
-    {
-        std::string line = it->first;
-        if (it->second != 1)
-            line += stl_sprintf(" [%d]", it->second);
-        len = std::max(len, line.size());
-        out->push_back(line);
-    }
-
-    if (out->empty())
-    {
-        out->push_back("(none)");
-        len = 6;
-    }
-
-    if (cnt)
-        *cnt = std::max(*cnt, out->size());
-
-    return len;
-}
-
-static std::string formatDirection(df::coord delta)
-{
-    std::string ns, ew, dir;
-
-    if (delta.x > 0)
-        ew = "E";
-    else if (delta.x < 0)
-        ew = "W";
-
-    if (delta.y > 0)
-        ns = "S";
-    else if (delta.y < 0)
-        ns = "N";
-
-    if (abs(delta.x) > abs(delta.y)*5)
-        dir = ew;
-    else if (abs(delta.y) > abs(delta.x)*5)
-        dir = ns;
-    else if (abs(delta.x) > abs(delta.y)*2)
-        dir = ew + ns + ew;
-    else if (abs(delta.y) > abs(delta.x)*2)
-        dir = ns + ns + ew;
-    else if (delta.x || delta.y)
-        dir = ns + ew;
-    else
-        dir = "***";
-
-    int dist = (int)sqrt((double)(delta.x*delta.x + delta.y*delta.y));
-    return stl_sprintf("%d away %s %+d", dist, dir.c_str(), delta.z);
-}
-
-static void printEquipped(color_ostream &out, df::unit *unit, bool all)
-{
-    std::vector<inv_item> items;
-    listUnitInventory(&items, unit);
-
-    std::map<std::string, int> head, body, legs, weapons;
-
-    for (auto it = items.begin(); it != items.end(); ++it)
-    {
-        df::item *item = it->first;
-
-        // Skip non-worn non-weapons
-        ItemTypeInfo iinfo(item);
-
-        bool is_weapon = (it->second == INV_WEAPON || iinfo.type == item_type::AMMO);
-        if (!(is_weapon || it->second == INV_WORN))
-            continue;
-
-        // Skip non-metal, unless all
-        MaterialInfo minfo(item);
-        df::craft_material_class mclass = minfo.getCraftClass();
-
-        bool is_metal = (mclass == craft_material_class::Metal);
-        if (!(is_weapon || all || is_metal))
-            continue;
-
-        // Format the name
-        std::string name;
-        if (is_metal)
-            name = minfo.toString() + " ";
-        else if (mclass != craft_material_class::None)
-            name = toLower(ENUM_KEY_STR(craft_material_class,mclass)) + " ";
-        name += iinfo.toString();
-
-        // Add to the right table
-        int count = item->getStackSize();
-
-        if (is_weapon)
-        {
-            weapons[name] += count;
-            continue;
-        }
-
-        switch (iinfo.type) {
-        case item_type::HELM:
-            head[name] += count;
-            break;
-        case item_type::ARMOR:
-        case item_type::GLOVES:
-        case item_type::BACKPACK:
-        case item_type::QUIVER:
-            body[name] += count;
-            break;
-        case item_type::PANTS:
-        case item_type::SHOES:
-            legs[name] += count;
-            break;
-        default:
-            weapons[name] += count;
-        }
-    }
-
-    std::vector<std::string> cols[4];
-    size_t sizes[4];
-    size_t lines = 0;
-
-    sizes[0] = formatSize(&cols[0], head, &lines);
-    sizes[1] = formatSize(&cols[1], body, &lines);
-    sizes[2] = formatSize(&cols[2], legs, &lines);
-    sizes[3] = formatSize(&cols[3], weapons, &lines);
-
-    for (size_t i = 0; i < lines; i++)
-    {
-        for (int j = 0; j < 4; j++)
-        {
-            size_t sz = std::max(sizes[j], size_t(18));
-            out << "| " << std::left << std::setw(sz) << vector_get(cols[j],i) << " ";
-        }
-
-        out << "|" << std::endl;
-    }
-}
-
-/*********************
- *      COMMANDS     *
- *********************/
-
-command_result adv_bodyswap (color_ostream &out, std::vector <std::string> & parameters)
-{
-    // HOTKEY COMMAND; CORE IS SUSPENDED
-    bool force = false;
-    bool permanent = false;
-    bool no_make_leader = false;
-
-    for (unsigned i = 0; i < parameters.size(); i++)
-    {
-        auto &item = parameters[i];
-
-        if (item == "force")
-            force = true;
-        else if (item == "permanent")
-            permanent = true;
-        else if (item == "noinherit")
-            no_make_leader = true;
-        else
-            return CR_WRONG_USAGE;
-    }
-
-    // Get the real player; undo previous transient swap
-    auto real_nemesis = getPlayerNemesis(out, true);
-    if (!real_nemesis)
-        return CR_FAILURE;
-
-    // Get the unit to swap to
-    auto new_unit = Gui::getSelectedUnit(out, true);
-    auto new_nemesis = Units::getNemesis(new_unit);
-
-    if (!new_nemesis)
-    {
-        if (new_unit)
-        {
-            out.printerr("Cannot swap into a non-historical unit.\n");
-            return CR_FAILURE;
-        }
-
-        return CR_OK;
-    }
-
-    if (new_nemesis == real_nemesis)
-        return CR_OK;
-
-    // Verify it's a companion
-    if (!force && linear_index(real_nemesis->companions, new_nemesis->id) < 0)
-    {
-        out.printerr("This is not your companion - use force to bodyswap.\n");
-        return CR_FAILURE;
-    }
-
-    // Swap
-    if (!bodySwap(out, new_nemesis->unit))
-        return CR_FAILURE;
-
-    auto name = TranslateName(&new_nemesis->unit->name, false);
-    out.print("Swapped into the body of %s.\n", name.c_str());
-
-    // Permanently re-link everything
-    if (permanent)
-    {
-        using namespace df::enums::nemesis_flags;
-
-        ui_advmode->player_id = linear_index(world->nemesis.all, new_nemesis);
-
-        // Flag 0 appears to be the 'active adventurer' flag, and
-        // the player_id field above seems to be computed using it
-        // when a savegame is loaded.
-        // Also, unless this is set, it is impossible to retire.
-        real_nemesis->flags.set(ACTIVE_ADVENTURER, false);
-        new_nemesis->flags.set(ACTIVE_ADVENTURER, true);
-
-        real_nemesis->flags.set(RETIRED_ADVENTURER, true); // former retired adventurer
-        new_nemesis->flags.set(ADVENTURER, true); // blue color in legends
-
-        // Reassign companions and acquaintances
-        if (!no_make_leader)
-        {
-            changeGroupLeader(new_nemesis, real_nemesis);
-            copyAcquaintances(new_nemesis, real_nemesis);
-        }
-    }
-    else
-    {
-        in_transient_swap = true;
-
-        // Make the player unit follow around to avoid bad consequences
-        // if it is unloaded before the transient swap is reverted.
-        real_nemesis->unit->relationship_ids[df::unit_relationship_type::GroupLeader] = new_nemesis->unit_id;
-    }
-
-    return CR_OK;
-}
-
-command_result adv_tools (color_ostream &out, std::vector <std::string> & parameters)
-{
-    if (parameters.empty())
-        return CR_WRONG_USAGE;
-
-    CoreSuspender suspend;
-
-    const auto &command = parameters[0];
-    if (command == "list-equipped")
-    {
-        bool all = false;
-        for (size_t i = 1; i < parameters.size(); i++)
-        {
-            if (parameters[i] == "all")
-                all = true;
-            else
-                return CR_WRONG_USAGE;
-        }
-
-        std::vector<nemesis_record*> list;
-
-        listCompanions(out, &list);
-        sortCompanionNemesis(&list);
-
-        for (size_t i = 0; i < list.size(); i++)
-        {
-            auto item = list[i];
-            auto unit = item->unit;
-
-            printCompanionHeader(out, i, unit);
-            printEquipped(out, unit, all);
-        }
-
-        return CR_OK;
-    }
-    else if (command == "metal-detector")
-    {
-        bool all = false, non_trader = false;
-        for (size_t i = 1; i < parameters.size(); i++)
-        {
-            if (parameters[i] == "all-types")
-                all = true;
-            else if (parameters[i] == "non-trader")
-                non_trader = true;
-            else
-                return CR_WRONG_USAGE;
-        }
-
-        auto *player = getPlayerNemesis(out, false);
-        if (!player)
-            return CR_FAILURE;
-
-        df::coord player_pos = player->unit->pos;
-
-        int total = 0;
-        std::map<df::coord,int> counts;
-
-        auto &items = world->items.all;
-        for (size_t i = 0; i < items.size(); i++)
-        {
-            df::item *item = items[i];
-
-            int num = containsMetalItems(item, all, non_trader);
-            if (!num)
-                continue;
-
-            df::map_block *block = Maps::getTileBlock(item->pos);
-            if (!block)
-                continue;
-
-            total += num;
-            counts[(item->pos - player_pos)/10] += num;
-
-            auto &designations = block->designation;
-            auto &dgn = designations[item->pos.x%16][item->pos.y%16];
-
-            dgn.bits.hidden = 0; // revealed
-            dgn.bits.pile = 1; // visible
-        }
-
-        joinCounts(counts);
-
-        out.print("%d items of metal merchandise found in the vicinity.\n", total);
-        for (auto it = counts.begin(); it != counts.end(); it++)
-        {
-            if (!it->second)
-                continue;
-
-            df::coord delta = it->first * 10;
-            out.print("  %s: %d\n", formatDirection(delta).c_str(), it->second);
-        }
-
-        return CR_OK;
-    }
-    else
-        return CR_WRONG_USAGE;
-}

From 51c817191ca186a38a237457b895569bc10e7d9d Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Mon, 18 Jul 2022 12:52:38 -0700
Subject: [PATCH 228/854] update docs for autochop

---
 docs/plugins/autochop.rst | 22 +++++++++++++---------
 plugins/autochop.cpp      |  7 +++----
 2 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/docs/plugins/autochop.rst b/docs/plugins/autochop.rst
index 4a669480f..7c517e901 100644
--- a/docs/plugins/autochop.rst
+++ b/docs/plugins/autochop.rst
@@ -1,16 +1,20 @@
 autochop
 ========
-Automatically manage tree cutting designation to keep available logs withing given
-quotas.
 
-Open the dashboard by running::
+Auto-harvest trees when low on stockpiled logs. This plugin can designate trees
+for chopping when your stocks are low on logs.
+
+Usage::
 
     enable autochop
 
-The plugin must be activated (with :kbd:`d`-:kbd:`t`-:kbd:`c`-:kbd:`a`) before
-it can be used. You can then set logging quotas and restrict designations to
-specific burrows (with 'Enter') if desired. The plugin's activity cycle runs
-once every in game day.
+Then, open the settings menu with :kbd:`c` from the designations menu (the
+option appears when you have "Chop Down Trees" selected with :kbd:`d`-:kbd:`t`).
+
+Set your desired thresholds and enable autochopping with :kbd:`a`.
+
+You can also restrict autochopping to specific burrows. Highlight a burrow name
+with the Up/Down arrow keys and hit :kbd:`Enter` to mark it as the autochop
+burrrow.
 
-If you add ``enable autochop`` to your dfhack.init there will be a hotkey to
-open the dashboard from the chop designation menu.
+Autochop checks your stock of logs and designates trees once every in game day.
diff --git a/plugins/autochop.cpp b/plugins/autochop.cpp
index 04ae8af71..d96e7a972 100644
--- a/plugins/autochop.cpp
+++ b/plugins/autochop.cpp
@@ -935,10 +935,9 @@ DFhackCExport command_result plugin_enable(color_ostream &out, bool enable)
 DFhackCExport command_result plugin_init ( color_ostream &out, vector <PluginCommand> &commands)
 {
     commands.push_back(PluginCommand(
-        "autochop", "Auto-harvest trees when low on stockpiled logs",
-        df_autochop, false,
-        "Opens the automated chopping control screen. Specify 'debug' to forcibly save settings.\n"
-    ));
+        "autochop",
+        "Auto-harvest trees when low on stockpiled logs.",
+        df_autochop));
 
     initialize();
     return CR_OK;

From 3969a366ecfa45f11923dcbb594923be87c25fc0 Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Mon, 18 Jul 2022 13:02:03 -0700
Subject: [PATCH 229/854] update docs for autoclothing

---
 docs/plugins/autoclothing.rst | 13 +++++++++++--
 plugins/autoclothing.cpp      | 15 +++------------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/docs/plugins/autoclothing.rst b/docs/plugins/autoclothing.rst
index 7169844dd..a3c53a65a 100644
--- a/docs/plugins/autoclothing.rst
+++ b/docs/plugins/autoclothing.rst
@@ -1,11 +1,20 @@
 autoclothing
 ============
 
-Automatically manage clothing work orders, allowing the user to set how many of
-each clothing type every citizen should have. Usage::
+Automatically manage clothing work orders. It allows you to set how many of each
+clothing type every citizen should have.
 
+Usage::
+
+    enable autoclothing
     autoclothing <material> <item> [number]
 
+``material`` can be "cloth", "silk", "yarn", or "leather". The ``item`` can be
+anything your civilization can produce, such as "dress" or "mitten".
+
+When invoked without a number, it shows the current configuration for that
+material and item.
+
 Examples:
 
 * ``autoclothing cloth "short skirt" 10``:
diff --git a/plugins/autoclothing.cpp b/plugins/autoclothing.cpp
index d19e647d5..83eb0398a 100644
--- a/plugins/autoclothing.cpp
+++ b/plugins/autoclothing.cpp
@@ -1,5 +1,3 @@
-
-// some headers required for a plugin. Nothing special, just the basics.
 #include "Core.h"
 #include <Console.h>
 #include <Export.h>
@@ -184,16 +182,9 @@ DFhackCExport command_result plugin_init(color_ostream &out, std::vector <Plugin
 {
     // Fill the command list with your commands.
     commands.push_back(PluginCommand(
-        "autoclothing", "Automatically manage clothing work orders",
-        autoclothing, false, /* true means that the command can't be used from non-interactive user interface */
-        // Extended help string. Used by CR_WRONG_USAGE and the help command:
-        "  autoclothing <material> <item> [number]\n"
-        "Example:\n"
-        "  autoclothing cloth \"short skirt\" 10\n"
-        "    Sets the desired number of cloth short skirts available per citizen to 10.\n"
-        "  autoclothing cloth dress\n"
-        "    Displays the currently set number of cloth dresses chosen per citizen.\n"
-    ));
+        "autoclothing",
+        "Automatically manage clothing work orders",
+        autoclothing));
     return CR_OK;
 }
 

From 25bc59297bdc48e83bf39d4fbb9ac7b3c284ea8d Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Mon, 18 Jul 2022 13:28:16 -0700
Subject: [PATCH 230/854] update docs for autodump (and related hotkeys)

---
 docs/plugins/autodump-destroy-here.rst | 10 ++++
 docs/plugins/autodump-destroy-item.rst | 13 +++++
 docs/plugins/autodump.rst              | 81 +++++++++++++++++++++-----
 plugins/autodump.cpp                   | 34 ++++-------
 4 files changed, 101 insertions(+), 37 deletions(-)
 create mode 100644 docs/plugins/autodump-destroy-here.rst
 create mode 100644 docs/plugins/autodump-destroy-item.rst

diff --git a/docs/plugins/autodump-destroy-here.rst b/docs/plugins/autodump-destroy-here.rst
new file mode 100644
index 000000000..375a799c0
--- /dev/null
+++ b/docs/plugins/autodump-destroy-here.rst
@@ -0,0 +1,10 @@
+autodump-destroy-here
+=====================
+
+Destroy items marked for dumping under cursor. If called again before the game
+is resumed, cancels destruction of the items. This is an alias for the
+`autodump` command ``autodump destroy-here``, intended for use as a keybinding.
+
+Usage::
+
+    autodump-destroy-here
diff --git a/docs/plugins/autodump-destroy-item.rst b/docs/plugins/autodump-destroy-item.rst
new file mode 100644
index 000000000..a9f3554c3
--- /dev/null
+++ b/docs/plugins/autodump-destroy-item.rst
@@ -0,0 +1,13 @@
+autodump-destroy-item
+=====================
+
+Destroy the selected item. The item may be selected in the :kbd:`k` list or in
+the container item list. If called again before the game is resumed, cancels
+destruction of the item.
+
+This command is intended for use as a keybinding. See the `autodump` command
+for other dumping/destroying options.
+
+Usage::
+
+    autodump-destroy-item
diff --git a/docs/plugins/autodump.rst b/docs/plugins/autodump.rst
index 9bd74cff7..8064583ea 100644
--- a/docs/plugins/autodump.rst
+++ b/docs/plugins/autodump.rst
@@ -1,29 +1,82 @@
 autodump
 ========
-This plugin adds an option to the :kbd:`q` menu for stckpiles when `enabled <enable>`.
-When autodump is enabled for a stockpile, any items placed in the stockpile will
+
+Quickly designate or teleport items to be dumped. When `enabled <enable>`, this
+plugin adds an option to the :kbd:`q` menu for stockpiles. When the ``autodump``
+option is selected for the stockpile, any items placed in the stockpile will
 automatically be designated to be dumped.
 
-Alternatively, you can use it to quickly move all items designated to be dumped.
-Items are instantly moved to the cursor position, the dump flag is unset,
-and the forbid flag is set, as if it had been dumped normally.
-Be aware that any active dump item tasks still point at the item.
+When invoked as a command, it can instantly move all items designated to be
+dumped to the tile under the cursor. After moving the items, the dump flag is
+unset and the forbid flag is set, just as if it had been dumped normally. Be
+aware that dwarves that are en route to pick up the item for dumping may still
+come and move the item to your dump zone.
+
+The cursor must be placed on a floor tile so the items can be dumped there.
+
+Usage::
 
-Cursor must be placed on a floor tile so the items can be dumped there.
+    enable autodump
+    autodump [<options>]
 
 Options:
 
-:destroy:            Destroy instead of dumping. Doesn't require a cursor.
-                     If called again before the game is resumed, cancels destroy.
-:destroy-here:       As ``destroy``, but only the selected item in the :kbd:`k` list,
-                     or inside a container.
+- ``destroy``
+    Destroy instead of dumping. Doesn't require a cursor. If ``autodump`` is
+    called again with this option before the game is resumed, it cancels
+    the destroy action.
+- ``destroy-here``
+    As ``destroy``, but only the selected item in the :kbd:`k` list, or inside a
+    container.
+- ``visible``
+    Only process items that are not hidden.
+- ``hidden``
+    Only process hidden items.
+- ``forbidden``
+    Only process forbidden items (default: only unforbidden).
+
+Examples:
+
+- ``autodump``
+    Teleports all unforbidden items marked for dumping to the cursor position.
+- ``autodump destroy``
+    Destroys all unforbidden items marked for dumping
+
+
                      Alias ``autodump-destroy-here``, for keybindings.
                      :dfhack-keybind:`autodump-destroy-here`
-:visible:            Only process items that are not hidden.
-:hidden:             Only process hidden items.
-:forbidden:          Only process forbidden items (default: only unforbidden).
 
 ``autodump-destroy-item`` destroys the selected item, which may be selected
 in the :kbd:`k` list, or inside a container. If called again before the game
 is resumed, cancels destruction of the item.
 :dfhack-keybind:`autodump-destroy-item`
+
+
+
+ commands.push_back(PluginCommand(
+        "autodump", "Teleport items marked for dumping to the cursor.",
+        df_autodump, false,
+        "  This utility lets you quickly move all items designated to be dumped.\n"
+        "  Items are instantly moved to the cursor position, the dump flag is unset,\n"
+        "  and the forbid flag is set, as if it had been dumped normally.\n"
+        "  Be aware that any active dump item tasks still point at the item.\n"
+        "Options:\n"
+        "  destroy       - instead of dumping, destroy the items instantly.\n"
+        "  destroy-here  - only affect the tile under cursor.\n"
+        "  visible       - only process items that are not hidden.\n"
+        "  hidden        - only process hidden items.\n"
+        "  forbidden     - only process forbidden items (default: only unforbidden).\n"
+    ));
+    commands.push_back(PluginCommand(
+        "autodump-destroy-here", "Destroy items marked for dumping under cursor.",
+        df_autodump_destroy_here, Gui::cursor_hotkey,
+        "  Identical to autodump destroy-here, but intended for use as keybinding.\n"
+    ));
+    commands.push_back(PluginCommand(
+        "autodump-destroy-item", "Destroy the selected item.",
+        df_autodump_destroy_item, Gui::any_item_hotkey,
+        "  Destroy the selected item. The item may be selected\n"
+        "  in the 'k' list, or inside a container. If called\n"
+        "  again before the game is resumed, cancels destroy.\n"
+    ));
+    return CR_OK;
diff --git a/plugins/autodump.cpp b/plugins/autodump.cpp
index 054d28f77..fb215c26b 100644
--- a/plugins/autodump.cpp
+++ b/plugins/autodump.cpp
@@ -275,31 +275,19 @@ command_result df_autodump_destroy_item(color_ostream &out, vector <string> & pa
 DFhackCExport command_result plugin_init ( color_ostream &out, vector <PluginCommand> &commands)
 {
     commands.push_back(PluginCommand(
-        "autodump", "Teleport items marked for dumping to the cursor.",
-        df_autodump, false,
-        "  This utility lets you quickly move all items designated to be dumped.\n"
-        "  Items are instantly moved to the cursor position, the dump flag is unset,\n"
-        "  and the forbid flag is set, as if it had been dumped normally.\n"
-        "  Be aware that any active dump item tasks still point at the item.\n"
-        "Options:\n"
-        "  destroy       - instead of dumping, destroy the items instantly.\n"
-        "  destroy-here  - only affect the tile under cursor.\n"
-        "  visible       - only process items that are not hidden.\n"
-        "  hidden        - only process hidden items.\n"
-        "  forbidden     - only process forbidden items (default: only unforbidden).\n"
-    ));
+        "autodump",
+        "Teleport items marked for dumping to the cursor.",
+        df_autodump));
     commands.push_back(PluginCommand(
-        "autodump-destroy-here", "Destroy items marked for dumping under cursor.",
-        df_autodump_destroy_here, Gui::cursor_hotkey,
-        "  Identical to autodump destroy-here, but intended for use as keybinding.\n"
-    ));
+        "autodump-destroy-here",
+        "Destroy items marked for dumping under cursor.",
+        df_autodump_destroy_here,
+        Gui::cursor_hotkey));
     commands.push_back(PluginCommand(
-        "autodump-destroy-item", "Destroy the selected item.",
-        df_autodump_destroy_item, Gui::any_item_hotkey,
-        "  Destroy the selected item. The item may be selected\n"
-        "  in the 'k' list, or inside a container. If called\n"
-        "  again before the game is resumed, cancels destroy.\n"
-    ));
+        "autodump-destroy-item",
+        "Destroy the selected item.",
+        df_autodump_destroy_item,
+        Gui::any_item_hotkey));
     return CR_OK;
 }
 

From 3ca7997d3e87b45858098419a7ea50eefb337c8f Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Mon, 18 Jul 2022 13:49:51 -0700
Subject: [PATCH 231/854] update docs for autofarm

---
 docs/plugins/autofarm.rst | 41 +++++++++++++++++++++++++--------------
 plugins/autofarm.cpp      | 18 ++++-------------
 2 files changed, 30 insertions(+), 29 deletions(-)

diff --git a/docs/plugins/autofarm.rst b/docs/plugins/autofarm.rst
index b330517d0..d5bb12e41 100644
--- a/docs/plugins/autofarm.rst
+++ b/docs/plugins/autofarm.rst
@@ -1,21 +1,32 @@
 autofarm
 ========
 
-Automatically handles crop selection in farm plots based on current plant
-stocks, and selects crops for planting if current stock is below a threshold.
-Selected crops are dispatched on all farmplots. (Note that this plugin replaces
-an older Ruby script of the same name.)
-
-Use the `enable` or `disable <disable>` commands to change whether this plugin is
-enabled.
+Automatically manage farm crop selection. This plugin periodically scans your
+plant stocks and assigns crops to your farm plots based on which plant stocks
+are low (as long as you have the appropriate seeds). The target threshold for
+each crop type is configurable.
 
 Usage:
 
-* ``autofarm runonce``:
-    Updates all farm plots once, without enabling the plugin
-* ``autofarm status``:
-    Prints status information, including any applied limits
-* ``autofarm default 30``:
-    Sets the default threshold
-* ``autofarm threshold 150 helmet_plump tail_pig``:
-    Sets thresholds of individual plants
+- ``enable autofarm``
+    Enable the plugin and start managing crop assignment.
+* ``autofarm runonce``
+    Updates all farm plots once, without enabling the plugin.
+* ``autofarm status``
+    Prints status information, including any defined thresholds.
+* ``autofarm default <number>``
+    Sets the default threshold.
+* ``autofarm threshold <number> <type> [<type> ...]``
+    Sets thresholds of individual plant types.
+
+You can find the identifiers for the crop types in your world by running the
+following command::
+
+    lua "for _,plant in ipairs(df.global.world.raws.plants.all) do if plant.flags.SEED then print(plant.id) end end"
+
+Examples:
+
+- ``autofarm default 30``
+    Set the default threshold to 30.
+- ``autofarm threshold 150 MUSHROOM_HELMET_PLUMP GRASS_TAIL_PIG``
+    Set the threshold for Plump Helmets and Pig Tails to 150
diff --git a/plugins/autofarm.cpp b/plugins/autofarm.cpp
index 2dafdee49..1a02b6a06 100644
--- a/plugins/autofarm.cpp
+++ b/plugins/autofarm.cpp
@@ -38,15 +38,6 @@ DFHACK_PLUGIN("autofarm");
 
 DFHACK_PLUGIN_IS_ENABLED(enabled);
 
-const char* tagline = "Automatically handle crop selection in farm plots based on current plant stocks.";
-const char* usage = (
-    "``enable autofarm``: Enables the plugin\n"
-    "``autofarm runonce``: Updates farm plots (one-time only)\n"
-    "``autofarm status``: Prints status information\n"
-    "``autofarm default 30``: Sets the default threshold\n"
-    "``autofarm threshold 150 helmet_plump tail_pig``: Sets thresholds\n"
-    );
-
 class AutoFarm {
 private:
     std::map<int, int> thresholds;
@@ -330,7 +321,7 @@ public:
 
     void status(color_ostream& out)
     {
-        out << (enabled ? "Running." : "Stopped.") << '\n';
+        out << "Autofarm is " << (enabled ? "Active." : "Stopped.") << '\n';
         for (auto& lc : lastCounts)
         {
             auto plant = world->raws.plants.all[lc.first];
@@ -355,10 +346,9 @@ DFhackCExport command_result plugin_init(color_ostream& out, std::vector <Plugin
 {
     if (world && ui) {
         commands.push_back(
-            PluginCommand("autofarm", tagline,
-                autofarm, false, usage
-            )
-        );
+            PluginCommand("autofarm",
+                          "Automatically manage farm crop selection.",
+                          autofarm));
     }
     autofarmInstance = std::move(dts::make_unique<AutoFarm>());
     return CR_OK;

From b1916f16b191e975d56900101c21a2b7d99b2443 Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Mon, 18 Jul 2022 13:59:11 -0700
Subject: [PATCH 232/854] update docs for autogems

---
 docs/plugins/autogems-reload.rst |  9 +++++++++
 docs/plugins/autogems.rst        | 13 +++++++++----
 plugins/autogems.cpp             | 20 ++------------------
 3 files changed, 20 insertions(+), 22 deletions(-)
 create mode 100644 docs/plugins/autogems-reload.rst

diff --git a/docs/plugins/autogems-reload.rst b/docs/plugins/autogems-reload.rst
new file mode 100644
index 000000000..a37117746
--- /dev/null
+++ b/docs/plugins/autogems-reload.rst
@@ -0,0 +1,9 @@
+autogems-reload
+===============
+
+Reloads the autogems configuration file. You might need to do this if you have
+manually modified the contents while the game is running.
+
+Usage::
+
+    autogems-reload
diff --git a/docs/plugins/autogems.rst b/docs/plugins/autogems.rst
index 59800e1b9..ad3b0f9c3 100644
--- a/docs/plugins/autogems.rst
+++ b/docs/plugins/autogems.rst
@@ -1,7 +1,12 @@
 autogems
 ========
-Creates a new Workshop Order setting, automatically cutting rough gems
-when `enabled <enable>`.
 
-See `gui/autogems` for a configuration UI. If necessary, the ``autogems-reload``
-command reloads the configuration file produced by that script.
+Automatically cut rough gems. This plugin periodically scans your stocks of
+rough gems and creates manager orders for cutting them at a Jeweler's Workshop.
+
+Usage::
+
+    enable autogems
+
+Run `gui/autogems` for a configuration UI, or access the new ``Auto Cut Gems``
+option from the Current Workshop Orders screen (:kbd:`o`-:kbd:`W`).
diff --git a/plugins/autogems.cpp b/plugins/autogems.cpp
index fcd8fcdc7..d296caf7f 100644
--- a/plugins/autogems.cpp
+++ b/plugins/autogems.cpp
@@ -41,19 +41,6 @@ typedef int32_t mat_index;
 typedef std::map<mat_index, int> gem_map;
 
 bool running = false;
-const char *tagline = "Creates a new Workshop Order setting, automatically cutting rough gems.";
-const char *usage = (
-    "  enable autogems\n"
-    "    Enable the plugin.\n"
-    "  disable autogems\n"
-    "    Disable the plugin.\n"
-    "\n"
-    "While enabled, the Current Workshop Orders screen (o-W) have a new option:\n"
-    "  g: Auto Cut Gems\n"
-    "\n"
-    "While this option is enabled, jobs will be created in Jeweler's Workshops\n"
-    "to cut any accessible rough gems.\n"
-);
 std::set<mat_index> blacklist;
 
 void add_task(mat_index gem_type, df::building_workshopst *workshop) {
@@ -385,11 +372,8 @@ DFhackCExport command_result plugin_enable(color_ostream& out, bool enable) {
 DFhackCExport command_result plugin_init(color_ostream &out, std::vector <PluginCommand> &commands) {
     commands.push_back(PluginCommand(
         "autogems-reload",
-        "Reload autogems config file",
-        cmd_reload_config,
-        false,
-        "Reload autogems config file"
-    ));
+        "Reload autogems config file.",
+        cmd_reload_config));
     return CR_OK;
 }
 

From 6c760d1a3d5d4f92240e1f996aa282213b3d6052 Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Mon, 18 Jul 2022 14:33:24 -0700
Subject: [PATCH 233/854] update docs for autohauler

---
 docs/plugins/autohauler.rst | 59 +++++++++++++++++++++++++++----------
 plugins/autohauler.cpp      | 42 ++------------------------
 2 files changed, 47 insertions(+), 54 deletions(-)

diff --git a/docs/plugins/autohauler.rst b/docs/plugins/autohauler.rst
index 289874f94..4defac18d 100644
--- a/docs/plugins/autohauler.rst
+++ b/docs/plugins/autohauler.rst
@@ -1,20 +1,49 @@
 autohauler
 ==========
-Autohauler is an autolabor fork.
 
-Rather than the all-of-the-above means of autolabor, autohauler will instead
-only manage hauling labors and leave skilled labors entirely to the user, who
-will probably use Dwarf Therapist to do so.
+Automatically manage hauling labors. Similar to `autolabor`, but instead of
+managing all labors, ``autohauler`` only addresses hauling labors, leaving the
+assignment of skilled labors entirely up to you. You can use the in-game
+`manipulator` UI or an external tool like Dwarf Therapist to do so.
 
-Idle dwarves will be assigned the hauling labors; everyone else (including
-those currently hauling) will have the hauling labors removed. This is to
-encourage every dwarf to do their assigned skilled labors whenever possible,
-but resort to hauling when those jobs are not available. This also implies
-that the user will have a very tight skill assignment, with most skilled
-labors only being assigned to just one dwarf, no dwarf having more than two
-active skilled labors, and almost every non-military dwarf having at least
-one skilled labor assigned.
+Idle dwarves who are not on active military duty will be assigned the hauling
+labors; everyone else (including those currently hauling) will have the hauling
+labors removed. This is to encourage every dwarf to do their assigned skilled
+labors whenever possible, but resort to hauling when those jobs are not
+available. This also implies that the user will have a very tight skill
+assignment, with most skilled labors only being assigned to just a few dwarves
+and almost every non-military dwarf having at least one skilled labor assigned.
 
-Autohauler allows skills to be flagged as to prevent hauling labors from
-being assigned when the skill is present. By default this is the unused
-ALCHEMIST labor but can be changed by the user.
+Autohauler allows a skill to be used as a flag to exempt a dwarf from
+``autohauler``'s effects. By default, this is the unused ALCHEMIST labor, but it
+can be changed by the user.
+
+Usage:
+
+- ``enable autohauler``
+    Start managing hauling labors.
+- ``autohauler status``
+    Show autohauler status and status of fort dwarves.
+- ``autohauler <labor> haulers``
+    Set whether a particular labor should be assigned to haulers.
+- ``autohauler <labor> allow|forbid``
+    Set whether a particular labor should mark a dwarf as exempt from hauling.
+    By default, only the ``ALCHEMIST`` labor is set to ``forbid``.
+- ``autohauler reset-all|<labor> reset``
+    Reset a particular labor (or all labors) to their default
+    haulers/allow/forbid state.
+- ``autohauler list``
+    Show the active configuration for all labors.
+- ``autohauler frameskip <number>``
+    Set the number of frames between runs of autohauler.
+- ``autohauler debug``
+    In the next cycle, output the state of every dwarf.
+
+Examples:
+- ``autohauler HAUL_STONE haulers``
+    Set stone hauling as a hauling labor (this is already the default).
+- ``autohauler RECOVER_WOUNDED allow``
+    Allow the "Recover wounded" labor to be manually assigned by the player. By
+    default it is automatically given to haulers.
+- ``autohauler MINE forbid``
+    Don't assign hauling labors to dwarves with the Mining labor enabled.
diff --git a/plugins/autohauler.cpp b/plugins/autohauler.cpp
index 35bf90ca1..b52e9cfb5 100644
--- a/plugins/autohauler.cpp
+++ b/plugins/autohauler.cpp
@@ -712,45 +712,9 @@ DFhackCExport command_result plugin_init ( color_ostream &out, std::vector <Plug
 
     // Essentially an introduction dumped to the console
     commands.push_back(PluginCommand(
-        "autohauler", "Automatically manage hauling labors.",
-        autohauler, false, /* true means that the command can't be used from non-interactive user interface */
-        // Extended help string. Used by CR_WRONG_USAGE and the help command:
-        "  autohauler enable\n"
-        "  autohauler disable\n"
-        "    Enables or disables the plugin.\n"
-        "  autohauler <labor> haulers\n"
-        "    Set a labor to be handled by hauler dwarves.\n"
-        "  autohauler <labor> allow\n"
-        "    Allow hauling if a specific labor is enabled.\n"
-        "  autohauler <labor> forbid\n"
-        "    Forbid hauling if a specific labor is enabled.\n"
-        "  autohauler <labor> reset\n"
-        "    Return a labor to the default handling.\n"
-        "  autohauler reset-all\n"
-        "    Return all labors to the default handling.\n"
-        "  autohauler frameskip <int>\n"
-        "    Set the number of frames between runs of autohauler.\n"
-        "  autohauler list\n"
-        "    List current status of all labors.\n"
-        "  autohauler status\n"
-        "    Show basic status information.\n"
-        "  autohauler debug\n"
-        "    In the next cycle, will output the state of every dwarf.\n"
-        "Function:\n"
-        "  When enabled, autohauler periodically checks your dwarves and assigns\n"
-        "  hauling jobs to idle dwarves while removing them from busy dwarves.\n"
-        "  This plugin, in contrast to autolabor, is explicitly designed to be\n"
-        "  used alongside Dwarf Therapist.\n"
-        "  Warning: autohauler will override any manual changes you make to\n"
-        "  hauling labors while it is enabled...but why would you make them?\n"
-        "Examples:\n"
-        "  autohauler HAUL_STONE haulers\n"
-        "    Set stone hauling as a hauling labor.\n"
-        "  autohauler BOWYER allow\n"
-        "    Allow hauling when the bowyer labor is enabled.\n"
-        "  autohauler MINE forbid\n"
-        "    Forbid hauling while the mining labor is disabled."
-    ));
+        "autohauler",
+        "Automatically manage hauling labors.",
+        autohauler));
 
     // Initialize plugin labor lists
     init_state(out);

From 87e67ea8b3d6b3ee6c26d88660ab1931d91d3a0d Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Mon, 18 Jul 2022 14:53:06 -0700
Subject: [PATCH 234/854] update docs for autolabor

---
 docs/plugins/autohauler.rst |   3 +-
 docs/plugins/autolabor.rst  | 100 ++++++++++++++++++++----------------
 plugins/autolabor.cpp       |  45 ++--------------
 3 files changed, 61 insertions(+), 87 deletions(-)

diff --git a/docs/plugins/autohauler.rst b/docs/plugins/autohauler.rst
index 4defac18d..d1743f5ef 100644
--- a/docs/plugins/autohauler.rst
+++ b/docs/plugins/autohauler.rst
@@ -21,7 +21,8 @@ can be changed by the user.
 Usage:
 
 - ``enable autohauler``
-    Start managing hauling labors.
+    Start managing hauling labors. This is normally all you need to do.
+    Autohauler works well on default settings.
 - ``autohauler status``
     Show autohauler status and status of fort dwarves.
 - ``autohauler <labor> haulers``
diff --git a/docs/plugins/autolabor.rst b/docs/plugins/autolabor.rst
index b63b9102b..b60146d28 100644
--- a/docs/plugins/autolabor.rst
+++ b/docs/plugins/autolabor.rst
@@ -1,70 +1,82 @@
 autolabor
 =========
-Automatically manage dwarf labors to efficiently complete jobs.
-Autolabor tries to keep as many dwarves as possible busy but
-also tries to have dwarves specialize in specific skills.
 
-The key is that, for almost all labors, once a dwarf begins a job it will finish that
-job even if the associated labor is removed. Autolabor therefore frequently checks
-which dwarf or dwarves should take new jobs for that labor, and sets labors accordingly.
-Labors with equipment (mining, hunting, and woodcutting), which are abandoned
-if labors change mid-job, are handled slightly differently to minimise churn.
+Automatically manage dwarf labors. Autolabor attempts to keep as many dwarves as
+possible busy while allowing dwarves to specialize in specific skills.
+
+Autolabor frequently checks how many jobs of each type are available and sets
+labors proportionally in order to get them all done quickly. Labors with
+equipment -- mining, hunting, and woodcutting -- which are abandoned if labors
+change mid-job, are handled slightly differently to minimise churn.
+
+Dwarves on active military duty or dwarves assigned to burrows are left
+untouched by autolabor.
 
 .. warning::
 
-    *autolabor will override any manual changes you make to labors while
-    it is enabled, including through other tools such as Dwarf Therapist*
+    autolabor will override any manual changes you make to labors while it is
+    enabled, including through other tools such as Dwarf Therapist.
 
-Simple usage:
+Usage::
 
-:enable autolabor:      Enables the plugin with default settings.  (Persistent per fortress)
-:disable autolabor:     Disables the plugin.
+    enable autolabor
 
-Anything beyond this is optional - autolabor works well on the default settings.
+Anything beyond this is optional - autolabor works well with the default
+settings. Once you have enabled it in a fortress, it stays enabled until you
+explicitly disable it, even if you save and reload your game.
 
-By default, each labor is assigned to between 1 and 200 dwarves (2-200 for mining).
-By default 33% of the workforce become haulers, who handle all hauling jobs as well
-as cleaning, pulling levers, recovering wounded, removing constructions, and filling ponds.
-Other jobs are automatically assigned as described above.  Each of these settings can be adjusted.
+By default, each labor is assigned to between 1 and 200 dwarves (2-200 for
+mining). 33% of the workforce become haulers, who handle all hauling jobs as
+well as cleaning, pulling levers, recovering wounded, removing constructions,
+and filling ponds. Other jobs are automatically assigned as described above.
+Each of these settings can be adjusted.
 
-Jobs are rarely assigned to nobles with responsibilities for meeting diplomats or merchants,
-never to the chief medical dwarf, and less often to the bookeeper and manager.
+Jobs are rarely assigned to nobles with responsibilities for meeting diplomats
+or merchants, never to the chief medical dwarf, and less often to the bookeeper
+and manager.
 
-Hunting is never assigned without a butchery, and fishing is never assigned without a fishery.
+Hunting is never assigned without a butchery, and fishing is never assigned
+without a fishery.
 
-For each labor a preference order is calculated based on skill, biased against masters of other
-trades and excluding those who can't do the job.  The labor is then added to the best <minimum>
-dwarves for that labor.  We assign at least the minimum number of dwarfs, in order of preference,
-and then assign additional dwarfs that meet any of these conditions:
+For each labor, a preference order is calculated based on skill, biased against
+masters of other trades and excluding those who can't do the job. The labor is
+then added to the best <minimum> dwarves for that labor, then to additional
+dwarfs that meet any of these conditions:
 
 * The dwarf is idle and there are no idle dwarves assigned to this labor
 * The dwarf has non-zero skill associated with the labor
 * The labor is mining, hunting, or woodcutting and the dwarf currently has it enabled.
 
-We stop assigning dwarfs when we reach the maximum allowed.
+We stop assigning dwarves when we reach the maximum allowed.
 
 Advanced usage:
 
-:autolabor <labor> <minimum> [<maximum>]:
-                                Set number of dwarves assigned to a labor.
-:autolabor <labor> haulers:     Set a labor to be handled by hauler dwarves.
-:autolabor <labor> disable:     Turn off autolabor for a specific labor.
-:autolabor <labor> reset:       Return a labor to the default handling.
-:autolabor reset-all:           Return all labors to the default handling.
-:autolabor list:                List current status of all labors.
-:autolabor status:              Show basic status information.
+- ``autolabor <labor> <minimum> [<maximum>] [<talent pool>]``
+    Set range of dwarves assigned to a labor, optionally specifying the size of
+    the pool of most skilled dwarves that will ever be considered for this
+    labor.
+- ``autolabor <labor> haulers``
+    Set a labor to be handled by hauler dwarves.
+- ``autolabor <labor> disable``
+    Turn off autolabor for a specific labor.
+- ``autolabor reset-all|<labor> reset``
+    Return a labor (or all labors) to the default handling.
+- ``autolabor list``
+    List current status of all labors.
+- ``autolabor status``
+    Show basic status information.
 
 See `autolabor-artisans` for a differently-tuned setup.
 
 Examples:
 
-``autolabor MINE``
-        Keep at least 5 dwarves with mining enabled.
-``autolabor CUT_GEM 1 1``
-        Keep exactly 1 dwarf with gemcutting enabled.
-``autolabor COOK 1 1 3``
-        Keep 1 dwarf with cooking enabled, selected only from the top 3.
-``autolabor FEED_WATER_CIVILIANS haulers``
-        Have haulers feed and water wounded dwarves.
-``autolabor CUTWOOD disable``
-        Turn off autolabor for wood cutting.
+- ``autolabor MINE 5``
+    Keep at least 5 dwarves with mining enabled.
+- ``autolabor CUT_GEM 1 1``
+    Keep exactly 1 dwarf with gemcutting enabled.
+- ``autolabor COOK 1 1 3``
+    Keep 1 dwarf with cooking enabled, selected only from the top 3.
+- ``autolabor FEED_WATER_CIVILIANS haulers``
+    Have haulers feed and water wounded dwarves.
+- ``autolabor CUTWOOD disable``
+    Turn off autolabor for wood cutting.
diff --git a/plugins/autolabor.cpp b/plugins/autolabor.cpp
index ba116c1c5..15c6903b4 100644
--- a/plugins/autolabor.cpp
+++ b/plugins/autolabor.cpp
@@ -686,48 +686,9 @@ DFhackCExport command_result plugin_init ( color_ostream &out, std::vector <Plug
 
     // Fill the command list with your commands.
     commands.push_back(PluginCommand(
-        "autolabor", "Automatically manage dwarf labors.",
-        autolabor, false, /* true means that the command can't be used from non-interactive user interface */
-        // Extended help string. Used by CR_WRONG_USAGE and the help command:
-        "  autolabor enable\n"
-        "  autolabor disable\n"
-        "    Enables or disables the plugin.\n"
-        "  autolabor <labor> <minimum> [<maximum>] [<talent pool>]\n"
-        "    Set number of dwarves assigned to a labor.\n"
-        "  autolabor <labor> haulers\n"
-        "    Set a labor to be handled by hauler dwarves.\n"
-        "  autolabor <labor> disable\n"
-        "    Turn off autolabor for a specific labor.\n"
-        "  autolabor <labor> reset\n"
-        "    Return a labor to the default handling.\n"
-        "  autolabor reset-all\n"
-        "    Return all labors to the default handling.\n"
-        "  autolabor list\n"
-        "    List current status of all labors.\n"
-        "  autolabor status\n"
-        "    Show basic status information.\n"
-        "Function:\n"
-        "  When enabled, autolabor periodically checks your dwarves and enables or\n"
-        "  disables labors. It tries to keep as many dwarves as possible busy but\n"
-        "  also tries to have dwarves specialize in specific skills.\n"
-        "  Warning: autolabor will override any manual changes you make to labors\n"
-        "  while it is enabled.\n"
-        "  To prevent particular dwarves from being managed by autolabor, put them\n"
-        "  in any burrow.\n"
-        "  To restrict the assignment of a labor to only the top <n> most skilled\n"
-        "  dwarves, add a talent pool number <n>.\n"
-        "Examples:\n"
-        "  autolabor MINE 2\n"
-        "    Keep at least 2 dwarves with mining enabled.\n"
-        "  autolabor CUT_GEM 1 1\n"
-        "    Keep exactly 1 dwarf with gemcutting enabled.\n"
-        "  autolabor COOK 1 1 3\n"
-        "    Keep 1 dwarf with cooking enabled, selected only from the top 3.\n"
-        "  autolabor FEED_WATER_CIVILIANS haulers\n"
-        "    Have haulers feed and water wounded dwarves.\n"
-        "  autolabor CUTWOOD disable\n"
-        "    Turn off autolabor for wood cutting.\n"
-    ));
+        "autolabor",
+        "Automatically manage dwarf labors.",
+        autolabor));
 
     init_state();
 

From 0ba3a4684b6cd55cafcb7d773b8000cc4f14bb0f Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Mon, 18 Jul 2022 16:13:04 -0700
Subject: [PATCH 235/854] update docs for automaterial

---
 docs/plugins/automaterial.rst | 54 +++++++++++++++++++++--------------
 1 file changed, 33 insertions(+), 21 deletions(-)

diff --git a/docs/plugins/automaterial.rst b/docs/plugins/automaterial.rst
index 81de0cb3d..51701a1fc 100644
--- a/docs/plugins/automaterial.rst
+++ b/docs/plugins/automaterial.rst
@@ -1,33 +1,45 @@
 automaterial
 ============
-This makes building constructions (walls, floors, fortifications, etc) a little bit
-easier by saving you from having to trawl through long lists of materials each time
-you place one.
 
-Firstly, it moves the last used material for a given construction type to the top of
-the list, if there are any left. So if you build a wall with chalk blocks, the next
-time you place a wall the chalk blocks will be at the top of the list, regardless of
-distance (it only does this in "grouped" mode, as individual item lists could be huge).
-This should mean you can place most constructions without having to search for your
-preferred material type.
+Sorts building materials by recent usage. This makes building constructions
+(walls, floors, fortifications, etc) much easier by saving you from having to
+trawl through long lists of materials each time you place one.
+
+It moves the last used material for a given construction type to the top of the
+list, if there are any left. So if you build a wall with chalk blocks, the next
+time you place a wall the chalk blocks will be at the top of the list,
+regardless of distance (it only does this in "grouped" mode, as individual item
+lists could be huge). This means you can place most constructions without having
+to search for your preferred material type.
+
+Usage::
+
+    enable automaterial
 
 .. image:: ../images/automaterial-mat.png
 
-Pressing :kbd:`a` while highlighting any material will enable that material for "auto select"
-for this construction type. You can enable multiple materials as autoselect. Now the next
-time you place this type of construction, the plugin will automatically choose materials
-for you from the kinds you enabled. If there is enough to satisfy the whole placement,
-you won't be prompted with the material screen - the construction will be placed and you
-will be back in the construction menu as if you did it manually.
+Pressing :kbd:`a` while highlighting any material will enable that material for
+"auto select" for this construction type. You can enable multiple materials. Now
+the next time you place this type of construction, the plugin will automatically
+choose materials for you from the kinds you enabled. If there is enough to
+satisfy the whole placement, you won't be prompted with the material screen at
+all -- the construction will be placed and you will be back in the construction
+menu.
 
 When choosing the construction placement, you will see a couple of options:
 
 .. image:: ../images/automaterial-pos.png
 
-Use :kbd:`a` here to temporarily disable the material autoselection, e.g. if you need
-to go to the material selection screen so you can toggle some materials on or off.
+Use :kbd:`a` here to temporarily disable the material autoselection, e.g. if you
+need to go to the material selection screen so you can toggle some materials on
+or off.
+
+The other option (auto type selection, off by default) can be toggled on with
+:kbd:`t`. If you toggle this option on, instead of returning you to the main
+construction menu after selecting materials, it returns you back to this screen.
+If you use this along with several autoselect enabled materials, you should be
+able to place complex constructions more conveniently.
 
-The other option (auto type selection, off by default) can be toggled on with :kbd:`t`. If you
-toggle this option on, instead of returning you to the main construction menu after selecting
-materials, it returns you back to this screen. If you use this along with several autoselect
-enabled materials, you should be able to place complex constructions more conveniently.
+The ``automaterial`` plugin also enables extra contruction placement modes, such
+as designating areas larger than 10x10 and allowing you to designate hollow
+rectangles instead of the default filled ones.

From fd84fdce73789f0d0f956c113a1ec02088d21bbe Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Mon, 18 Jul 2022 16:13:20 -0700
Subject: [PATCH 236/854] update docs for automelt

---
 docs/plugins/automelt.rst | 12 +++++++++---
 plugins/automelt.cpp      |  6 +++---
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/docs/plugins/automelt.rst b/docs/plugins/automelt.rst
index 73f8ba502..749aac28a 100644
--- a/docs/plugins/automelt.rst
+++ b/docs/plugins/automelt.rst
@@ -1,5 +1,11 @@
 automelt
 ========
-When automelt is enabled for a stockpile, any meltable items placed
-in it will be designated to be melted.
-This plugin adds an option to the :kbd:`q` menu when `enabled <enable>`.
+
+Quickly designate items to be melted. When `enabled <enable>`, this plugin adds
+an option to the :kbd:`q` menu for stockpiles. When the ``automelt`` option is
+selected for the stockpile, any items placed in the stockpile will automatically
+be designated to be melted.
+
+Usage::
+
+    enable automelt
diff --git a/plugins/automelt.cpp b/plugins/automelt.cpp
index 852b324d6..e4033ed63 100644
--- a/plugins/automelt.cpp
+++ b/plugins/automelt.cpp
@@ -297,9 +297,9 @@ DFhackCExport command_result plugin_enable(color_ostream &out, bool enable)
 DFhackCExport command_result plugin_init ( color_ostream &out, std::vector <PluginCommand> &commands)
 {
     commands.push_back(
-        PluginCommand(
-        "automelt", "Automatically melt metal items in marked stockpiles.",
-        automelt_cmd, false, ""));
+        PluginCommand("automelt",
+                      "Automatically melt metal items in marked stockpiles.",
+                      automelt_cmd));
 
     return CR_OK;
 }

From 08154ca1b5c1e0c635ceda48edad9dbaa3e2adee Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Mon, 18 Jul 2022 16:13:27 -0700
Subject: [PATCH 237/854] update docs for autotrade

---
 docs/plugins/autotrade.rst | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/docs/plugins/autotrade.rst b/docs/plugins/autotrade.rst
index 4f0d95efd..e695a0a53 100644
--- a/docs/plugins/autotrade.rst
+++ b/docs/plugins/autotrade.rst
@@ -1,5 +1,11 @@
 autotrade
 =========
-When autotrade is enabled for a stockpile, any items placed in it will be
-designated to be taken to the Trade Depot whenever merchants are on the map.
-This plugin adds an option to the :kbd:`q` menu when `enabled <enable>`.
+
+Quickly designate items to be traded. When `enabled <enable>`, this plugin adds
+an option to the :kbd:`q` menu for stockpiles. When the ``autotrade`` option is
+selected for the stockpile, any items placed in the stockpile will automatically
+be designated to be traded.
+
+Usage::
+
+    enable autotrade

From 2bc6e09ba0183ade4c483b353be0c965c56ab81a Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Mon, 18 Jul 2022 16:20:43 -0700
Subject: [PATCH 238/854] fix formatting typos

---
 docs/plugins/autodump.rst   | 39 -------------------------------------
 docs/plugins/autofarm.rst   |  8 ++++----
 docs/plugins/autohauler.rst |  1 +
 3 files changed, 5 insertions(+), 43 deletions(-)

diff --git a/docs/plugins/autodump.rst b/docs/plugins/autodump.rst
index 8064583ea..83b50e498 100644
--- a/docs/plugins/autodump.rst
+++ b/docs/plugins/autodump.rst
@@ -41,42 +41,3 @@ Examples:
     Teleports all unforbidden items marked for dumping to the cursor position.
 - ``autodump destroy``
     Destroys all unforbidden items marked for dumping
-
-
-                     Alias ``autodump-destroy-here``, for keybindings.
-                     :dfhack-keybind:`autodump-destroy-here`
-
-``autodump-destroy-item`` destroys the selected item, which may be selected
-in the :kbd:`k` list, or inside a container. If called again before the game
-is resumed, cancels destruction of the item.
-:dfhack-keybind:`autodump-destroy-item`
-
-
-
- commands.push_back(PluginCommand(
-        "autodump", "Teleport items marked for dumping to the cursor.",
-        df_autodump, false,
-        "  This utility lets you quickly move all items designated to be dumped.\n"
-        "  Items are instantly moved to the cursor position, the dump flag is unset,\n"
-        "  and the forbid flag is set, as if it had been dumped normally.\n"
-        "  Be aware that any active dump item tasks still point at the item.\n"
-        "Options:\n"
-        "  destroy       - instead of dumping, destroy the items instantly.\n"
-        "  destroy-here  - only affect the tile under cursor.\n"
-        "  visible       - only process items that are not hidden.\n"
-        "  hidden        - only process hidden items.\n"
-        "  forbidden     - only process forbidden items (default: only unforbidden).\n"
-    ));
-    commands.push_back(PluginCommand(
-        "autodump-destroy-here", "Destroy items marked for dumping under cursor.",
-        df_autodump_destroy_here, Gui::cursor_hotkey,
-        "  Identical to autodump destroy-here, but intended for use as keybinding.\n"
-    ));
-    commands.push_back(PluginCommand(
-        "autodump-destroy-item", "Destroy the selected item.",
-        df_autodump_destroy_item, Gui::any_item_hotkey,
-        "  Destroy the selected item. The item may be selected\n"
-        "  in the 'k' list, or inside a container. If called\n"
-        "  again before the game is resumed, cancels destroy.\n"
-    ));
-    return CR_OK;
diff --git a/docs/plugins/autofarm.rst b/docs/plugins/autofarm.rst
index d5bb12e41..d66830fe0 100644
--- a/docs/plugins/autofarm.rst
+++ b/docs/plugins/autofarm.rst
@@ -10,13 +10,13 @@ Usage:
 
 - ``enable autofarm``
     Enable the plugin and start managing crop assignment.
-* ``autofarm runonce``
+- ``autofarm runonce``
     Updates all farm plots once, without enabling the plugin.
-* ``autofarm status``
+- ``autofarm status``
     Prints status information, including any defined thresholds.
-* ``autofarm default <number>``
+- ``autofarm default <number>``
     Sets the default threshold.
-* ``autofarm threshold <number> <type> [<type> ...]``
+- ``autofarm threshold <number> <type> [<type> ...]``
     Sets thresholds of individual plant types.
 
 You can find the identifiers for the crop types in your world by running the
diff --git a/docs/plugins/autohauler.rst b/docs/plugins/autohauler.rst
index d1743f5ef..3bdd00950 100644
--- a/docs/plugins/autohauler.rst
+++ b/docs/plugins/autohauler.rst
@@ -41,6 +41,7 @@ Usage:
     In the next cycle, output the state of every dwarf.
 
 Examples:
+
 - ``autohauler HAUL_STONE haulers``
     Set stone hauling as a hauling labor (this is already the default).
 - ``autohauler RECOVER_WOUNDED allow``

From 154dc7c96c7760dbf5e62eb23bb62ac4bb9eb48a Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Mon, 18 Jul 2022 16:32:43 -0700
Subject: [PATCH 239/854] update docs for blueprint

---
 docs/plugins/blueprint.rst | 108 ++++++++++++++++++++-----------------
 plugins/blueprint.cpp      |   5 +-
 2 files changed, 62 insertions(+), 51 deletions(-)

diff --git a/docs/plugins/blueprint.rst b/docs/plugins/blueprint.rst
index 6d5e306d1..edfc1f096 100644
--- a/docs/plugins/blueprint.rst
+++ b/docs/plugins/blueprint.rst
@@ -1,7 +1,9 @@
 blueprint
 =========
-The ``blueprint`` command exports the structure of a portion of your fortress in
-a blueprint file that you (or anyone else) can later play back with `quickfort`.
+
+Record a live game map in a quickfort blueprint. With ``blueprint``, you can
+export the structure of a portion of your fortress in a blueprint file that you
+(or anyone else) can later play back with `quickfort`.
 
 Blueprints are ``.csv`` or ``.xlsx`` files created in the ``blueprints``
 subdirectory of your DF folder. The map area to turn into a blueprint is either
@@ -9,104 +11,110 @@ selected interactively with the ``blueprint gui`` command or, if the GUI is not
 used, starts at the active cursor location and extends right and down for the
 requested width and height.
 
-**Usage:**
-
-    ``blueprint <width> <height> [<depth>] [<name> [<phases>]] [<options>]``
+Usage::
 
-    ``blueprint gui [<name> [<phases>]] [<options>]``
+    blueprint <width> <height> [<depth>] [<name> [<phases>]] [<options>]
+    blueprint gui [<name> [<phases>]] [<options>]
 
-**Examples:**
+Examples:
 
-``blueprint gui``
+- ``blueprint gui``
     Runs `gui/blueprint`, the interactive frontend, where all configuration for
     a ``blueprint`` command can be set visually and interactively.
-
-``blueprint 30 40 bedrooms``
+- ``blueprint 30 40 bedrooms``
     Generates blueprints for an area 30 tiles wide by 40 tiles tall, starting
-    from the active cursor on the current z-level. Blueprints are written
-    sequentially to ``bedrooms.csv`` in the ``blueprints`` directory.
-
-``blueprint 30 40 bedrooms dig --cursor 108,100,150``
+    from the active cursor on the current z-level. Blueprints are written to
+    ``bedrooms.csv`` in the ``blueprints`` directory.
+- ``blueprint 30 40 bedrooms dig --cursor 108,100,150``
     Generates only the ``#dig`` blueprint in the ``bedrooms.csv`` file, and
     the start of the blueprint area is set to a specific value instead of using
     the in-game cursor position.
 
-**Positional Parameters:**
+Positional Parameters:
 
-:``width``:   Width of the area (in tiles) to translate.
-:``height``:  Height of the area (in tiles) to translate.
-:``depth``:   Number of z-levels to translate. Positive numbers go *up* from the
-    cursor and negative numbers go *down*. Defaults to 1 if not specified,
-    indicating that the blueprint should only include the current z-level.
-:``name``:    Base name for blueprint files created in the ``blueprints``
-    directory. If no name is specified, "blueprint" is used by default. The
-    string must contain some characters other than numbers so the name won't be
-    confused with the optional ``depth`` parameter.
+- ``width``
+    Width of the area (in tiles) to translate.
+- ``height``
+    Height of the area (in tiles) to translate.
+- ``depth``
+    Number of z-levels to translate. Positive numbers go *up* from the cursor
+    and negative numbers go *down*. Defaults to 1 if not specified, indicating
+    that the blueprint should only include the current z-level.
+- ``name``
+    Base name for blueprint files created in the ``blueprints`` directory. If no
+    name is specified, "blueprint" is used by default. The string must contain
+    some characters other than numbers so the name won't be confused with the
+    optional ``depth`` parameter.
 
-**Phases:**
+Phases:
 
 If you want to generate blueprints only for specific phases, add their names to
 the commandline, anywhere after the blueprint base name. You can list multiple
 phases; just separate them with a space.
 
-:``dig``:    Generate quickfort ``#dig`` blueprints for digging natural stone.
-:``carve``:  Generate quickfort ``#dig`` blueprints for smoothing and carving.
-:``build``:  Generate quickfort ``#build`` blueprints for constructions and
-    buildings.
-:``place``:  Generate quickfort ``#place`` blueprints for placing stockpiles.
-:``zone``:   Generate quickfort ``#zone`` blueprints for designating zones.
-:``query``:  Generate quickfort ``#query`` blueprints for configuring rooms.
+- ``dig``
+    Generate quickfort ``#dig`` blueprints for digging natural stone.
+- ``carve``
+    Generate quickfort ``#dig`` blueprints for smoothing and carving.
+- ``build``
+    Generate quickfort ``#build`` blueprints for constructions and buildings.
+- ``place``
+    Generate quickfort ``#place`` blueprints for placing stockpiles.
+- ``zone``
+    Generate quickfort ``#zone`` blueprints for designating zones.
+- ``query``
+    Generate quickfort ``#query`` blueprints for configuring rooms.
 
 If no phases are specified, phases are autodetected. For example, a ``#place``
 blueprint will be created only if there are stockpiles in the blueprint area.
 
-**Options:**
+Options:
 
-``-c``, ``--cursor <x>,<y>,<z>``:
+- ``-c``, ``--cursor <x>,<y>,<z>``
     Use the specified map coordinates instead of the current cursor position for
     the upper left corner of the blueprint range. If this option is specified,
     then an active game map cursor is not necessary.
-``-e``, ``--engrave``:
+- ``-e``, ``--engrave``
     Record engravings in the ``carve`` phase. If this option is not specified,
     engravings are ignored.
-``-f``, ``--format <format>``:
+- ``-f``, ``--format <format>``
     Select the output format of the generated files. See the ``Output formats``
     section below for options. If not specified, the output format defaults to
     "minimal", which will produce a small, fast ``.csv`` file.
-``-h``, ``--help``:
+- ``-h``, ``--help``
     Show command help text.
-``-s``, ``--playback-start <x>,<y>,<comment>``:
+- ``-s``, ``--playback-start <x>,<y>,<comment>``
     Specify the column and row offsets (relative to the upper-left corner of the
     blueprint, which is ``1,1``) where the player should put the cursor when the
     blueprint is played back with `quickfort`, in
     `quickfort start marker <quickfort-start>` format, for example:
     ``10,10,central stairs``. If there is a space in the comment, you will need
-    to surround the parameter string in double quotes: ``"-s10,10,central stairs"`` or
-    ``--playback-start "10,10,central stairs"`` or
-    ``"--playback-start=10,10,central stairs"``.
-``-t``, ``--splitby <strategy>``:
+    to surround the parameter string in double quotes:
+    ``"-s10,10,central stairs"`` or ``--playback-start "10,10,central stairs"``
+    or ``"--playback-start=10,10,central stairs"``.
+- ``-t``, ``--splitby <strategy>``
     Split blueprints into multiple files. See the ``Splitting output into
     multiple files`` section below for details. If not specified, defaults to
     "none", which will create a standard quickfort
     `multi-blueprint <quickfort-packaging>` file.
 
-**Output formats:**
+Output formats:
 
 Here are the values that can be passed to the ``--format`` flag:
 
-:``minimal``:
+- ``minimal``
     Creates ``.csv`` files with minimal file size that are fast to read and
     write. This is the default.
-:``pretty``:
-    Makes the blueprints in the ``.csv`` files easier to read and edit with a text
-    editor by adding extra spacing and alignment markers.
+- ``pretty``
+    Makes the blueprints in the ``.csv`` files easier to read and edit with a
+    text editor by adding extra spacing and alignment markers.
 
-**Splitting output into multiple files:**
+Splitting output into multiple files:
 
 The ``--splitby`` flag can take any of the following values:
 
-:``none``:
+- ``none``
     Writes all blueprints into a single file. This is the standard format for
     quickfort fortress blueprint bundles and is the default.
-:``phase``:
+- ``phase``
     Creates a separate file for each phase.
diff --git a/plugins/blueprint.cpp b/plugins/blueprint.cpp
index 1401333eb..3a0cb60b4 100644
--- a/plugins/blueprint.cpp
+++ b/plugins/blueprint.cpp
@@ -118,7 +118,10 @@ struct_identity blueprint_options::_identity(sizeof(blueprint_options), &df::all
 command_result blueprint(color_ostream &, vector<string> &);
 
 DFhackCExport command_result plugin_init(color_ostream &, vector<PluginCommand> &commands) {
-    commands.push_back(PluginCommand("blueprint", "Record the structure of a live game map in a quickfort blueprint file", blueprint, false));
+    commands.push_back(
+        PluginCommand("blueprint",
+                      "Record a live game map in a quickfort blueprint.",
+                      blueprint));
     return CR_OK;
 }
 

From 629c22b148422916bd2544d5ff03b7972b4f40cf Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Mon, 18 Jul 2022 16:38:28 -0700
Subject: [PATCH 240/854] update docs for building-hacks

---
 docs/Lua API.rst                |  6 +++---
 docs/plugins/building-hacks.rst | 11 +++++++++++
 2 files changed, 14 insertions(+), 3 deletions(-)
 create mode 100644 docs/plugins/building-hacks.rst

diff --git a/docs/Lua API.rst b/docs/Lua API.rst
index 107a0ba2e..aba0bcab7 100644
--- a/docs/Lua API.rst	
+++ b/docs/Lua API.rst	
@@ -4287,10 +4287,10 @@ blueprint files:
 The names of the functions are also available as the keys of the
 ``valid_phases`` table.
 
-.. _building-hacks:
+.. _building-hacks-api:
 
-building-hacks
-==============
+building-hacks API
+==================
 
 This plugin overwrites some methods in workshop df class so that mechanical workshops are possible. Although
 plugin export a function it's recommended to use lua decorated function.
diff --git a/docs/plugins/building-hacks.rst b/docs/plugins/building-hacks.rst
new file mode 100644
index 000000000..950d1751a
--- /dev/null
+++ b/docs/plugins/building-hacks.rst
@@ -0,0 +1,11 @@
+building-hacks
+==============
+
+Allows mods to create and manage powered workshops.
+
+Usage::
+
+    enable building-hacks
+
+Please see the `building-hacks-api` for information on accessing this plugin
+from Lua scripts.

From 19a4accca4c247ccd2f6c8999df5154d2cab0e4b Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Mon, 18 Jul 2022 16:58:01 -0700
Subject: [PATCH 241/854] update docs for bulidingplan

---
 docs/plugins/buildingplan.rst | 136 +++++++++++++++++-----------------
 plugins/buildingplan.cpp      |   6 +-
 2 files changed, 70 insertions(+), 72 deletions(-)

diff --git a/docs/plugins/buildingplan.rst b/docs/plugins/buildingplan.rst
index ca6273d10..4b21da8af 100644
--- a/docs/plugins/buildingplan.rst
+++ b/docs/plugins/buildingplan.rst
@@ -1,88 +1,86 @@
 buildingplan
 ============
-When active (via ``enable buildingplan``), this plugin adds a planning mode for
-building placement. You can then place furniture, constructions, and other buildings
-before the required materials are available, and they will be created in a suspended
-state. Buildingplan will periodically scan for appropriate items, and the jobs will
-be unsuspended when the items are available.
 
-This is very useful when combined with `workflow` - you can set a constraint
-to always have one or two doors/beds/tables/chairs/etc available, and place
-as many as you like. The plugins then take over and fulfill the orders,
-with minimal space dedicated to stockpiles.
+Plan building construction before you have materials. This plugin adds a
+planning mode for building placement. You can then place furniture,
+constructions, and other buildings before the required materials are available,
+and they will be created in a suspended state. Buildingplan will periodically
+scan for appropriate items, and the jobs will be unsuspended when the items are
+available.
 
-.. _buildingplan-filters:
-
-Item filtering
---------------
-
-While placing a building, you can set filters for what materials you want the building made
-out of, what quality you want the component items to be, and whether you want the items to
-be decorated.
-
-If a building type takes more than one item to construct, use :kbd:`Ctrl`:kbd:`Left` and
-:kbd:`Ctrl`:kbd:`Right` to select the item that you want to set filters for. Any filters that
-you set will be used for all buildings of the selected type placed from that point onward
-(until you set a new filter or clear the current one). Buildings placed before the filters
-were changed will keep the filter values that were set when the building was placed.
+This is very useful when combined with manager work orders or `workflow` -- you
+can set a constraint to always have one or two doors/beds/tables/chairs/etc.
+available, and place as many as you like. Materials are used to build the
+planned buildings as they are produced, with minimal space dedicated to
+stockpiles.
 
-For example, you can be sure that all your constructed walls are the same color by setting
-a filter to accept only certain types of stone.
+Usage::
 
-Quickfort mode
---------------
-
-If you use the external Python Quickfort to apply building blueprints instead of the native
-DFHack `quickfort` script, you must enable Quickfort mode. This temporarily enables
-buildingplan for all building types and adds an extra blank screen after every building
-placement. This "dummy" screen is needed for Python Quickfort to interact successfully with
-Dwarf Fortress.
+    enable buildingplan
+    buildingplan set
+    buildingplan set <setting> true|false
 
-Note that Quickfort mode is only for compatibility with the legacy Python Quickfort. The
-DFHack `quickfort` script does not need Quickfort mode to be enabled. The `quickfort` script
-will successfully integrate with buildingplan as long as the buildingplan plugin is enabled.
+Running ``buildingplan set`` without parameters displays the current settings.
 
 .. _buildingplan-settings:
 
 Global settings
 ---------------
 
-The buildingplan plugin has several global settings that can be set from the UI (:kbd:`G`
-from any building placement screen, for example: :kbd:`b`:kbd:`a`:kbd:`G`). These settings
-can also be set from the ``DFHack#`` prompt once a map is loaded (or from your
-``onMapLoad.init`` file) with the syntax::
+The buildingplan plugin has global settings that can be set from the UI
+(:kbd:`G` from any building placement screen, for example:
+:kbd:`b`:kbd:`a`:kbd:`G`). These settings can also be set via the
+``buildingplan set`` command. The available settings are:
+
+- ``all_enabled`` (default: false)
+    Enable planning mode for all building types.
+- ``blocks``, ``boulders``, ``logs``, ``bars`` (defaults: true, true, true, false)
+    Allow blocks, boulders, logs, or bars to be matched for generic "building
+    material" items.
+- ``quickfort_mode`` (default: false)
+    Enable compatibility mode for the legacy Python Quickfort (this setting is
+    not required for DFHack `quickfort`)
+
+The settings for ``blocks``, ``boulders``, ``logs``, and ``bars`` are saved with
+your fort, so you only have to set them once and they will be persisted in your
+save.
+
+If you normally embark with some blocks on hand for early workshops, you might
+want to add this line to your ``dfhack-config/init/onMapLoad.init`` file to
+always configure buildingplan to just use blocks for buildlings and
+constructions::
 
-    buildingplan set <setting> <true|false>
+    on-new-fortress buildingplan set boulders false; buildingplan set logs false
 
-and displayed with::
+.. _buildingplan-filters:
 
-    buildingplan set
+Item filtering
+--------------
 
-The available settings are:
-
-+----------------+---------+-----------+---------------------------------------+
-| Setting        | Default | Persisted | Description                           |
-+================+=========+===========+=======================================+
-| all_enabled    | false   | no        | Enable planning mode for all building |
-|                |         |           | types.                                |
-+----------------+---------+-----------+---------------------------------------+
-| blocks         | true    | yes       | Allow blocks, boulders, logs, or bars |
-+----------------+---------+           | to be matched for generic "building   |
-| boulders       | true    |           | material" items                       |
-+----------------+---------+           |                                       |
-| logs           | true    |           |                                       |
-+----------------+---------+           |                                       |
-| bars           | false   |           |                                       |
-+----------------+---------+-----------+---------------------------------------+
-| quickfort_mode | false   | no        | Enable compatibility mode for the     |
-|                |         |           | legacy Python Quickfort (not required |
-|                |         |           | for DFHack quickfort)                 |
-+----------------+---------+-----------+---------------------------------------+
-
-For example, to ensure you only use blocks when a "building material" item is required, you
-could add this to your ``onMapLoad.init`` file::
+While placing a building, you can set filters for what materials you want the
+building made out of, what quality you want the component items to be, and
+whether you want the items to be decorated.
 
-    on-new-fortress buildingplan set boulders false; buildingplan set logs false
+If a building type takes more than one item to construct, use
+:kbd:`Ctrl`:kbd:`Left` and :kbd:`Ctrl`:kbd:`Right` to select the item that you
+want to set filters for. Any filters that you set will be used for all buildings
+of the selected type placed from that point onward (until you set a new filter
+or clear the current one). Buildings placed before the filters were changed will
+keep the filter values that were set when the building was placed.
+
+For example, you can be sure that all your constructed walls are the same color
+by setting a filter to accept only certain types of stone.
+
+Quickfort mode
+--------------
+
+If you use the external Python Quickfort to apply building blueprints instead of
+the native DFHack `quickfort` script, you must enable Quickfort mode. This
+temporarily enables buildingplan for all building types and adds an extra blank
+screen after every building placement. This "dummy" screen is needed for Python
+Quickfort to interact successfully with Dwarf Fortress.
 
-Persisted settings (i.e. ``blocks``, ``boulders``, ``logs``, and ``bars``) are saved with
-your game, so you only need to set them to the values you want once.
+Note that Quickfort mode is only for compatibility with the legacy Python
+Quickfort. The DFHack `quickfort` script does not need this Quickfort mode to be
+enabled. The `quickfort` script will successfully integrate with buildingplan as
+long as the buildingplan plugin itself is enabled.
diff --git a/plugins/buildingplan.cpp b/plugins/buildingplan.cpp
index 594eaf48f..b13c8daa3 100644
--- a/plugins/buildingplan.cpp
+++ b/plugins/buildingplan.cpp
@@ -1058,9 +1058,9 @@ DFhackCExport command_result plugin_enable(color_ostream &out, bool enable)
 DFhackCExport command_result plugin_init ( color_ostream &out, std::vector <PluginCommand> &commands)
 {
     commands.push_back(
-        PluginCommand(
-        "buildingplan", "Plan building construction before you have materials",
-        buildingplan_cmd, false, "Run 'buildingplan debug [on|off]' to toggle debugging, or 'buildingplan version' to query the plugin version."));
+        PluginCommand("buildingplan",
+                      "Plan building construction before you have materials.",
+                      buildingplan_cmd));
 
     return CR_OK;
 }

From 66b7bcaf1a6965f27e6d3bce1fcdd012c06ac1b3 Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Mon, 18 Jul 2022 17:09:48 -0700
Subject: [PATCH 242/854] update docs for burrows

---
 docs/plugins/burrows.rst | 61 ++++++++++++++++++++++------------------
 plugins/burrows.cpp      | 33 +++-------------------
 2 files changed, 38 insertions(+), 56 deletions(-)

diff --git a/docs/plugins/burrows.rst b/docs/plugins/burrows.rst
index 787b3ff37..658b7d209 100644
--- a/docs/plugins/burrows.rst
+++ b/docs/plugins/burrows.rst
@@ -1,38 +1,45 @@
 burrows
 =======
-Miscellaneous burrow control. Allows manipulating burrows and automated burrow
-expansion while digging.
 
-Options:
+Quick commands for burrow control. Allows manipulating burrows and automated
+burrow expansion while digging.
 
-:enable feature ...:
-    Enable features of the plugin.
-:disable feature ...:
-    Disable features of the plugin.
-:clear-unit burrow burrow ...:
-    Remove all units from the burrows.
-:clear-tiles burrow burrow ...:
-    Remove all tiles from the burrows.
-:set-units target-burrow src-burrow ...:
-    Clear target, and adds units from source burrows.
-:add-units target-burrow src-burrow ...:
+Usage:
+
+- ``enable auto-grow``
+    When a wall inside a burrow with a name ending in '+' is dug out, the burrow
+    will be extended to newly-revealed adjacent walls. This final '+' may be
+    omitted in burrow name args of other ``burrows`` commands. Note that digging
+    1-wide corridors with the miner inside the burrow is SLOW.
+- ``disable auto-grow``
+    Disables auto-grow processing.
+- ``clear-unit <burrow> [<burrow> ...]``
+    Remove all units from the named burrows.
+- ``clear-tiles <burrow> [<burrow> ...]``
+    Remove all tiles from the named burrows.
+- ``set-units target-burrow <burrow> [<burrow> ...]``
+    Clear all units from the target burrow, then add units from the named source
+    burrows.
+- ``add-units target-burrow <burrow> [<burrow> ...]``
     Add units from the source burrows to the target.
-:remove-units target-burrow src-burrow ...:
+- ``remove-units target-burrow <burrow> [<burrow> ...]``
     Remove units in source burrows from the target.
-:set-tiles target-burrow src-burrow ...:
-    Clear target and adds tiles from the source burrows.
-:add-tiles target-burrow src-burrow ...:
+- ``set-tiles target-burrow <burrow> [<burrow> ...]``
+    Clear target burrow tiles and adds tiles from the names source burrows.
+- ``add-tiles target-burrow <burrow> [<burrow> ...]``
     Add tiles from the source burrows to the target.
-:remove-tiles target-burrow src-burrow ...:
+- ``remove-tiles target-burrow <burrow> [<burrow> ...]``
     Remove tiles in source burrows from the target.
 
-    For these three options, in place of a source burrow it is
-    possible to use one of the following keywords: ABOVE_GROUND,
-    SUBTERRANEAN, INSIDE, OUTSIDE, LIGHT, DARK, HIDDEN, REVEALED
+In place of a source burrow, you can use one of the following keywords:
 
-Features:
+- ``ABOVE_GROUND``
+- ``SUBTERRANEAN``
+- ``INSIDE``
+- ``OUTSIDE``
+- ``LIGHT``
+- ``DARK``
+- ``HIDDEN``
+- ``REVEALED``
 
-:auto-grow: When a wall inside a burrow with a name ending in '+' is dug
-            out, the burrow is extended to newly-revealed adjacent walls.
-            This final '+' may be omitted in burrow name args of commands above.
-            Digging 1-wide corridors with the miner inside the burrow is SLOW.
+to add tiles with the given properties.
diff --git a/plugins/burrows.cpp b/plugins/burrows.cpp
index 3b1d3fe86..029b3c715 100644
--- a/plugins/burrows.cpp
+++ b/plugins/burrows.cpp
@@ -53,35 +53,10 @@ static void deinit_map(color_ostream &out);
 
 DFhackCExport command_result plugin_init (color_ostream &out, std::vector <PluginCommand> &commands)
 {
-    commands.push_back(PluginCommand(
-        "burrow", "Miscellaneous burrow control.", burrow, false,
-        "  burrow enable options...\n"
-        "  burrow disable options...\n"
-        "    Enable or disable features of the plugin.\n"
-        "    See below for a list and explanation.\n"
-        "  burrow clear-units burrow burrow...\n"
-        "  burrow clear-tiles burrow burrow...\n"
-        "    Removes all units or tiles from the burrows.\n"
-        "  burrow set-units target-burrow src-burrow...\n"
-        "  burrow add-units target-burrow src-burrow...\n"
-        "  burrow remove-units target-burrow src-burrow...\n"
-        "    Adds or removes units in source burrows to/from the target\n"
-        "    burrow. Set is equivalent to clear and add.\n"
-        "  burrow set-tiles target-burrow src-burrow...\n"
-        "  burrow add-tiles target-burrow src-burrow...\n"
-        "  burrow remove-tiles target-burrow src-burrow...\n"
-        "    Adds or removes tiles in source burrows to/from the target\n"
-        "    burrow. In place of a source burrow it is possible to use\n"
-        "    one of the following keywords:\n"
-        "      ABOVE_GROUND, SUBTERRANEAN, INSIDE, OUTSIDE,\n"
-        "      LIGHT, DARK, HIDDEN, REVEALED\n"
-        "Implemented features:\n"
-        "  auto-grow\n"
-        "    When a wall inside a burrow with a name ending in '+' is dug\n"
-        "    out, the burrow is extended to newly-revealed adjacent walls.\n"
-        "    This final '+' may be omitted in burrow name args of commands above.\n"
-        "   Note: Digging 1-wide corridors with the miner inside the burrow is SLOW.\n"
-    ));
+    commands.push_back(
+        PluginCommand("burrow",
+                      "Quick commands for burrow control.",
+                      burrow));
 
     if (Core::getInstance().isMapLoaded())
         init_map(out);

From a20612b0a8325c2abdbec29fb1f202907d1558e0 Mon Sep 17 00:00:00 2001
From: Quietust <quietust@gmail.com>
Date: Sat, 16 Jul 2022 10:17:46 -0600
Subject: [PATCH 243/854] Update structures

---
 library/xml             |   2 +-
 plugins/strangemood.cpp | 214 ++++++++--------------------------------
 2 files changed, 43 insertions(+), 173 deletions(-)

diff --git a/library/xml b/library/xml
index 219676497..df19b880f 160000
--- a/library/xml
+++ b/library/xml
@@ -1 +1 @@
-Subproject commit 2196764977011991127244b28ff13b90cef19af3
+Subproject commit df19b880fb3cbaa1a31a12b058acf9936d7ddada
diff --git a/plugins/strangemood.cpp b/plugins/strangemood.cpp
index 5050b3621..de7fa426d 100644
--- a/plugins/strangemood.cpp
+++ b/plugins/strangemood.cpp
@@ -153,145 +153,40 @@ void selectWord (const df::language_word_table &table, int32_t &word, df::part_o
     }
 }
 
-void generateName(df::language_name &output, int language, df::language_name_type mode, const df::language_word_table &table1, const df::language_word_table &table2)
+void generateName(df::language_name &output, int language, const df::language_word_table &table1, const df::language_word_table &table2)
 {
     for (int i = 0; i < 100; i++)
     {
-        if (mode != 8 && mode != 9)
-        {
-            output = df::language_name();
-            if (language == -1)
-                language = rng.df_trandom(world->raws.language.translations.size());
-            output.type = mode;
-            output.language = language;
-        }
+        output = df::language_name();
+        if (language == -1)
+            language = rng.df_trandom(world->raws.language.translations.size());
+        output.type = language_name_type::Artifact;
+        output.language = language;
         output.has_name = 1;
         if (output.language == -1)
             output.language = rng.df_trandom(world->raws.language.translations.size());
         int r, r2, r3;
-        switch (mode)
+        r = rng.df_trandom(3);
+        if (r == 0 || r == 1)
         {
-        case language_name_type::Figure:
-        case language_name_type::FigureNoFirst:
-        case language_name_type::FigureFirstOnly:
-            if (mode != 9)
-            {
-                int32_t word; df::part_of_speech part;
-                output.first_name.clear();
-                selectWord(table1, word, part, 2);
-                if (word >= 0 && size_t(word) < world->raws.language.words.size())
-                    output.first_name = *world->raws.language.translations[language]->words[word];
-            }
-            if (mode != 10)
-            {
-        case language_name_type::Site:
-        case language_name_type::Monument:
-                if (rng.df_trandom(2))
-                {
-                    selectWord(table2, output.words[0], output.parts_of_speech[0], 0);
-                    selectWord(table1, output.words[1], output.parts_of_speech[1], 1);
-                }
-                else
-                {
-                    selectWord(table1, output.words[0], output.parts_of_speech[0], 0);
-                    selectWord(table2, output.words[1], output.parts_of_speech[1], 1);
-                }
-            }
-            break;
-
-        case language_name_type::Artifact:
-        case language_name_type::Unk13:
-        case language_name_type::River:
-            r = rng.df_trandom(3);
-            if (r == 0 || r == 1)
-            {
-                if (rng.df_trandom(2))
-                {
-                    selectWord(table2, output.words[0], output.parts_of_speech[0], 0);
-                    selectWord(table1, output.words[1], output.parts_of_speech[1], 1);
-                }
-                else
-                {
-                    selectWord(table1, output.words[0], output.parts_of_speech[0], 0);
-                    selectWord(table2, output.words[1], output.parts_of_speech[1], 1);
-                }
-            }
-            if (r == 1 || r == 2)
+            if (rng.df_trandom(2))
             {
-        case language_name_type::Squad:
-        case language_name_type::LegendaryFigure:
-        case language_name_type::ArtImage: // this is not a typo either
-                r2 = rng.df_trandom(2);
-                if (r2)
-                    selectWord(table1, output.words[5], output.parts_of_speech[5], 2);
-                else
-                    selectWord(table2, output.words[5], output.parts_of_speech[5], 2);
-                r3 = rng.df_trandom(3);
-                if (rng.df_trandom(50))
-                    r3 = rng.df_trandom(2);
-                switch (r3)
-                {
-                case 0:
-                case 2:
-                    if (r3 == 2)
-                        r2 = rng.df_trandom(2);
-                    if (r2)
-                        selectWord(table2, output.words[6], output.parts_of_speech[6], 5);
-                    else
-                        selectWord(table1, output.words[6], output.parts_of_speech[6], 5);
-                    if (r3 == 0)
-                        break;
-                    r2 = -r2;
-                case 1:
-                    if (r2)
-                        selectWord(table1, output.words[2], output.parts_of_speech[2], 3);
-                    else
-                        selectWord(table2, output.words[2], output.parts_of_speech[2], 3);
-                    if (!(rng.df_trandom(100)))
-                        selectWord(table1, output.words[3], output.parts_of_speech[3], 3);
-                    break;
-                }
+                selectWord(table2, output.words[0], output.parts_of_speech[0], 0);
+                selectWord(table1, output.words[1], output.parts_of_speech[1], 1);
             }
-            if (rng.df_trandom(100))
+            else
             {
-                if (rng.df_trandom(2))
-                    selectWord(table1, output.words[4], output.parts_of_speech[4], 4);
-                else
-                    selectWord(table2, output.words[4], output.parts_of_speech[4], 4);
+                selectWord(table1, output.words[0], output.parts_of_speech[0], 0);
+                selectWord(table2, output.words[1], output.parts_of_speech[1], 1);
             }
-            if ((mode == 3) && (output.parts_of_speech[5] == part_of_speech::Noun) && (output.words[5] != -1) && (world->raws.language.words[output.words[5]]->forms[1].length()))
-                output.parts_of_speech[5] = part_of_speech::NounPlural;
-            break;
-
-        case language_name_type::Civilization:
-        case language_name_type::World:
-        case language_name_type::Region:
-        case language_name_type::AdventuringGroup:
-        case language_name_type::SiteGovernment:
-        case language_name_type::NomadicGroup:
-        case language_name_type::Vessel:
-        case language_name_type::MilitaryUnit:
-        case language_name_type::Religion:
-        case language_name_type::MountainPeak:
-        case language_name_type::Temple:
-        case language_name_type::Keep:
-        case language_name_type::MeadHall:
-        case language_name_type::Unk24:
-        case language_name_type::Unk25:
-        case language_name_type::Unk26:
-        case language_name_type::Market:
-        case language_name_type::Tavern:
-        case language_name_type::War:
-        case language_name_type::Battle:
-        case language_name_type::Siege:
-        case language_name_type::Road:
-        case language_name_type::Wall:
-        case language_name_type::Bridge:
-        case language_name_type::Tunnel:
-        case language_name_type::PretentiousEntityPosition:
-        case language_name_type::Tomb:
-        case language_name_type::OutcastGroup:
-            selectWord(table1, output.words[5], output.parts_of_speech[5], 2);
+        }
+        if (r == 1 || r == 2)
+        {
+            r2 = rng.df_trandom(2);
+            if (r2)
+                selectWord(table1, output.words[5], output.parts_of_speech[5], 2);
+            else
+                selectWord(table2, output.words[5], output.parts_of_speech[5], 2);
             r3 = rng.df_trandom(3);
             if (rng.df_trandom(50))
                 r3 = rng.df_trandom(2);
@@ -299,56 +194,31 @@ void generateName(df::language_name &output, int language, df::language_name_typ
             {
             case 0:
             case 2:
-                selectWord(table2, output.words[6], output.parts_of_speech[6], 5);
+                if (r3 == 2)
+                    r2 = rng.df_trandom(2);
+                if (r2)
+                    selectWord(table2, output.words[6], output.parts_of_speech[6], 5);
+                else
+                    selectWord(table1, output.words[6], output.parts_of_speech[6], 5);
                 if (r3 == 0)
                     break;
+                r2 = -r2;
             case 1:
-                selectWord(table2, output.words[2], output.parts_of_speech[2], 3);
-                if (!(rng.df_trandom(100)))
-                    selectWord(table2, output.words[3], output.parts_of_speech[3], 3);
-                break;
-            }
-            if (rng.df_trandom(100))
-                selectWord(table2, output.words[4], output.parts_of_speech[4], 4);
-            break;
-
-        case language_name_type::Dungeon:
-            r = rng.df_trandom(3);
-            if (r == 0 || r == 1)
-            {
-                selectWord(table2, output.words[0], output.parts_of_speech[0], 0);
-                selectWord(table1, output.words[1], output.parts_of_speech[1], 1);
-            }
-            if (r == 1 || r == 2)
-            {
-                r2 = rng.df_trandom(2);
-                if (r == 2 || r2 == 1)
-                    selectWord(table1, output.words[5], output.parts_of_speech[5], 2);
+                if (r2)
+                    selectWord(table1, output.words[2], output.parts_of_speech[2], 3);
                 else
-                    selectWord(table2, output.words[5], output.parts_of_speech[5], 2);
-                r3 = rng.df_trandom(3);
-                if (rng.df_trandom(50))
-                    r3 = rng.df_trandom(2);
-                switch (r3)
-                {
-                case 0:
-                case 2:
-                    selectWord(table1, output.words[6], output.parts_of_speech[6], 5);
-                    if (r3 == 0)
-                        break;
-                case 1:
                     selectWord(table2, output.words[2], output.parts_of_speech[2], 3);
-                    if (!(rng.df_trandom(100)))
-                        selectWord(table2, output.words[3], output.parts_of_speech[3], 3);
-                    break;
-                }
+                if (!(rng.df_trandom(100)))
+                    selectWord(table1, output.words[3], output.parts_of_speech[3], 3);
+                break;
             }
-            if (rng.df_trandom(100))
+        }
+        if (rng.df_trandom(100))
+        {
+            if (rng.df_trandom(2))
+                selectWord(table1, output.words[4], output.parts_of_speech[4], 4);
+            else
                 selectWord(table2, output.words[4], output.parts_of_speech[4], 4);
-            break;
-        default:
-            // not handled yet
-            break;
         }
         if (output.words[2] != -1 && output.words[3] != -1 &&
             world->raws.language.words[output.words[3]]->adj_dist < world->raws.language.words[output.words[2]]->adj_dist)
@@ -1351,10 +1221,10 @@ command_result df_strangemood (color_ostream &out, vector <string> & parameters)
 
     // Generate the artifact's name
     if (type == mood_type::Fell || type == mood_type::Macabre)
-        generateName(unit->status.artifact_name, unit->name.language, language_name_type::Artifact, world->raws.language.word_table[0][2], world->raws.language.word_table[1][2]);
+        generateName(unit->status.artifact_name, unit->name.language, world->raws.language.word_table[0][2], world->raws.language.word_table[1][2]);
     else
     {
-        generateName(unit->status.artifact_name, unit->name.language, language_name_type::Artifact, world->raws.language.word_table[0][1], world->raws.language.word_table[1][1]);
+        generateName(unit->status.artifact_name, unit->name.language, world->raws.language.word_table[0][1], world->raws.language.word_table[1][1]);
         if (!rng.df_trandom(100))
             unit->status.artifact_name = unit->name;
     }

From e5961b45b4ef0e3f236d17374c6a988584114e7f Mon Sep 17 00:00:00 2001
From: DFHack-Urist via GitHub Actions
 <63161697+DFHack-Urist@users.noreply.github.com>
Date: Tue, 19 Jul 2022 07:17:31 +0000
Subject: [PATCH 244/854] Auto-update submodules

library/xml: master
---
 library/xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/library/xml b/library/xml
index df19b880f..1595cc1fe 160000
--- a/library/xml
+++ b/library/xml
@@ -1 +1 @@
-Subproject commit df19b880fb3cbaa1a31a12b058acf9936d7ddada
+Subproject commit 1595cc1fe1f4662eebffdb4a77355491aafacea6

From e3588cf49c83ecd2f99af0ef0bd05853e1ffb394 Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Tue, 19 Jul 2022 22:13:53 -0700
Subject: [PATCH 245/854] return entire tag data structure for iterating

---
 library/lua/helpdb.lua | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/library/lua/helpdb.lua b/library/lua/helpdb.lua
index 18ba5b746..0c0bd9955 100644
--- a/library/lua/helpdb.lua
+++ b/library/lua/helpdb.lua
@@ -186,7 +186,9 @@ local function update_entry(entry, iterator, opts)
         table.insert(lines, line)
         ::continue::
     end
-    entry.long_help = table.concat(lines, '\n')
+    if #lines > 0 then
+        entry.long_help = table.concat(lines, '\n')
+    end
 end
 
 -- create db entry based on parsing sphinx-rendered help text
@@ -457,13 +459,13 @@ function get_tags()
     return set_to_sorted_list(tag_index)
 end
 
--- returns the description associated with the given tag
-function get_tag_description(tag)
+function get_tag_data(tag)
     ensure_db()
     if not tag_index[tag] then
-        error('invalid tag: ' .. tag)
+        dfhack.printerr('invalid tag: ' .. tag)
+        return {}
     end
-    return tag_index[tag].description
+    return tag_index[tag]
 end
 
 ---------------------------------------------------------------------------
@@ -621,7 +623,8 @@ function tags()
     local tags = get_tags()
     local width = get_max_width(tags, 10)
     for _,tag in ipairs(tags) do
-        print(('  %-'..width..'s %s'):format(tag, get_tag_description(tag)))
+        print(('  %-'..width..'s %s'):format(tag,
+                                             get_tag_data(tag).description))
     end
 end
 

From ddcb9b4921dcf28ecbe9c0aa4b62ac6dadfdbbed Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Tue, 19 Jul 2022 22:35:08 -0700
Subject: [PATCH 246/854] add missing 'man' builtin

---
 library/lua/helpdb.lua | 1 +
 1 file changed, 1 insertion(+)

diff --git a/library/lua/helpdb.lua b/library/lua/helpdb.lua
index 0c0bd9955..5e2b28ede 100644
--- a/library/lua/helpdb.lua
+++ b/library/lua/helpdb.lua
@@ -55,6 +55,7 @@ local BUILTINS = {
     'kill-lua',
     'load',
     'ls',
+    'man',
     'plug',
     'reload',
     'script',

From 954e2461409a7bad8bae88594cee0a114d516e3c Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Tue, 19 Jul 2022 23:01:25 -0700
Subject: [PATCH 247/854] reformat builtins and properly read tags

---
 docs/Tags.rst                    | 25 ++++++++++++++++---------
 docs/builtins/alias.rst          | 10 ++++++++--
 docs/builtins/clear.rst          |  5 ++++-
 docs/builtins/cls.rst            |  7 +++++--
 docs/builtins/devel/dump-rpc.rst |  5 ++++-
 docs/builtins/die.rst            |  5 ++++-
 docs/builtins/dir.rst            |  5 ++++-
 docs/builtins/disable.rst        | 22 +++++++---------------
 docs/builtins/enable.rst         | 22 ++++++++++++++++------
 docs/builtins/fpause.rst         |  9 ++++++++-
 docs/builtins/help.rst           | 12 +++++++++---
 docs/builtins/hide.rst           |  9 ++++++++-
 docs/builtins/keybinding.rst     |  8 ++++++--
 docs/builtins/kill-lua.rst       | 15 ++++++++++++---
 docs/builtins/load.rst           |  5 ++++-
 docs/builtins/ls.rst             |  8 ++++++--
 docs/builtins/man.rst            |  7 +++++++
 docs/builtins/plug.rst           |  5 ++++-
 docs/builtins/reload.rst         |  5 ++++-
 docs/builtins/sc-script.rst      |  8 ++++++--
 docs/builtins/script.rst         |  8 ++++++--
 docs/builtins/show.rst           |  9 ++++++++-
 docs/builtins/tags.rst           |  5 ++++-
 docs/builtins/type.rst           |  5 ++++-
 docs/builtins/unload.rst         |  5 ++++-
 library/lua/helpdb.lua           |  2 +-
 26 files changed, 169 insertions(+), 62 deletions(-)
 create mode 100644 docs/builtins/man.rst

diff --git a/docs/Tags.rst b/docs/Tags.rst
index 7a5288cbf..56e5af650 100644
--- a/docs/Tags.rst
+++ b/docs/Tags.rst
@@ -5,12 +5,19 @@ Tags
 
 This is the list of tags and their descriptions.
 
-- adventure: tools relevant to adventure mode
-- fort: tools relevant to fort mode
-- legends: tools relevant to legends mode
-- enable: tools that are able to be enabled/disabled for some persistent effect
-- items: tools that create or modify in-game items
-- units: tools that create or modify units
-- jobs: tools that create or modify jobs
-- labors: tools that deal with labor assignment
-- auto: tools that automatically manage some aspect of your fortress
+- adventure: Tools relevant to adventure mode
+- fort: Tools relevant to fort mode
+- legends: Tools relevant to legends mode
+- items: Tools that create or modify in-game items
+- units: Tools that create or modify units
+- jobs: Tools that create or modify jobs
+- labors: Tools that deal with labor assignment
+- auto: Tools that automatically manage some aspect of your fortress
+- map: Map modification
+- system: Tools related to working with DFHack commands or the core DFHack library
+- productivity: Tools that help you do things that you could do manually, but using the tool is better and faster
+- animals: Tools that help you manage animals
+- fix: Tools that fix specific bugs
+- inspection: Tools that let you inspect game data
+- buildings/furniture: Tools that help you work wtih placing or configuring buildings and furniture
+- quickfort: Tools that are involved in creating and playing back blueprints
diff --git a/docs/builtins/alias.rst b/docs/builtins/alias.rst
index 034d0f33a..325bb9dd7 100644
--- a/docs/builtins/alias.rst
+++ b/docs/builtins/alias.rst
@@ -1,5 +1,8 @@
 alias
------
+=====
+
+Tags: system
+:dfhack-keybind:`alias`
 
 Configure helper aliases for other DFHack commands. Aliases are resolved
 immediately after built-in commands, which means that an alias cannot override
@@ -21,7 +24,10 @@ Usage:
 Aliases can be given additional arguments when created and invoked, which will
 be passed to the underlying command in order.
 
-Example::
+Example
+-------
+
+::
 
     [DFHack]# alias add pargs devel/print-args example
     [DFHack]# pargs text
diff --git a/docs/builtins/clear.rst b/docs/builtins/clear.rst
index b964a8b3f..44c4f679a 100644
--- a/docs/builtins/clear.rst
+++ b/docs/builtins/clear.rst
@@ -1,4 +1,7 @@
 clear
------
+=====
+
+Tags: system
+:dfhack-keybind:`clear`
 
 Clear the terminal screen. This command is an alias for `cls`.
diff --git a/docs/builtins/cls.rst b/docs/builtins/cls.rst
index b05354d5a..0514353bd 100644
--- a/docs/builtins/cls.rst
+++ b/docs/builtins/cls.rst
@@ -1,5 +1,8 @@
 cls
----
+===
 
-Clear the terminal screen. Can also be invoked as ``clear``. Note that this
+Tags: system
+:dfhack-keybind:`cls`
+
+Clear the terminal screen. Can also be invoked as `clear`. Note that this
 command does not delete command history. It just clears the text on the screen.
diff --git a/docs/builtins/devel/dump-rpc.rst b/docs/builtins/devel/dump-rpc.rst
index af173a179..e6a710409 100644
--- a/docs/builtins/devel/dump-rpc.rst
+++ b/docs/builtins/devel/dump-rpc.rst
@@ -1,5 +1,8 @@
 devel/dump-rpc
---------------
+==============
+
+Tags: system
+:dfhack-keybind:`devel/dump-rpc`
 
 Writes RPC endpoint information to the specified file.
 
diff --git a/docs/builtins/die.rst b/docs/builtins/die.rst
index d2dae484f..7a7414b8c 100644
--- a/docs/builtins/die.rst
+++ b/docs/builtins/die.rst
@@ -1,4 +1,7 @@
 die
----
+===
+
+Tags: system
+:dfhack-keybind:`die`
 
 Instantly exits DF without saving.
diff --git a/docs/builtins/dir.rst b/docs/builtins/dir.rst
index 5c2059099..2eca9218c 100644
--- a/docs/builtins/dir.rst
+++ b/docs/builtins/dir.rst
@@ -1,4 +1,7 @@
 dir
----
+===
+
+Tags: system
+:dfhack-keybind:`dir`
 
 List available DFHack commands. This is an alias of the `ls` command.
diff --git a/docs/builtins/disable.rst b/docs/builtins/disable.rst
index d871ff06e..413b8325f 100644
--- a/docs/builtins/disable.rst
+++ b/docs/builtins/disable.rst
@@ -1,20 +1,12 @@
 disable
--------
+=======
 
-Deactivate a DFHack tool that has some persistent effect. Many plugins and
-scripts can be in a distinct enabled or disabled state. Some of them activate
-and deactivate automatically depending on the contents of the world raws. Others
-store their state in world data. However a number of them have to be enabled
-globally, and the init file is the right place to do it.
+Tags: system
+:dfhack-keybind:`disable`
 
-Most such plugins or scripts support the built-in ``enable`` and ``disable``
-commands. Calling them at any time without arguments prints a list of enabled
-and disabled plugins, and shows whether that can be changed through the same
-commands. Passing plugin names to these commands will enable or disable the
-specified plugins. For example, to disable the `manipulator` plugin::
+Deactivate a DFHack tool that has some persistent effect. See the `enable`
+command for more info.
 
-    disable manipulator
+Usage::
 
-It is also possible to enable or disable multiple plugins at once::
-
-    disable manipulator search
+    disable <plugin> [<plugin> ...]
diff --git a/docs/builtins/enable.rst b/docs/builtins/enable.rst
index 8338cc7f4..78534a98c 100644
--- a/docs/builtins/enable.rst
+++ b/docs/builtins/enable.rst
@@ -1,5 +1,8 @@
 enable
-------
+======
+
+Tags: system
+:dfhack-keybind:`enable`
 
 Activate a DFHack tool that has some persistent effect. Many plugins and scripts
 can be in a distinct enabled or disabled state. Some of them activate and
@@ -7,14 +10,21 @@ deactivate automatically depending on the contents of the world raws. Others
 store their state in world data. However a number of them have to be enabled
 globally, and the init file is the right place to do it.
 
-Most such plugins or scripts support the built-in ``enable`` and ``disable``
+Most such plugins or scripts support the built-in ``enable`` and `disable`
 commands. Calling them at any time without arguments prints a list of enabled
 and disabled plugins, and shows whether that can be changed through the same
 commands. Passing plugin names to these commands will enable or disable the
-specified plugins. For example, to enable the `manipulator` plugin::
+specified plugins.
+
+Usage::
 
-    enable manipulator
+    enable
+    enable <plugin> [<plugin> ...]
 
-It is also possible to enable or disable multiple plugins at once::
+Examples
+--------
 
-    enable manipulator search
+- ``enable manipulator``
+    Enable the ``manipulator`` plugin.
+- ``enable manipulator search``
+    Enable multiple plugins at once.
diff --git a/docs/builtins/fpause.rst b/docs/builtins/fpause.rst
index 68e4eb07e..60459848e 100644
--- a/docs/builtins/fpause.rst
+++ b/docs/builtins/fpause.rst
@@ -1,5 +1,12 @@
 fpause
-------
+======
+
+Tags: system
+:dfhack-keybind:`fpause`
 
 Forces DF to pause. This is useful when your FPS drops below 1 and you lose
 control of the game.
+
+Usage::
+
+    fpause
diff --git a/docs/builtins/help.rst b/docs/builtins/help.rst
index aa9e4b170..49c010fec 100644
--- a/docs/builtins/help.rst
+++ b/docs/builtins/help.rst
@@ -1,5 +1,8 @@
 help
-----
+====
+
+Tags: system
+:dfhack-keybind:`help`
 
 Display help about a command or plugin.
 
@@ -8,7 +11,10 @@ Usage::
     help|?|man
     help|?|man <command or plugin>
 
-Examples::
+Examples
+--------
+
+::
 
     help blueprint
     man blueprint
@@ -16,4 +22,4 @@ Examples::
 Both examples above will display the help text for the `blueprint` command.
 
 Some commands also take ``help`` or ``?`` as an option on their command line
-for the same effect - e.g. ``blueprint help``.
+for the same effect -- e.g. ``blueprint help``.
diff --git a/docs/builtins/hide.rst b/docs/builtins/hide.rst
index 5c8d08452..6b391972f 100644
--- a/docs/builtins/hide.rst
+++ b/docs/builtins/hide.rst
@@ -1,8 +1,15 @@
 hide
-----
+====
+
+Tags: system
+:dfhack-keybind:`hide`
 
 Hides the DFHack terminal window. You can show it again with the `show`
 command, though you'll need to use it from a `keybinding` set beforehand or the
 in-game `command-prompt`.
 
 Only available on Windows.
+
+Usage::
+
+    hide
diff --git a/docs/builtins/keybinding.rst b/docs/builtins/keybinding.rst
index 7ab92c206..72ceaaf71 100644
--- a/docs/builtins/keybinding.rst
+++ b/docs/builtins/keybinding.rst
@@ -1,5 +1,8 @@
 keybinding
-----------
+==========
+
+Tags: system
+:dfhack-keybind:`keybinding`
 
 Create hotkeys that will run DFHack commands. Like any other command it can be
 used at any time from the console, but bindings are not remembered between runs
@@ -46,7 +49,8 @@ example, ``@foo|bar|baz/foo`` would match anything under ``@foo``, ``@bar``, or
 
 Interactive commands like `liquids` cannot be used as hotkeys.
 
-Examples:
+Examples
+--------
 
 - ``keybinding add Alt-F1 hotkeys``
     Bind Alt-F1 to run the `hotkeys` command on any screen at any time.
diff --git a/docs/builtins/kill-lua.rst b/docs/builtins/kill-lua.rst
index ee354846a..875376952 100644
--- a/docs/builtins/kill-lua.rst
+++ b/docs/builtins/kill-lua.rst
@@ -1,6 +1,15 @@
 kill-lua
---------
+========
+
+Tags: system
+:dfhack-keybind:`kill-lua`
 
 Gracefully stops any currently-running Lua scripts. Use this command to stop
-a misbehaving script that appears to be stuck. Use ``kill-lua force`` if just
-``kill-lua`` doesn't work.
+a misbehaving script that appears to be stuck.
+
+Usage::
+
+    kill-lua
+    kill-lua force
+
+Use ``kill-lua force`` if just ``kill-lua`` doesn't seem to work.
diff --git a/docs/builtins/load.rst b/docs/builtins/load.rst
index fb654b8a4..cac760c2a 100644
--- a/docs/builtins/load.rst
+++ b/docs/builtins/load.rst
@@ -1,5 +1,8 @@
 load
-----
+====
+
+Tags: system
+:dfhack-keybind:`load`
 
 Load and register a plugin library. Also see `unload` and `reload` for related
 actions.
diff --git a/docs/builtins/ls.rst b/docs/builtins/ls.rst
index fd2e532ed..6875083f5 100644
--- a/docs/builtins/ls.rst
+++ b/docs/builtins/ls.rst
@@ -1,5 +1,8 @@
 ls
---
+==
+
+Tags: system
+:dfhack-keybind:`ls`
 
 List available DFHack commands. In order to group related commands, each command
 is associated with a list of tags. You can filter the listed commands by a tag
@@ -25,7 +28,8 @@ You can also pass some optional parameters to change how ``ls`` behaves:
 - ``--dev``
     Include commands intended for developers and modders.
 
-Examples:
+Examples
+--------
 
 - ``ls adventure``
     Lists all commands with the ``adventure`` tag.
diff --git a/docs/builtins/man.rst b/docs/builtins/man.rst
new file mode 100644
index 000000000..3b5b52515
--- /dev/null
+++ b/docs/builtins/man.rst
@@ -0,0 +1,7 @@
+man
+===
+
+Tags: system
+:dfhack-keybind:`man`
+
+An alias for the `help` command.
diff --git a/docs/builtins/plug.rst b/docs/builtins/plug.rst
index 93bd452a7..8f714b7cf 100644
--- a/docs/builtins/plug.rst
+++ b/docs/builtins/plug.rst
@@ -1,5 +1,8 @@
 plug
-----
+====
+
+Tags: system
+:dfhack-keybind:`plug`
 
 Lists available plugins and whether they are enabled.
 
diff --git a/docs/builtins/reload.rst b/docs/builtins/reload.rst
index 8f28e5ca6..d61e5c2fd 100644
--- a/docs/builtins/reload.rst
+++ b/docs/builtins/reload.rst
@@ -1,5 +1,8 @@
 reload
-------
+======
+
+Tags: system
+:dfhack-keybind:`reload`
 
 Reload a loaded plugin. Developer use this command to reload a plugin that they
 are actively modifying. Also see `load` and `unload` for related actions.
diff --git a/docs/builtins/sc-script.rst b/docs/builtins/sc-script.rst
index 20a0e9497..2c80e1130 100644
--- a/docs/builtins/sc-script.rst
+++ b/docs/builtins/sc-script.rst
@@ -1,5 +1,8 @@
 sc-script
----------
+=========
+
+Tags: system
+:dfhack-keybind:`sc-script`
 
 Runs commands when game state changes occur. This is similar to the static
 `init-files` but is slightly more flexible since it can be set dynamically.
@@ -13,7 +16,8 @@ Usage:
 - ``sc-script add|remove <event> <file> [<file> ...]``
     Register or unregister a file to be run for the specified event.
 
-Examples:
+Examples
+--------
 
 - ``sc-script add SC_MAP_LOADED spawn_extra_monsters.init``
     Registers the ``spawn_extra_monsters.init`` file to be run whenever a new
diff --git a/docs/builtins/script.rst b/docs/builtins/script.rst
index ae4017ca7..d69f3bbc7 100644
--- a/docs/builtins/script.rst
+++ b/docs/builtins/script.rst
@@ -1,5 +1,8 @@
 script
-------
+======
+
+Tags: system
+:dfhack-keybind:`script`
 
 Executes a batch file of DFHack commands. It reads a text file and runs each
 line as a DFHack command as if it had been typed in by the user - treating the
@@ -12,7 +15,8 @@ Usage::
 
     script <filename>
 
-Examples:
+Examples
+--------
 
 - ``script startup.txt``
     Executes the commands in ``startup.txt``, which exists in your DF game
diff --git a/docs/builtins/show.rst b/docs/builtins/show.rst
index 8a6f9b446..e192f857c 100644
--- a/docs/builtins/show.rst
+++ b/docs/builtins/show.rst
@@ -1,5 +1,8 @@
 show
-----
+====
+
+Tags: system
+:dfhack-keybind:`show`
 
 Unhides the DFHack terminal window. Useful if you have hidden the terminal with
 `hide` and you want it back. Since the terminal window won't be available to run
@@ -7,3 +10,7 @@ this command, you'll need to use it from a `keybinding` set beforehand or the
 in-game `command-prompt`.
 
 Only available on Windows.
+
+Usage::
+
+    show
diff --git a/docs/builtins/tags.rst b/docs/builtins/tags.rst
index 9de0f8df3..3d7933fca 100644
--- a/docs/builtins/tags.rst
+++ b/docs/builtins/tags.rst
@@ -1,5 +1,8 @@
 tags
-----
+====
+
+Tags: system
+:dfhack-keybind:`tags`
 
 List the strings that DFHack tools can be tagged with. You can find groups of
 related tools by passing the tag name to the `ls` command.
diff --git a/docs/builtins/type.rst b/docs/builtins/type.rst
index c4c752bef..16325c90f 100644
--- a/docs/builtins/type.rst
+++ b/docs/builtins/type.rst
@@ -1,5 +1,8 @@
 type
-----
+====
+
+Tags: system
+:dfhack-keybind:`type`
 
 Describes how a command is implemented. DFHack commands can be provided by
 plugins, scripts, or by the core library itself. The ``type`` command can tell
diff --git a/docs/builtins/unload.rst b/docs/builtins/unload.rst
index f4069ed88..99eed500c 100644
--- a/docs/builtins/unload.rst
+++ b/docs/builtins/unload.rst
@@ -1,5 +1,8 @@
 unload
-------
+======
+
+Tags: system
+:dfhack-keybind:`unload`
 
 Unload a plugin from memory. Also see `load` and `reload` for related actions.
 
diff --git a/library/lua/helpdb.lua b/library/lua/helpdb.lua
index 5e2b28ede..a972cca24 100644
--- a/library/lua/helpdb.lua
+++ b/library/lua/helpdb.lua
@@ -268,7 +268,7 @@ local function update_db(old_db, db, source, entry_name, kwargs)
         error('unhandled help source: ' .. source)
     end
     db[entry_name] = entry
-    for _,tag in ipairs(entry.tags) do
+    for tag in pairs(entry.tags) do
         -- ignore unknown tags
         if tag_index[tag] then
             table.insert(tag_index[tag], entry_name)

From 1cad77601e15bf543ddab5326a3c38c665a63ced Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Tue, 19 Jul 2022 23:11:02 -0700
Subject: [PATCH 248/854] update formatting for plugin docs

---
 docs/plugins/3dveins.rst               |  6 +++++-
 docs/plugins/add-spatter.rst           |  3 +++
 docs/plugins/autochop.rst              |  3 +++
 docs/plugins/autoclothing.rst          |  6 +++++-
 docs/plugins/autodump-destroy-here.rst |  3 +++
 docs/plugins/autodump-destroy-item.rst |  3 +++
 docs/plugins/autodump.rst              |  9 +++++++--
 docs/plugins/autofarm.rst              |  6 +++++-
 docs/plugins/autogems-reload.rst       |  3 +++
 docs/plugins/autogems.rst              |  3 +++
 docs/plugins/autohauler.rst            |  6 +++++-
 docs/plugins/autolabor.rst             |  9 +++++++--
 docs/plugins/automaterial.rst          |  3 +++
 docs/plugins/automelt.rst              |  3 +++
 docs/plugins/autotrade.rst             |  3 +++
 docs/plugins/blueprint.rst             | 21 +++++++++++++++------
 docs/plugins/building-hacks.rst        |  3 +++
 docs/plugins/buildingplan.rst          |  3 +++
 docs/plugins/burrows.rst               |  3 +++
 19 files changed, 85 insertions(+), 14 deletions(-)

diff --git a/docs/plugins/3dveins.rst b/docs/plugins/3dveins.rst
index 9a074a4c8..89c241df6 100644
--- a/docs/plugins/3dveins.rst
+++ b/docs/plugins/3dveins.rst
@@ -1,6 +1,9 @@
 3dveins
 =======
 
+Tags:
+:dfhack-keybind:`3dveins`
+
 Rewrites layer veins to expand in 3D space. Existing, flat veins are removed
 and new 3D veins that naturally span z-levels are generated in their place.
 The transformation preserves the mineral counts reported by `prospect`.
@@ -11,7 +14,8 @@ Usage::
 
 The ``verbose`` option prints out extra information to the console.
 
-Example::
+Example
+-------
 
     3dveins
 
diff --git a/docs/plugins/add-spatter.rst b/docs/plugins/add-spatter.rst
index b6bb97cf7..92808017c 100644
--- a/docs/plugins/add-spatter.rst
+++ b/docs/plugins/add-spatter.rst
@@ -1,6 +1,9 @@
 add-spatter
 ===========
 
+Tags:
+:dfhack-keybind:`add-spatter`
+
 Make tagged reactions produce contaminants. The plugin is intended to give some
 use to all those poisons that can be bought from caravans. It automatically
 enables itself when you load a world with reactions that include names starting
diff --git a/docs/plugins/autochop.rst b/docs/plugins/autochop.rst
index 7c517e901..704b97143 100644
--- a/docs/plugins/autochop.rst
+++ b/docs/plugins/autochop.rst
@@ -1,6 +1,9 @@
 autochop
 ========
 
+Tags:
+:dfhack-keybind:`autochop`
+
 Auto-harvest trees when low on stockpiled logs. This plugin can designate trees
 for chopping when your stocks are low on logs.
 
diff --git a/docs/plugins/autoclothing.rst b/docs/plugins/autoclothing.rst
index a3c53a65a..a8cc001dd 100644
--- a/docs/plugins/autoclothing.rst
+++ b/docs/plugins/autoclothing.rst
@@ -1,6 +1,9 @@
 autoclothing
 ============
 
+Tags:
+:dfhack-keybind:`autoclothing`
+
 Automatically manage clothing work orders. It allows you to set how many of each
 clothing type every citizen should have.
 
@@ -15,7 +18,8 @@ anything your civilization can produce, such as "dress" or "mitten".
 When invoked without a number, it shows the current configuration for that
 material and item.
 
-Examples:
+Examples
+--------
 
 * ``autoclothing cloth "short skirt" 10``:
     Sets the desired number of cloth short skirts available per citizen to 10.
diff --git a/docs/plugins/autodump-destroy-here.rst b/docs/plugins/autodump-destroy-here.rst
index 375a799c0..35356166c 100644
--- a/docs/plugins/autodump-destroy-here.rst
+++ b/docs/plugins/autodump-destroy-here.rst
@@ -1,6 +1,9 @@
 autodump-destroy-here
 =====================
 
+Tags:
+:dfhack-keybind:`autodump-destroy-here`
+
 Destroy items marked for dumping under cursor. If called again before the game
 is resumed, cancels destruction of the items. This is an alias for the
 `autodump` command ``autodump destroy-here``, intended for use as a keybinding.
diff --git a/docs/plugins/autodump-destroy-item.rst b/docs/plugins/autodump-destroy-item.rst
index a9f3554c3..9447590d0 100644
--- a/docs/plugins/autodump-destroy-item.rst
+++ b/docs/plugins/autodump-destroy-item.rst
@@ -1,6 +1,9 @@
 autodump-destroy-item
 =====================
 
+Tags:
+:dfhack-keybind:`autodump-destroy-item`
+
 Destroy the selected item. The item may be selected in the :kbd:`k` list or in
 the container item list. If called again before the game is resumed, cancels
 destruction of the item.
diff --git a/docs/plugins/autodump.rst b/docs/plugins/autodump.rst
index 83b50e498..5ac0d1cd5 100644
--- a/docs/plugins/autodump.rst
+++ b/docs/plugins/autodump.rst
@@ -1,6 +1,9 @@
 autodump
 ========
 
+Tags:
+:dfhack-keybind:`autodump`
+
 Quickly designate or teleport items to be dumped. When `enabled <enable>`, this
 plugin adds an option to the :kbd:`q` menu for stockpiles. When the ``autodump``
 option is selected for the stockpile, any items placed in the stockpile will
@@ -19,7 +22,8 @@ Usage::
     enable autodump
     autodump [<options>]
 
-Options:
+Options
+-------
 
 - ``destroy``
     Destroy instead of dumping. Doesn't require a cursor. If ``autodump`` is
@@ -35,7 +39,8 @@ Options:
 - ``forbidden``
     Only process forbidden items (default: only unforbidden).
 
-Examples:
+Examples
+--------
 
 - ``autodump``
     Teleports all unforbidden items marked for dumping to the cursor position.
diff --git a/docs/plugins/autofarm.rst b/docs/plugins/autofarm.rst
index d66830fe0..9a3e16d43 100644
--- a/docs/plugins/autofarm.rst
+++ b/docs/plugins/autofarm.rst
@@ -1,6 +1,9 @@
 autofarm
 ========
 
+Tags:
+:dfhack-keybind:`autofarm`
+
 Automatically manage farm crop selection. This plugin periodically scans your
 plant stocks and assigns crops to your farm plots based on which plant stocks
 are low (as long as you have the appropriate seeds). The target threshold for
@@ -24,7 +27,8 @@ following command::
 
     lua "for _,plant in ipairs(df.global.world.raws.plants.all) do if plant.flags.SEED then print(plant.id) end end"
 
-Examples:
+Examples
+--------
 
 - ``autofarm default 30``
     Set the default threshold to 30.
diff --git a/docs/plugins/autogems-reload.rst b/docs/plugins/autogems-reload.rst
index a37117746..0988496cb 100644
--- a/docs/plugins/autogems-reload.rst
+++ b/docs/plugins/autogems-reload.rst
@@ -1,6 +1,9 @@
 autogems-reload
 ===============
 
+Tags:
+:dfhack-keybind:`autogems-reload`
+
 Reloads the autogems configuration file. You might need to do this if you have
 manually modified the contents while the game is running.
 
diff --git a/docs/plugins/autogems.rst b/docs/plugins/autogems.rst
index ad3b0f9c3..724752217 100644
--- a/docs/plugins/autogems.rst
+++ b/docs/plugins/autogems.rst
@@ -1,6 +1,9 @@
 autogems
 ========
 
+Tags:
+:dfhack-keybind:`autogems`
+
 Automatically cut rough gems. This plugin periodically scans your stocks of
 rough gems and creates manager orders for cutting them at a Jeweler's Workshop.
 
diff --git a/docs/plugins/autohauler.rst b/docs/plugins/autohauler.rst
index 3bdd00950..f28044479 100644
--- a/docs/plugins/autohauler.rst
+++ b/docs/plugins/autohauler.rst
@@ -1,6 +1,9 @@
 autohauler
 ==========
 
+Tags:
+:dfhack-keybind:`autohauler`
+
 Automatically manage hauling labors. Similar to `autolabor`, but instead of
 managing all labors, ``autohauler`` only addresses hauling labors, leaving the
 assignment of skilled labors entirely up to you. You can use the in-game
@@ -40,7 +43,8 @@ Usage:
 - ``autohauler debug``
     In the next cycle, output the state of every dwarf.
 
-Examples:
+Examples
+--------
 
 - ``autohauler HAUL_STONE haulers``
     Set stone hauling as a hauling labor (this is already the default).
diff --git a/docs/plugins/autolabor.rst b/docs/plugins/autolabor.rst
index b60146d28..f402703c8 100644
--- a/docs/plugins/autolabor.rst
+++ b/docs/plugins/autolabor.rst
@@ -1,6 +1,9 @@
 autolabor
 =========
 
+Tags:
+:dfhack-keybind:`autolabor`
+
 Automatically manage dwarf labors. Autolabor attempts to keep as many dwarves as
 possible busy while allowing dwarves to specialize in specific skills.
 
@@ -49,7 +52,8 @@ dwarfs that meet any of these conditions:
 
 We stop assigning dwarves when we reach the maximum allowed.
 
-Advanced usage:
+Advanced usage
+--------------
 
 - ``autolabor <labor> <minimum> [<maximum>] [<talent pool>]``
     Set range of dwarves assigned to a labor, optionally specifying the size of
@@ -68,7 +72,8 @@ Advanced usage:
 
 See `autolabor-artisans` for a differently-tuned setup.
 
-Examples:
+Examples
+--------
 
 - ``autolabor MINE 5``
     Keep at least 5 dwarves with mining enabled.
diff --git a/docs/plugins/automaterial.rst b/docs/plugins/automaterial.rst
index 51701a1fc..429a25d70 100644
--- a/docs/plugins/automaterial.rst
+++ b/docs/plugins/automaterial.rst
@@ -1,6 +1,9 @@
 automaterial
 ============
 
+Tags:
+:dfhack-keybind:`automaterial`
+
 Sorts building materials by recent usage. This makes building constructions
 (walls, floors, fortifications, etc) much easier by saving you from having to
 trawl through long lists of materials each time you place one.
diff --git a/docs/plugins/automelt.rst b/docs/plugins/automelt.rst
index 749aac28a..b16368ac5 100644
--- a/docs/plugins/automelt.rst
+++ b/docs/plugins/automelt.rst
@@ -1,6 +1,9 @@
 automelt
 ========
 
+Tags:
+:dfhack-keybind:`automelt`
+
 Quickly designate items to be melted. When `enabled <enable>`, this plugin adds
 an option to the :kbd:`q` menu for stockpiles. When the ``automelt`` option is
 selected for the stockpile, any items placed in the stockpile will automatically
diff --git a/docs/plugins/autotrade.rst b/docs/plugins/autotrade.rst
index e695a0a53..405621b2b 100644
--- a/docs/plugins/autotrade.rst
+++ b/docs/plugins/autotrade.rst
@@ -1,6 +1,9 @@
 autotrade
 =========
 
+Tags:
+:dfhack-keybind:`autotrade`
+
 Quickly designate items to be traded. When `enabled <enable>`, this plugin adds
 an option to the :kbd:`q` menu for stockpiles. When the ``autotrade`` option is
 selected for the stockpile, any items placed in the stockpile will automatically
diff --git a/docs/plugins/blueprint.rst b/docs/plugins/blueprint.rst
index edfc1f096..9d74fa47a 100644
--- a/docs/plugins/blueprint.rst
+++ b/docs/plugins/blueprint.rst
@@ -1,6 +1,9 @@
 blueprint
 =========
 
+Tags:
+:dfhack-keybind:`blueprint`
+
 Record a live game map in a quickfort blueprint. With ``blueprint``, you can
 export the structure of a portion of your fortress in a blueprint file that you
 (or anyone else) can later play back with `quickfort`.
@@ -16,7 +19,8 @@ Usage::
     blueprint <width> <height> [<depth>] [<name> [<phases>]] [<options>]
     blueprint gui [<name> [<phases>]] [<options>]
 
-Examples:
+Examples
+--------
 
 - ``blueprint gui``
     Runs `gui/blueprint`, the interactive frontend, where all configuration for
@@ -30,7 +34,8 @@ Examples:
     the start of the blueprint area is set to a specific value instead of using
     the in-game cursor position.
 
-Positional Parameters:
+Positional parameters
+---------------------
 
 - ``width``
     Width of the area (in tiles) to translate.
@@ -46,7 +51,8 @@ Positional Parameters:
     some characters other than numbers so the name won't be confused with the
     optional ``depth`` parameter.
 
-Phases:
+Phases
+------
 
 If you want to generate blueprints only for specific phases, add their names to
 the commandline, anywhere after the blueprint base name. You can list multiple
@@ -68,7 +74,8 @@ phases; just separate them with a space.
 If no phases are specified, phases are autodetected. For example, a ``#place``
 blueprint will be created only if there are stockpiles in the blueprint area.
 
-Options:
+Options
+-------
 
 - ``-c``, ``--cursor <x>,<y>,<z>``
     Use the specified map coordinates instead of the current cursor position for
@@ -98,7 +105,8 @@ Options:
     "none", which will create a standard quickfort
     `multi-blueprint <quickfort-packaging>` file.
 
-Output formats:
+Output formats
+--------------
 
 Here are the values that can be passed to the ``--format`` flag:
 
@@ -109,7 +117,8 @@ Here are the values that can be passed to the ``--format`` flag:
     Makes the blueprints in the ``.csv`` files easier to read and edit with a
     text editor by adding extra spacing and alignment markers.
 
-Splitting output into multiple files:
+Splitting output into multiple files
+------------------------------------
 
 The ``--splitby`` flag can take any of the following values:
 
diff --git a/docs/plugins/building-hacks.rst b/docs/plugins/building-hacks.rst
index 950d1751a..78e94fba6 100644
--- a/docs/plugins/building-hacks.rst
+++ b/docs/plugins/building-hacks.rst
@@ -1,6 +1,9 @@
 building-hacks
 ==============
 
+Tags:
+:dfhack-keybind:`building-hacks`
+
 Allows mods to create and manage powered workshops.
 
 Usage::
diff --git a/docs/plugins/buildingplan.rst b/docs/plugins/buildingplan.rst
index 4b21da8af..62a239e3d 100644
--- a/docs/plugins/buildingplan.rst
+++ b/docs/plugins/buildingplan.rst
@@ -1,6 +1,9 @@
 buildingplan
 ============
 
+Tags:
+:dfhack-keybind:`buildingplan`
+
 Plan building construction before you have materials. This plugin adds a
 planning mode for building placement. You can then place furniture,
 constructions, and other buildings before the required materials are available,
diff --git a/docs/plugins/burrows.rst b/docs/plugins/burrows.rst
index 658b7d209..f863dd439 100644
--- a/docs/plugins/burrows.rst
+++ b/docs/plugins/burrows.rst
@@ -1,6 +1,9 @@
 burrows
 =======
 
+Tags:
+:dfhack-keybind:`burrows`
+
 Quick commands for burrow control. Allows manipulating burrows and automated
 burrow expansion while digging.
 

From c9f69081a64f6b27a7604bd605c20ad2338f5dce Mon Sep 17 00:00:00 2001
From: DFHack-Urist via GitHub Actions
 <63161697+DFHack-Urist@users.noreply.github.com>
Date: Wed, 20 Jul 2022 07:17:41 +0000
Subject: [PATCH 249/854] Auto-update submodules

scripts: master
---
 scripts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts b/scripts
index ef5fc459c..bd21e9664 160000
--- a/scripts
+++ b/scripts
@@ -1 +1 @@
-Subproject commit ef5fc459c4f0a65a9fd709c14fed0c5892c9eebd
+Subproject commit bd21e9664abf9963d5cf5f0f86222dd0dadda2c5

From 0dd153cc0d499c9b88eda6d81db1a873abcb10af Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Wed, 20 Jul 2022 12:34:40 -0700
Subject: [PATCH 250/854] ensure we pick up the plugin help entry

even when it has a command and that command is not equal to the plugin
name
---
 library/lua/helpdb.lua | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/library/lua/helpdb.lua b/library/lua/helpdb.lua
index a972cca24..f6f9ed864 100644
--- a/library/lua/helpdb.lua
+++ b/library/lua/helpdb.lua
@@ -293,25 +293,25 @@ local function scan_plugins(old_db, db)
     local plugin_names = dfhack.internal.listPlugins()
     for _,plugin in ipairs(plugin_names) do
         local commands = dfhack.internal.listCommands(plugin)
-        if #commands == 0 then
-            -- use plugin name as the command so we have something to anchor the
-            -- documentation to
-            update_db(old_db, db,
-                      has_rendered_help(plugin) and
-                            HELP_SOURCES.RENDERED or HELP_SOURCES.STUB,
-                      plugin, {entry_types={[ENTRY_TYPES.PLUGIN]=true}})
-            goto continue
-        end
+        local includes_plugin = false
         for _,command in ipairs(commands) do
             local entry_types = {[ENTRY_TYPES.COMMAND]=true}
             if command == plugin then
                 entry_types[ENTRY_TYPES.PLUGIN]=true
+                includes_plugin = true
             end
             update_db(old_db, db,
                       has_rendered_help(command) and
                             HELP_SOURCES.RENDERED or HELP_SOURCES.PLUGIN,
                       command, {entry_types=entry_types})
         end
+        if not includes_plugin then
+            update_db(old_db, db,
+                      has_rendered_help(plugin) and
+                            HELP_SOURCES.RENDERED or HELP_SOURCES.STUB,
+                      plugin, {entry_types={[ENTRY_TYPES.PLUGIN]=true}})
+            goto continue
+        end
         ::continue::
     end
 end

From 0fe4bed121621815dbd430b66544714723c3acb0 Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Wed, 20 Jul 2022 12:42:27 -0700
Subject: [PATCH 251/854] document both burrow command and burrows plugin

---
 docs/plugins/burrow.rst  | 49 ++++++++++++++++++++++++++++++++++++++++
 docs/plugins/burrows.rst | 48 ++++++++-------------------------------
 2 files changed, 58 insertions(+), 39 deletions(-)
 create mode 100644 docs/plugins/burrow.rst

diff --git a/docs/plugins/burrow.rst b/docs/plugins/burrow.rst
new file mode 100644
index 000000000..879a7cc78
--- /dev/null
+++ b/docs/plugins/burrow.rst
@@ -0,0 +1,49 @@
+burrow
+======
+
+Tags:
+:dfhack-keybind:`burrow`
+
+Quick commands for burrow control. Allows manipulating burrows and automated
+burrow expansion while digging.
+
+Usage:
+
+- ``burrows enable auto-grow``
+    When a wall inside a burrow with a name ending in '+' is dug out, the burrow
+    will be extended to newly-revealed adjacent walls. This final '+' may be
+    omitted in burrow name args of other ``burrows`` commands. Note that digging
+    1-wide corridors with the miner inside the burrow is SLOW. Be sure to also
+    run ``enable burrow`` for this feature to work.
+- ``burrows disable auto-grow``
+    Disables auto-grow processing.
+- ``burrows clear-unit <burrow> [<burrow> ...]``
+    Remove all units from the named burrows.
+- ``burrows clear-tiles <burrow> [<burrow> ...]``
+    Remove all tiles from the named burrows.
+- ``burrows set-units target-burrow <burrow> [<burrow> ...]``
+    Clear all units from the target burrow, then add units from the named source
+    burrows.
+- ``burrows add-units target-burrow <burrow> [<burrow> ...]``
+    Add units from the source burrows to the target.
+- ``burrows remove-units target-burrow <burrow> [<burrow> ...]``
+    Remove units in source burrows from the target.
+- ``burrows set-tiles target-burrow <burrow> [<burrow> ...]``
+    Clear target burrow tiles and adds tiles from the names source burrows.
+- ``burrows add-tiles target-burrow <burrow> [<burrow> ...]``
+    Add tiles from the source burrows to the target.
+- ``burrows remove-tiles target-burrow <burrow> [<burrow> ...]``
+    Remove tiles in source burrows from the target.
+
+In place of a source burrow, you can use one of the following keywords:
+
+- ``ABOVE_GROUND``
+- ``SUBTERRANEAN``
+- ``INSIDE``
+- ``OUTSIDE``
+- ``LIGHT``
+- ``DARK``
+- ``HIDDEN``
+- ``REVEALED``
+
+to add tiles with the given properties.
diff --git a/docs/plugins/burrows.rst b/docs/plugins/burrows.rst
index f863dd439..9bf375fa8 100644
--- a/docs/plugins/burrows.rst
+++ b/docs/plugins/burrows.rst
@@ -4,45 +4,15 @@ burrows
 Tags:
 :dfhack-keybind:`burrows`
 
-Quick commands for burrow control. Allows manipulating burrows and automated
-burrow expansion while digging.
+Auto-expand burrows as you dig. When a wall inside a burrow with a name ending
+in ``+`` is dug out, the burrow will be extended to newly-revealed adjacent
+walls. Note that digging 1-wide corridors with the miner inside the burrow is
+SLOW.
 
-Usage:
+Usage::
 
-- ``enable auto-grow``
-    When a wall inside a burrow with a name ending in '+' is dug out, the burrow
-    will be extended to newly-revealed adjacent walls. This final '+' may be
-    omitted in burrow name args of other ``burrows`` commands. Note that digging
-    1-wide corridors with the miner inside the burrow is SLOW.
-- ``disable auto-grow``
-    Disables auto-grow processing.
-- ``clear-unit <burrow> [<burrow> ...]``
-    Remove all units from the named burrows.
-- ``clear-tiles <burrow> [<burrow> ...]``
-    Remove all tiles from the named burrows.
-- ``set-units target-burrow <burrow> [<burrow> ...]``
-    Clear all units from the target burrow, then add units from the named source
-    burrows.
-- ``add-units target-burrow <burrow> [<burrow> ...]``
-    Add units from the source burrows to the target.
-- ``remove-units target-burrow <burrow> [<burrow> ...]``
-    Remove units in source burrows from the target.
-- ``set-tiles target-burrow <burrow> [<burrow> ...]``
-    Clear target burrow tiles and adds tiles from the names source burrows.
-- ``add-tiles target-burrow <burrow> [<burrow> ...]``
-    Add tiles from the source burrows to the target.
-- ``remove-tiles target-burrow <burrow> [<burrow> ...]``
-    Remove tiles in source burrows from the target.
+    enable burrows
+    burrows enable auto-grow
 
-In place of a source burrow, you can use one of the following keywords:
-
-- ``ABOVE_GROUND``
-- ``SUBTERRANEAN``
-- ``INSIDE``
-- ``OUTSIDE``
-- ``LIGHT``
-- ``DARK``
-- ``HIDDEN``
-- ``REVEALED``
-
-to add tiles with the given properties.
+Both of the above commands need to be run for the auto-grow functionality to
+work. See the `burrow` command for more burrow-related tools.

From ddd2e5003aa8b681f6a3210061b1f45851908c11 Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Wed, 20 Jul 2022 13:00:27 -0700
Subject: [PATCH 252/854] update docs for changeitem

---
 docs/plugins/changeitem.rst | 61 ++++++++++++++++++++++++-------------
 plugins/changeitem.cpp      | 34 +++------------------
 2 files changed, 43 insertions(+), 52 deletions(-)

diff --git a/docs/plugins/changeitem.rst b/docs/plugins/changeitem.rst
index c6da2516f..0a841511c 100644
--- a/docs/plugins/changeitem.rst
+++ b/docs/plugins/changeitem.rst
@@ -1,26 +1,43 @@
 changeitem
 ==========
-Allows changing item material and base quality. By default the item currently
-selected in the UI will be changed (you can select items in the 'k' list
-or inside containers/inventory). By default change is only allowed if materials
-is of the same subtype (for example wood<->wood, stone<->stone etc). But since
-some transformations work pretty well and may be desired you can override this
-with 'force'. Note that some attributes will not be touched, possibly resulting
-in weirdness. To get an idea how the RAW id should look like, check some items
-with 'info'. Using 'force' might create items which are not touched by
-crafters/haulers.
-
-Options:
-
-:info:         Don't change anything, print some info instead.
-:here:         Change all items at the cursor position. Requires in-game cursor.
-:material, m:  Change material. Must be followed by valid material RAW id.
-:quality, q:   Change base quality. Must be followed by number (0-5).
-:force:        Ignore subtypes, force change to new material.
-
-Examples:
-
-``changeitem m INORGANIC:GRANITE here``
-   Change material of all items under the cursor to granite.
+
+Tags:
+:dfhack-keybind:
+
+Allows changing item material and base quality. By default, a change is only
+allowed if the existing and desired item materials are of the same subtype
+(for example wood -> wood, stone -> stone, etc). But since some transformations
+work pretty well and may be desired you can override this with ``force``. Note
+that forced changes can possibly result in items that crafters and haulers
+refuse to touch.
+
+Usage:
+
+- ``changeitem info``
+   Show details about the selected item. Does not change the item. You can use
+   this command to discover RAW ids for existing items.
+- ``changeitem [<options>]``
+   Change the item selected in the ``k`` list or inside a container/inventory.
+- ``changeitem here [<options>]``
+   Change all items at the cursor position. Requires in-game cursor.
+
+Options
+-------
+
+- ``m``, ``material <RAW id>``
+   Change material. Must be followed by valid material RAW id.
+- ``s``, ``subtype <RAW id>``
+   Change subtype. Must be followed by a valid subtype RAW id."
+- ``q``, ``quality <quality>``
+   Change base quality. Must be followed by number (0-5) with 0 being no quality
+   and 5 being masterpiece quality.
+- ``force``
+   Ignore subtypes and force the change to the new material.
+
+Examples
+--------
+
+``changeitem here m INORGANIC:GRANITE``
+   Change material of all stone items under the cursor to granite.
 ``changeitem q 5``
    Change currently selected item to masterpiece quality.
diff --git a/plugins/changeitem.cpp b/plugins/changeitem.cpp
index 52d9e7ab9..49feaec79 100644
--- a/plugins/changeitem.cpp
+++ b/plugins/changeitem.cpp
@@ -37,37 +37,12 @@ REQUIRE_GLOBAL(world);
 
 command_result df_changeitem(color_ostream &out, vector <string> & parameters);
 
-const string changeitem_help =
-    "Changeitem allows to change some item attributes.\n"
-    "By default the item currently selected in the UI will be changed\n"
-    "(you can select items in the 'k' list or inside containers/inventory).\n"
-    "By default change is only allowed if materials is of the same subtype\n"
-    "(for example wood<->wood, stone<->stone etc). But since some transformations\n"
-    "work pretty well and may be desired you can override this with 'force'.\n"
-    "Note that some attributes will not be touched, possibly resulting in weirdness.\n"
-    "To get an idea how the RAW id should look like, check some items with 'info'.\n"
-    "Using 'force' might create items which are not touched by crafters/haulers.\n"
-    "Options:\n"
-    "  info         - don't change anything, print some item info instead\n"
-    "  here         - change all items at cursor position\n"
-    "  material, m  - change material. must be followed by material RAW id\n"
-    "  subtype, s   - change subtype. must be followed by correct RAW id\n"
-    "  quality, q   - change base quality. must be followed by number (0-5)\n"
-    "  force        - ignore subtypes, force change to new material.\n"
-    "Example:\n"
-    "  changeitem m INORGANIC:GRANITE here\n"
-    "    change material of all items under the cursor to granite\n"
-    "  changeitem q 5\n"
-    "    change currently selected item to masterpiece quality\n";
-
-
 DFhackCExport command_result plugin_init ( color_ostream &out, vector <PluginCommand> &commands)
 {
     commands.push_back(PluginCommand(
-        "changeitem", "Change item attributes (material, quality).",
-        df_changeitem, false,
-        changeitem_help.c_str()
-    ));
+        "changeitem",
+        "Change item attributes (material, quality).",
+        df_changeitem));
 
     return CR_OK;
 }
@@ -130,8 +105,7 @@ command_result df_changeitem(color_ostream &out, vector <string> & parameters)
 
         if (p == "help" || p == "?")
         {
-            out << changeitem_help << endl;
-            return CR_OK;
+            return CR_WRONG_USAGE;
         }
         else if (p == "here")
         {

From fae5f0635a7f6e7523f7d072ba26a244fada0575 Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Wed, 20 Jul 2022 13:21:05 -0700
Subject: [PATCH 253/854] update docs for changelayer

---
 docs/plugins/changelayer.rst | 106 +++++++++++++++++++----------------
 plugins/changelayer.cpp      |  66 ++--------------------
 2 files changed, 63 insertions(+), 109 deletions(-)

diff --git a/docs/plugins/changelayer.rst b/docs/plugins/changelayer.rst
index 87c27921c..535409e90 100644
--- a/docs/plugins/changelayer.rst
+++ b/docs/plugins/changelayer.rst
@@ -1,60 +1,72 @@
 changelayer
 ===========
-Changes material of the geology layer under cursor to the specified inorganic
-RAW material. Can have impact on all surrounding regions, not only your embark!
-By default changing stone to soil and vice versa is not allowed. By default
-changes only the layer at the cursor position. Note that one layer can stretch
-across lots of z levels. By default changes only the geology which is linked
-to the biome under the cursor. That geology might be linked to other biomes
-as well, though. Mineral veins and gem clusters will stay on the map. Use
-`changevein` for them.
-
-tl;dr: You will end up with changing quite big areas in one go, especially if
-you use it in lower z levels. Use with care.
-
-Options:
-
-:all_biomes:       Change selected layer for all biomes on your map.
-                   Result may be undesirable since the same layer can AND WILL
-                   be on different z-levels for different biomes. Use the tool
-                   'probe' to get an idea how layers and biomes are distributed
-                   on your map.
-:all_layers:       Change all layers on your map (only for the selected biome
-                   unless 'all_biomes' is added).
-                   Candy mountain, anyone? Will make your map quite boring,
-                   but tidy.
-:force:            Allow changing stone to soil and vice versa. !!THIS CAN HAVE
-                   WEIRD EFFECTS, USE WITH CARE!!
-                   Note that soil will not be magically replaced with stone.
-                   You will, however, get a stone floor after digging so it
-                   will allow the floor to be engraved.
-                   Note that stone will not be magically replaced with soil.
-                   You will, however, get a soil floor after digging so it
-                   could be helpful for creating farm plots on maps with no
-                   soil.
-:verbose:          Give some details about what is being changed.
-:trouble:          Give some advice about known problems.
-
-Examples:
+
+Tags:
+:dfhack-keybind:
+
+Change the material of an entire geology layer. Note that one layer can stretch
+across many z-levels, and changes to the geology layer will affect all
+surrounding regions, not just your embark! Mineral veins and gem clusters will
+not be affected. Use `changevein` if you want to modify those.
+
+tl;dr: You will end up with changing large areas in one go, especially if you
+use it in lower z levels. Use this command with care!
+
+Usage::
+
+   changelayer <material RAW id> [<options>]
+
+When run without options, ``changelayer`` will:
+
+- only affect the geology layer at the current cursor position
+- only affect the biome that covers the current cursor position
+- not allow changing stone to soil and vice versa
+
+You can use the `probe` command on various tiles around your map to find valid
+material RAW ids and to get an idea how layers and biomes are distributed.
+
+Options
+-------
+
+- ``all_biomes``
+   Change the corresponding geology layer for all biomes on your map. Be aware
+   that the same geology layer can AND WILL be on different z-levels for
+   different biomes.
+- ``all_layers``
+   Change all geology layers on your map (only for the selected biome unless
+   ``all_biomes`` is also specified). Candy mountain, anyone? Will make your map
+   quite boring, but tidy.
+- ``force``
+   Allow changing stone to soil and vice versa. **THIS CAN HAVE WEIRD EFFECTS,
+   USE WITH CARE AND SAVE FIRST**. Note that soil will not be magically replaced
+   with stone. You will, however, get a stone floor after digging, so it will
+   allow the floor to be engraved. Similarly, stone will not be magically
+   replaced with soil, but you will get a soil floor after digging, so it could
+   be helpful for creating farm plots on maps with no soil.
+- ``verbose``
+   Output details about what is being changed.
+
+Examples
+--------
 
 ``changelayer GRANITE``
-   Convert layer at cursor position into granite.
+   Convert the layer at the cursor position into granite.
 ``changelayer SILTY_CLAY force``
-   Convert layer at cursor position into clay even if it's stone.
+   Convert teh layer at the cursor position into clay, even if it's stone.
 ``changelayer MARBLE all_biomes all_layers``
    Convert all layers of all biomes which are not soil into marble.
 
 .. note::
 
     * If you use changelayer and nothing happens, try to pause/unpause the game
-      for a while and try to move the cursor to another tile. Then try again.
-      If that doesn't help try temporarily changing some other layer, undo your
-      changes and try again for the layer you want to change. Saving
-      and reloading your map might also help.
+      for a while and move the cursor to another tile. Then try again. If that
+      doesn't help, then try to temporarily change some other layer, undo your
+      changes, and try again for the layer you want to change. Saving and
+      reloading your map also sometimes helps.
     * You should be fine if you only change single layers without the use
-      of 'force'. Still it's advisable to save your game before messing with
+      of 'force'. Still, it's advisable to save your game before messing with
       the map.
-    * When you force changelayer to convert soil to stone you might experience
-      weird stuff (flashing tiles, tiles changed all over place etc).
-      Try reverting the changes manually or even better use an older savegame.
-      You did save your game, right?
+    * When you force changelayer to convert soil to stone, you might see some
+      weird stuff (flashing tiles, tiles changed all over place etc). Try
+      reverting the changes manually or even better use an older savegame. You
+      did save your game, right?
diff --git a/plugins/changelayer.cpp b/plugins/changelayer.cpp
index 79081c040..347f29b95 100644
--- a/plugins/changelayer.cpp
+++ b/plugins/changelayer.cpp
@@ -31,66 +31,14 @@ DFHACK_PLUGIN("changelayer");
 REQUIRE_GLOBAL(world);
 REQUIRE_GLOBAL(cursor);
 
-const string changelayer_help =
-    "  Allows to change the material of whole geology layers.\n"
-    "  Can have impact on all surrounding regions, not only your embark!\n"
-    "  By default changing stone to soil and vice versa is not allowed.\n"
-    "  By default changes only the layer at the cursor position.\n"
-    "  Note that one layer can stretch across lots of z levels.\n"
-    "  By default changes only the geology which is linked to the biome under the\n"
-    "  cursor. That geology might be linked to other biomes as well, though.\n"
-    "  Mineral veins and gem clusters will stay on the map.\n"
-    "  Use 'changevein' for them.\n\n"
-    "  tl;dr: You will end up with changing quite big areas in one go.\n\n"
-    "Options (first parameter MUST be the material id):\n"
-    "  all_biomes - Change layer for all biomes on your map.\n"
-    "               Result may be undesirable since the same layer\n"
-    "               can AND WILL be on different z-levels for different biomes.\n"
-    "               Use the tool 'probe' to get an idea how layers and biomes\n"
-    "               are distributed on your map.\n"
-    "  all_layers - Change all layers on your map.\n"
-    "               Candy mountain, anyone?\n"
-    "               Will make your map quite boring, but tidy.\n"
-    "  force      - Allow changing stone to soil and vice versa.\n"
-    "               !!THIS CAN HAVE WEIRD EFFECTS, USE WITH CARE!!\n"
-    "               Note that soil will not be magically replaced with stone.\n"
-    "                 You will, however, get a stone floor after digging so it\n"
-    "                 will allow the floor to be engraved.\n"
-    "               Note that stone will not be magically replaced with soil.\n"
-    "                 You will, however, get a soil floor after digging so it\n"
-    "                 could be helpful for creating farm plots on maps with no soil.\n"
-    "  verbose    - Give some more details about what is being changed.\n"
-    "  trouble    - Give some advice for known problems.\n"
-    "Example:\n"
-    "  changelayer GRANITE\n"
-    "    Convert layer at cursor position into granite.\n"
-    "  changelayer SILTY_CLAY force\n"
-    "    Convert layer at cursor position into clay even if it's stone.\n"
-    "  changelayer MARBLE allbiomes alllayers\n"
-    "    Convert all layers of all biomes into marble.\n";
-
-const string changelayer_trouble =
-    "Known problems with changelayer:\n\n"
-    "  Nothing happens, the material stays the old.\n"
-    "    Pause/unpause the game and/or move the cursor a bit. Then retry.\n"
-    "    Try changing another layer, undo the changes and try again.\n"
-    "    Try saving and loading the game.\n\n"
-    "  Weird stuff happening after using the 'force' option.\n"
-    "    Change former stone layers back to stone, soil back to soil.\n"
-    "    If in doubt, use the 'probe' tool to find tiles with soil walls\n"
-    "    and stone layer type or the other way round.\n";
-
-
 command_result changelayer (color_ostream &out, std::vector <std::string> & parameters);
 
 DFhackCExport command_result plugin_init ( color_ostream &out, std::vector <PluginCommand> &commands)
 {
     commands.push_back(PluginCommand(
-        "changelayer", "Change a whole geology layer.",
-        changelayer, false, /* true means that the command can't be used from non-interactive user interface */
-        // Extended help string. Used by CR_WRONG_USAGE and the help command:
-        changelayer_help.c_str()
-    ));
+        "changelayer",
+        "Change a whole geology layer.",
+        changelayer));
     return CR_OK;
 }
 
@@ -120,13 +68,7 @@ command_result changelayer (color_ostream &out, std::vector <std::string> & para
     {
         if(parameters[i] == "help" || parameters[i] == "?")
         {
-            out.print("%s",changelayer_help.c_str());
-            return CR_OK;
-        }
-        if(parameters[i] == "trouble")
-        {
-            out.print("%s",changelayer_trouble.c_str());
-            return CR_OK;
+            return CR_WRONG_USAGE;
         }
         if(parameters[i] == "force")
             force = true;

From d3dd12c38f8f7302a288c26c052415f2556c588f Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Wed, 20 Jul 2022 13:24:27 -0700
Subject: [PATCH 254/854] update docs for changevein

---
 docs/plugins/changevein.rst | 25 +++++++++++++++++++------
 plugins/changevein.cpp      |  3 +--
 2 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/docs/plugins/changevein.rst b/docs/plugins/changevein.rst
index ad7ab3d54..f4871772e 100644
--- a/docs/plugins/changevein.rst
+++ b/docs/plugins/changevein.rst
@@ -1,10 +1,23 @@
 changevein
 ==========
-Changes material of the vein under cursor to the specified inorganic RAW
-material. Only affects tiles within the current 16x16 block - for veins and
-large clusters, you will need to use this command multiple times.
 
-Example:
+Tags:
+:dfhack-keybind:
 
-``changevein NATIVE_PLATINUM``
-   Convert vein at cursor position into platinum ore.
+Changes the material of a mineral inclusion. You can change it to any incorganic
+material RAW id. Note that this command only affects tiles within the current
+16x16 block - for large veins and clusters, you will need to use this command
+multiple times.
+
+You can use the `probe` command to discover the material RAW ids for existing
+veins that you want to duplicate.
+
+Usage::
+
+    changevein <material RAW id>
+
+Example
+-------
+
+- ``changevein NATIVE_PLATINUM``
+    Convert vein at cursor position into platinum ore.
diff --git a/plugins/changevein.cpp b/plugins/changevein.cpp
index 8612603fc..48a1e7325 100644
--- a/plugins/changevein.cpp
+++ b/plugins/changevein.cpp
@@ -86,8 +86,7 @@ DFhackCExport command_result plugin_init ( color_ostream &out, std::vector <Plug
 {
     commands.push_back(PluginCommand("changevein",
         "Changes the material of a mineral inclusion.",
-        df_changevein, false,
-        "Syntax: changevein <inorganic material ID>\n"));
+        df_changevein));
     return CR_OK;
 }
 

From 1f3c4cdd18d9d7f67476d3104ded092161dd92aa Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Wed, 20 Jul 2022 13:26:30 -0700
Subject: [PATCH 255/854] update docs for cleanconst

---
 docs/plugins/cleanconst.rst | 15 +++++++++++----
 plugins/cleanconst.cpp      |  9 +++------
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/docs/plugins/cleanconst.rst b/docs/plugins/cleanconst.rst
index a8169d83b..c34bac6bf 100644
--- a/docs/plugins/cleanconst.rst
+++ b/docs/plugins/cleanconst.rst
@@ -1,7 +1,14 @@
 cleanconst
 ==========
-Cleans up construction materials.
 
-This utility alters all constructions on the map so that they spawn their
-building component when they are disassembled, allowing their actual
-build items to be safely deleted.  This can improve FPS in extreme situations.
+Tags:
+:dfhack-keybind:
+
+Cleans up construction materials. This tool alters all constructions on the map
+so that they spawn their building component when they are disassembled, allowing
+their actual build items to be safely deleted. This can improve FPS when you
+have many constructions on the map.
+
+Usage::
+
+    cleanconst
diff --git a/plugins/cleanconst.cpp b/plugins/cleanconst.cpp
index 84659c5d7..38149abd3 100644
--- a/plugins/cleanconst.cpp
+++ b/plugins/cleanconst.cpp
@@ -71,12 +71,9 @@ command_result df_cleanconst(color_ostream &out, vector <string> & parameters)
 DFhackCExport command_result plugin_init ( color_ostream &out, vector <PluginCommand> &commands)
 {
     commands.push_back(PluginCommand(
-        "cleanconst", "Cleans up construction materials.",
-        df_cleanconst, false,
-        "  This utility alters all constructions on the map so that they spawn their\n"
-        "  building component when they are disassembled, allowing their actual\n"
-        "  build items to be safely deleted.\n"
-    ));
+        "cleanconst",
+        "Cleans up construction materials.",
+        df_cleanconst));
     return CR_OK;
 }
 

From 048b20ac45c8ff4fde36e32f0ee2c62315efb427 Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Wed, 20 Jul 2022 13:34:29 -0700
Subject: [PATCH 256/854] no help entries for non-enableable plugins

---
 library/LuaApi.cpp     | 16 ++++++++++++++++
 library/lua/helpdb.lua |  3 ++-
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/library/LuaApi.cpp b/library/LuaApi.cpp
index c332933a2..770aab870 100644
--- a/library/LuaApi.cpp
+++ b/library/LuaApi.cpp
@@ -3147,6 +3147,21 @@ static int internal_getCommandHelp(lua_State *L)
     return 1;
 }
 
+static int internal_isPluginEnableable(lua_State *L)
+{
+    auto plugins = Core::getInstance().getPluginManager();
+
+    const char *name = luaL_checkstring(L, 1);
+
+    auto plugin = plugins->getPluginByName(name);
+    if (plugin)
+        lua_pushboolean(L, plugin->can_be_enabled());
+    else
+        lua_pushnil(L);
+
+    return 1;
+}
+
 static int internal_threadid(lua_State *L)
 {
     std::stringstream ss;
@@ -3221,6 +3236,7 @@ static const luaL_Reg dfhack_internal_funcs[] = {
     { "listPlugins", internal_listPlugins },
     { "listCommands", internal_listCommands },
     { "getCommandHelp", internal_getCommandHelp },
+    { "isPluginEnableable", internal_isPluginEnableable },
     { "threadid", internal_threadid },
     { "md5File", internal_md5file },
     { NULL, NULL }
diff --git a/library/lua/helpdb.lua b/library/lua/helpdb.lua
index f6f9ed864..e35d2f125 100644
--- a/library/lua/helpdb.lua
+++ b/library/lua/helpdb.lua
@@ -305,7 +305,8 @@ local function scan_plugins(old_db, db)
                             HELP_SOURCES.RENDERED or HELP_SOURCES.PLUGIN,
                       command, {entry_types=entry_types})
         end
-        if not includes_plugin then
+        if not includes_plugin and
+                dfhack.internal.isPluginEnableable(plugin) then
             update_db(old_db, db,
                       has_rendered_help(plugin) and
                             HELP_SOURCES.RENDERED or HELP_SOURCES.STUB,

From e9e477c680948ea016e8c4dffe61c10ae6168ffe Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Wed, 20 Jul 2022 13:51:03 -0700
Subject: [PATCH 257/854] update docs for clean and spotclean

---
 docs/plugins/clean.rst     | 41 ++++++++++++++++++++++++++++----------
 docs/plugins/spotclean.rst | 14 ++++++++++---
 plugins/cleaners.cpp       | 26 ++++++------------------
 3 files changed, 48 insertions(+), 33 deletions(-)

diff --git a/docs/plugins/clean.rst b/docs/plugins/clean.rst
index f2d0c361d..54421ce91 100644
--- a/docs/plugins/clean.rst
+++ b/docs/plugins/clean.rst
@@ -1,16 +1,37 @@
 clean
 =====
-Cleans all the splatter that get scattered all over the map, items and
-creatures. In an old fortress, this can significantly reduce FPS lag. It can
-also spoil your !!FUN!!, so think before you use it.
 
-Options:
+Tags:
+:dfhack-keybind:
 
-:map:          Clean the map tiles. By default, it leaves mud and snow alone.
-:units:        Clean the creatures. Will also clean hostiles.
-:items:        Clean all the items. Even a poisoned blade.
+Removes contaminants from tiles, items, and units. More specifically, it
+cleans all the splatter that get scattered all over the map and that clings to
+your items and units. In an old fortress, this can significantly reduce FPS lag.
+It can also spoil your !!FUN!!, so think before you use it.
 
-Extra options for ``map``:
+Usage::
 
-:mud:          Remove mud in addition to the normal stuff.
-:snow:         Also remove snow coverings.
+    clean all|map|items|units|plants [<options>]
+
+By default, cleaning the map leaves mud and snow alone. Note that cleaning units
+includes hostiles, and that cleaning items removes poisons from weapons.
+
+Options
+-------
+
+When cleaning the map, you can specify extra options for extra cleaning:
+
+- ``mud``
+    Also remove mud.
+- ``item``
+    Also remove item spatter, like fallen leaves and flowers.
+- ``snow``
+    Also remove snow coverings.
+
+Examples
+--------
+
+- ``clean all``
+    Clean everything that can be cleaned (except mud and snow).
+- ``clean all mud item snow``
+    Removes all spatter, including mud, leaves, and snow from map tiles.
diff --git a/docs/plugins/spotclean.rst b/docs/plugins/spotclean.rst
index 9ccdd2cc6..dcad047a4 100644
--- a/docs/plugins/spotclean.rst
+++ b/docs/plugins/spotclean.rst
@@ -1,6 +1,14 @@
 spotclean
 =========
-Works like ``clean map snow mud``, but only for the tile under the cursor. Ideal
-if you want to keep that bloody entrance ``clean map`` would clean up.
 
-:dfhack-keybind:`spotclean`
+Tags:
+:dfhack-keybind:
+
+Cleans a map tile of contaminants and spatter. It works like
+``clean map snow mud``, but only for the tile under the cursor. Ideal if you
+just want to clean a specific tile but don't want the `clean` command to remove
+all the glorious blood from your entranceway.
+
+Usage::
+
+    spotclean
diff --git a/plugins/cleaners.cpp b/plugins/cleaners.cpp
index 24694c6a2..7389488f1 100644
--- a/plugins/cleaners.cpp
+++ b/plugins/cleaners.cpp
@@ -241,27 +241,13 @@ command_result clean (color_ostream &out, vector <string> & parameters)
 DFhackCExport command_result plugin_init ( color_ostream &out, std::vector <PluginCommand> &commands)
 {
     commands.push_back(PluginCommand(
-        "clean","Remove contaminants from tiles, items and creatures.",
-        clean, false,
-        "  Removes contaminants from map tiles, items and creatures.\n"
-        "Options:\n"
-        "  map        - clean the map tiles\n"
-        "  items      - clean all items\n"
-        "  units      - clean all creatures\n"
-        "  plants     - clean all plants\n"
-        "  all        - clean everything.\n"
-        "More options for 'map':\n"
-        "  snow       - also remove snow\n"
-        "  mud        - also remove mud\n"
-        "  item       - also remove item spatters (e.g. leaves and flowers)\n"
-        "Example:\n"
-        "  clean all mud snow item\n"
-        "    Removes all spatter, including mud and snow from map tiles.\n"
-    ));
+        "clean",
+        "Remove contaminants from tiles, items and creatures.",
+        clean));
     commands.push_back(PluginCommand(
-        "spotclean","Cleans map tile under cursor.",
-        spotclean,Gui::cursor_hotkey
-    ));
+        "spotclean",
+        "Cleans map tile under cursor.",
+        spotclean,Gui::cursor_hotkey));
     return CR_OK;
 }
 

From d9a1104473f8aa9b3eaf264cd21bfbeddd50943c Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Wed, 20 Jul 2022 14:51:06 -0700
Subject: [PATCH 258/854] update docs for cleanowned

---
 docs/plugins/cleanowned.rst | 42 ++++++++++++++++++++++++++-----------
 plugins/cleanowned.cpp      | 19 +++--------------
 2 files changed, 33 insertions(+), 28 deletions(-)

diff --git a/docs/plugins/cleanowned.rst b/docs/plugins/cleanowned.rst
index 7f80e35cf..27e4806a2 100644
--- a/docs/plugins/cleanowned.rst
+++ b/docs/plugins/cleanowned.rst
@@ -1,19 +1,37 @@
 cleanowned
 ==========
-Confiscates items owned by dwarfs. By default, owned food on the floor
-and rotten items are confistacted and dumped.
 
-Options:
+Tags:
+:dfhack-keybind:
 
-:all:          confiscate all owned items
-:scattered:    confiscated and dump all items scattered on the floor
-:x:            confiscate/dump items with wear level 'x' and more
-:X:            confiscate/dump items with wear level 'X' and more
-:dryrun:       a dry run. combine with other options to see what will happen
-               without it actually happening.
+Confiscates and dumps garbage owned by dwarves. This tool gets dwarves to give
+up ownership of scattered items and items with heavy wear and then marks those
+items for dumping. Now you can finally get your dwarves to give up their rotten
+food and tattered loincloths and go get new ones!
 
-Example:
+Usage::
 
-``cleanowned scattered X``
-    This will confiscate rotten and dropped food, garbage on the floors and any
+    cleanowned [<types>] [dryrun]
+
+When run without parameters, ``cleanowned`` will confiscate and dump rotten
+items and owned food that is left behind on the floor. Specify the ``dryrun``
+parameter to just print out what would be done, but don't actually confiscate
+anything.
+
+You can confiscate additional types of items by adding them to the commandline:
+
+- ``scattered``
+    Confiscate/dump all items scattered on the floor.
+- ``x``
+    Confiscate/dump items with wear level 'x' (lightly worn) and more.
+- ``X``
+    Confiscate/dump items with wear level 'X' (heavily worn) and more.
+
+Or you can confiscate all owned items by specifying ``all``.
+
+Example
+-------
+
+- ``cleanowned scattered X``
+    Confiscate and dump rotten and dropped food, garbage on the floors, and any
     worn items with 'X' damage and above.
diff --git a/plugins/cleanowned.cpp b/plugins/cleanowned.cpp
index 90b0e743d..c1e5b31d4 100644
--- a/plugins/cleanowned.cpp
+++ b/plugins/cleanowned.cpp
@@ -31,22 +31,9 @@ command_result df_cleanowned (color_ostream &out, vector <string> & parameters);
 DFhackCExport command_result plugin_init ( color_ostream &out, std::vector <PluginCommand> &commands)
 {
     commands.push_back(PluginCommand(
-        "cleanowned", "Confiscates and dumps garbage owned by dwarfs.",
-        df_cleanowned, false,
-        "  This tool lets you confiscate and dump all the garbage\n"
-        "  dwarves ultimately accumulate.\n"
-        "  By default, only rotten and dropped food is confiscated.\n"
-        "Options:\n"
-        "  dryrun    - don't actually do anything, just print what would be done.\n"
-        "  scattered - confiscate owned items on the ground\n"
-        "  all       - confiscate everything\n"
-        "  x         - confiscate & dump 'x' and worse damaged items\n"
-        "  X         - confiscate & dump 'X' and worse damaged items\n"
-        "Example:\n"
-        "  cleanowned scattered X\n"
-        "    This will confiscate rotten and dropped food, garbage on the floors\n"
-        "    and any worn items with 'X' damage and above.\n"
-    ));
+        "cleanowned",
+        "Confiscates and dumps garbage owned by dwarves.",
+        df_cleanowned));
     return CR_OK;
 }
 

From 9dcb63da53a3dd1b641e1a6da9b65dac53a49b5c Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Wed, 20 Jul 2022 15:36:17 -0700
Subject: [PATCH 259/854] don't bork on no frame, set cursor to end of text

---
 library/lua/gui/widgets.lua | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/library/lua/gui/widgets.lua b/library/lua/gui/widgets.lua
index aea62bf87..5765992af 100644
--- a/library/lua/gui/widgets.lua
+++ b/library/lua/gui/widgets.lua
@@ -121,12 +121,12 @@ ResizingPanel = defclass(ResizingPanel, Panel)
 -- adjust our frame dimensions according to positions and sizes of our subviews
 function ResizingPanel:postUpdateLayout(frame_body)
     local w, h = 0, 0
-    for _,subview in ipairs(self.subviews) do
-        if subview.visible then
-            w = math.max(w, (subview.frame.l or 0) +
-                            (subview.frame.w or frame_body.width))
-            h = math.max(h, (subview.frame.t or 0) +
-                            (subview.frame.h or frame_body.height))
+    for _,s in ipairs(self.subviews) do
+        if s.visible then
+            w = math.max(w, (s.frame and s.frame.l or 0) +
+                            (s.frame and s.frame.w or frame_body.width))
+            h = math.max(h, (s.frame and s.frame.t or 0) +
+                            (s.frame and s.frame.h or frame_body.height))
         end
     end
     if not self.frame then self.frame = {} end
@@ -191,8 +191,8 @@ EditField.ATTRS{
 }
 
 function EditField:preinit(init_table)
-    local frame = init_table.frame or {}
-    frame.h = frame.h or 1
+    init_table.frame = init_table.frame or {}
+    init_table.frame.h = init_table.frame.h or 1
 end
 
 function EditField:init()
@@ -202,7 +202,7 @@ function EditField:init()
     end
 
     self.start_pos = 1
-    self.cursor = 1
+    self.cursor = #self.text + 1
 
     self:addviews{HotkeyLabel{frame={t=0,l=0},
                               key=self.key,

From 64b793b409fedb38e42367ac9b6ec1543e84d18e Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Wed, 20 Jul 2022 15:40:49 -0700
Subject: [PATCH 260/854] support EditField:setText() so scripts can use it

and be compatible with both the develop and docs branch
---
 library/lua/gui/widgets.lua | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/library/lua/gui/widgets.lua b/library/lua/gui/widgets.lua
index 1a1b4c6fb..ddd5a01d0 100644
--- a/library/lua/gui/widgets.lua
+++ b/library/lua/gui/widgets.lua
@@ -207,6 +207,10 @@ function EditField:getPreferredFocusState()
     return not self.key
 end
 
+function EditField:setText(text, cursor)
+    self.text = text
+end
+
 function EditField:postUpdateLayout()
     self.text_offset = self.subviews[1]:getTextWidth()
 end

From 837215ea647b4decdfdb3f320088974d5a89a048 Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Wed, 20 Jul 2022 16:28:11 -0700
Subject: [PATCH 261/854] modify ci/script-docs.py to read new doc locations

---
 ci/script-docs.py | 69 +++++++++++++++++++----------------------------
 1 file changed, 27 insertions(+), 42 deletions(-)

diff --git a/ci/script-docs.py b/ci/script-docs.py
index 7ef287f8a..0106a8f70 100755
--- a/ci/script-docs.py
+++ b/ci/script-docs.py
@@ -1,12 +1,13 @@
 #!/usr/bin/env python3
 import os
-from os.path import basename, dirname, join, splitext
+from os.path import basename, dirname, exists, join, splitext
 import sys
 
 SCRIPT_PATH = sys.argv[1] if len(sys.argv) > 1 else 'scripts'
+DOCS_PATH = join(SCRIPT_PATH, 'docs')
 IS_GITHUB_ACTIONS = bool(os.environ.get('GITHUB_ACTIONS'))
 
-def expected_cmd(path):
+def get_cmd(path):
     """Get the command from the name of a script."""
     dname, fname = basename(dirname(path)), splitext(basename(path))[0]
     if dname in ('devel', 'fix', 'gui', 'modtools'):
@@ -14,16 +15,6 @@ def expected_cmd(path):
     return fname
 
 
-def check_ls(fname, line):
-    """Check length & existence of leading comment for "ls" builtin command."""
-    line = line.strip()
-    comment = '--' if fname.endswith('.lua') else '#'
-    if '[====[' in line or not line.startswith(comment):
-        print_error('missing leading comment (requred for `ls`)', fname)
-        return 1
-    return 0
-
-
 def print_error(message, filename, line=None):
     if not isinstance(line, int):
         line = 1
@@ -32,48 +23,42 @@ def print_error(message, filename, line=None):
         print('::error file=%s,line=%i::%s' % (filename, line, message))
 
 
+def check_ls(docfile, lines):
+    """Check length & existence of first sentence for "ls" builtin command."""
+    # TODO
+    return 0
+
+
 def check_file(fname):
-    errors, doclines = 0, []
-    tok1, tok2 = ('=begin', '=end') if fname.endswith('.rb') else \
-        ('[====[', ']====]')
-    doc_start_line = None
-    with open(fname, errors='ignore') as f:
+    errors, doc_start_line = 0, None
+    docfile = join(DOCS_PATH, get_cmd(fname)+'.rst')
+    if not exists(docfile):
+        print_error('missing documentation file: {!r}'.format(docfile), fname)
+        return 1
+    with open(docfile, errors='ignore') as f:
         lines = f.readlines()
         if not lines:
-            print_error('empty file', fname)
+            print_error('empty documentation file', docfile)
             return 1
-        errors += check_ls(fname, lines[0])
         for i, l in enumerate(lines):
-            if doclines or l.strip().endswith(tok1):
-                if not doclines:
-                    doc_start_line = i + 1
-                doclines.append(l.rstrip())
-            if l.startswith(tok2):
-                break
-        else:
-            if doclines:
-                print_error('docs start but do not end', fname, doc_start_line)
-            else:
-                print_error('no documentation found', fname)
-            return 1
-
-    if not doclines:
-        print_error('missing or malformed documentation', fname)
-        return 1
+            l = l.strip()
+            if l and not doc_start_line and doc_start_line != 0:
+                doc_start_line = i
+            doc_end_line = i
+            lines[i] = l
 
-    title, underline = [d for d in doclines
-                        if d and '=begin' not in d and '[====[' not in d][:2]
-    title_line = doc_start_line + doclines.index(title)
+    errors += check_ls(docfile, lines)
+    title, underline = lines[doc_start_line:doc_start_line+2]
     expected_underline = '=' * len(title)
     if underline != expected_underline:
         print_error('title/underline mismatch: expected {!r}, got {!r}'.format(
                 expected_underline, underline),
-            fname, title_line + 1)
+            docfile, doc_start_line+1)
         errors += 1
-    if title != expected_cmd(fname):
+    if title != get_cmd(fname):
         print_error('expected script title {!r}, got {!r}'.format(
-                expected_cmd(fname), title),
-            fname, title_line)
+                get_cmd(fname), title),
+            docfile, doc_start_line)
         errors += 1
     return errors
 

From 2f50d161d932d9aa9c8bc8c017869e8eebd8ee1a Mon Sep 17 00:00:00 2001
From: DFHack-Urist via GitHub Actions
 <63161697+DFHack-Urist@users.noreply.github.com>
Date: Wed, 20 Jul 2022 23:31:20 +0000
Subject: [PATCH 262/854] Auto-update submodules

library/xml: master
scripts: master
---
 library/xml | 2 +-
 scripts     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/library/xml b/library/xml
index 1595cc1fe..a04727cc4 160000
--- a/library/xml
+++ b/library/xml
@@ -1 +1 @@
-Subproject commit 1595cc1fe1f4662eebffdb4a77355491aafacea6
+Subproject commit a04727cc4ec350399ce4d2ded4425f33c50cea50
diff --git a/scripts b/scripts
index bd21e9664..6f5c7edc4 160000
--- a/scripts
+++ b/scripts
@@ -1 +1 @@
-Subproject commit bd21e9664abf9963d5cf5f0f86222dd0dadda2c5
+Subproject commit 6f5c7edc49beec38c41ac8c3f0b5bded519ab5ce

From 738611383b3a465ee420742e0d44faed1fbc9ae0 Mon Sep 17 00:00:00 2001
From: DFHack-Urist via GitHub Actions
 <63161697+DFHack-Urist@users.noreply.github.com>
Date: Wed, 20 Jul 2022 23:33:08 +0000
Subject: [PATCH 263/854] Auto-update submodules

scripts: master
---
 scripts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts b/scripts
index 6f5c7edc4..dbdfacd33 160000
--- a/scripts
+++ b/scripts
@@ -1 +1 @@
-Subproject commit 6f5c7edc49beec38c41ac8c3f0b5bded519ab5ce
+Subproject commit dbdfacd33a213f081fbb1d6c85c11424ce3df234

From 6e89f89b3f1600156c5638d9cc9755b11ec42eb5 Mon Sep 17 00:00:00 2001
From: DFHack-Urist via GitHub Actions
 <63161697+DFHack-Urist@users.noreply.github.com>
Date: Wed, 20 Jul 2022 23:38:25 +0000
Subject: [PATCH 264/854] Auto-update submodules

scripts: master
---
 scripts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts b/scripts
index dbdfacd33..78b7554a1 160000
--- a/scripts
+++ b/scripts
@@ -1 +1 @@
-Subproject commit dbdfacd33a213f081fbb1d6c85c11424ce3df234
+Subproject commit 78b7554a17d7d385986b2f801d5791485e740afb

From 68b8837a8d8b37767a604d136b622ac51733aa09 Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Fri, 22 Jul 2022 00:30:36 -0400
Subject: [PATCH 265/854] Replace docs/build*.sh with more flexible build.py

Notable changes:
- can build any combination of output formats in series
- `-E` is no longer passed by default to aid in development, but can be passed
  manually
---
 docs/build-pdf.sh |  4 +--
 docs/build.py     | 90 +++++++++++++++++++++++++++++++++++++++++++++++
 docs/build.sh     |  5 +--
 3 files changed, 92 insertions(+), 7 deletions(-)
 create mode 100755 docs/build.py

diff --git a/docs/build-pdf.sh b/docs/build-pdf.sh
index 735ef2faa..a7527cb34 100755
--- a/docs/build-pdf.sh
+++ b/docs/build-pdf.sh
@@ -9,6 +9,4 @@
 # https://www.sphinx-doc.org/en/master/man/sphinx-build.html
 
 cd $(dirname "$0")
-cd ..
-
-"${SPHINX:-sphinx-build}" -M latexpdf -d build/docs/pdf . docs/pdf -w build/docs/pdf/_sphinx-warnings.txt -j "${JOBS:-auto}" "$@"
+python3 build.py pdf "$@"
diff --git a/docs/build.py b/docs/build.py
new file mode 100755
index 000000000..2a42d0968
--- /dev/null
+++ b/docs/build.py
@@ -0,0 +1,90 @@
+#!/usr/bin/env python3
+
+# for help, run: python3 build.py --help
+
+import argparse
+import os
+import subprocess
+import sys
+
+class SphinxOutputFormat:
+    def __init__(self, name, pre_args):
+        self.name = str(name)
+        self.pre_args = tuple(pre_args)
+
+    @property
+    def args(self):
+        output_dir = os.path.join('docs', self.name)
+        artifacts_dir = os.path.join('build', 'docs', self.name)  # for artifacts not part of the final documentation
+        return [
+            *self.pre_args,
+            '.',  # source dir
+            output_dir,
+            '-d', artifacts_dir,
+            '-w', os.path.join(artifacts_dir, 'sphinx-warnings.txt'),
+        ]
+
+OUTPUT_FORMATS = {
+    'html': SphinxOutputFormat('html', pre_args=['-b', 'html']),
+    'text': SphinxOutputFormat('text', pre_args=['-b', 'text']),
+    'pdf': SphinxOutputFormat('pdf', pre_args=['-M', 'latexpdf']),
+}
+
+def _parse_known_args(parser, source_args):
+    # pass along any arguments after '--'
+    ignored_args = []
+    if '--' in source_args:
+        source_args, ignored_args = source_args[:source_args.index('--')], source_args[source_args.index('--')+1:]
+    args, forward_args = parser.parse_known_args(source_args)
+    forward_args += ignored_args
+    return args, forward_args
+
+def parse_args(source_args):
+    def output_format(s):
+        if s in OUTPUT_FORMATS:
+            return s
+        raise ValueError
+
+    parser = argparse.ArgumentParser(usage='%(prog)s [{} ...] [options] [--] [sphinx_options]'.format('|'.join(OUTPUT_FORMATS.keys())), description='''
+    DFHack wrapper around sphinx-build.
+
+    Any unrecognized options are passed directly to sphinx-build, as well as any
+    options following a '--' argument, if specified.
+    ''')
+    parser.add_argument('format', nargs='*', type=output_format, action='append',
+        help='Documentation format(s) to build - choose from {}'.format(', '.join(OUTPUT_FORMATS.keys())))
+    parser.add_argument('-E', '--clean', action='store_true',
+        help='Re-read all input files')
+    parser.add_argument('--sphinx', type=str, default=os.environ.get('SPHINX', 'sphinx-build'),
+        help='Sphinx executable to run [environment variable: SPHINX; default: "sphinx-build"]')
+    parser.add_argument('-j', '--jobs', type=str, default=os.environ.get('JOBS', 'auto'),
+        help='Number of Sphinx threads to run [environment variable: JOBS; default: "auto"]')
+    parser.add_argument('--debug', action='store_true',
+        help='Log commands that are run, etc.')
+    args, forward_args = _parse_known_args(parser, source_args)
+
+    # work around weirdness with list args
+    args.format = args.format[0]
+    if not args.format:
+        args.format = ['html']
+
+    return args, forward_args
+
+if __name__ == '__main__':
+    os.chdir(os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
+    if not os.path.isfile('conf.py'):
+        print('Could not find conf.py', file=sys.stderr)
+        exit(1)
+
+    args, forward_args = parse_args(sys.argv[1:])
+    for format_name in args.format:
+        command = [args.sphinx] + OUTPUT_FORMATS[format_name].args + ['-j', args.jobs]
+        if args.clean:
+            command += ['-E']
+        command += forward_args
+
+        if args.debug:
+            print('Building:', format_name)
+            print('Running:', command)
+        subprocess.call(command)
+        print('')
diff --git a/docs/build.sh b/docs/build.sh
index 28182d9c0..7a6bd0b33 100755
--- a/docs/build.sh
+++ b/docs/build.sh
@@ -9,7 +9,4 @@
 # https://www.sphinx-doc.org/en/master/man/sphinx-build.html
 
 cd $(dirname "$0")
-cd ..
-
-"${SPHINX:-sphinx-build}" -E -b html -d build/docs/html . docs/html -w build/docs/html/_sphinx-warnings.txt -j "${JOBS:-auto}" "$@"
-"${SPHINX:-sphinx-build}" -E -b text -d build/docs/text . docs/text -w build/docs/text/_sphinx-warnings.txt -j "${JOBS:-auto}" "$@"
+python3 build.py html text "$@"

From 4b0b0e02f87956e42ed19de72b93c00853196b0a Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Fri, 22 Jul 2022 00:46:44 -0400
Subject: [PATCH 266/854] Update Documentation.rst for new workflow and output
 formats

---
 docs/Documentation.rst | 48 ++++++++++++++++++++++++++++--------------
 1 file changed, 32 insertions(+), 16 deletions(-)

diff --git a/docs/Documentation.rst b/docs/Documentation.rst
index acfffdbbb..c035a0366 100644
--- a/docs/Documentation.rst
+++ b/docs/Documentation.rst
@@ -261,30 +261,45 @@ ways to do this:
   it to add the flag. You can also run ``cmake`` on the command line, similar to
   other platforms.
 
-The generated documentation will be stored in ``docs/html`` in the root DFHack
-folder, and will be installed to ``hack/docs`` when you next install DFHack in a
-DF folder.
+By default, both HTML and text docs are built by CMake. The generated
+documentation is stored in ``docs/html`` and ``docs/text`` (respectively) in the
+root DFHack folder, and will be installed to ``hack/docs`` when you install
+DFHack.
 
 Running Sphinx manually
 -----------------------
 
 You can also build the documentation without running CMake - this is faster if
-you only want to rebuild the documentation regardless of any code changes. There
-is a ``docs/build.sh`` script provided for Linux and macOS that will run
-essentially the same command that CMake runs when building the docs - see the
-script for additional options.
+you only want to rebuild the documentation regardless of any code changes. The
+``docs/build.py`` script will build the documentation in any specified formats
+(HTML only by default) using essentially the same command that CMake runs when
+building the docs. Run the script with ``--help`` to see additional options.
 
-To build the documentation with default options, run the following command from
-the root DFHack folder::
+Examples:
+
+* ``docs/build.py``
+    Build just the HTML docs
+
+* ``docs/build.py html text``
+    Build both the HTML and text docs
+
+* ``docs/build.py --clean``
+    Build HTML and force a clean build (all source files are re-read)
+
+The resulting documentation will be stored in ``docs/html`` and/or ``docs/text``.
+
+Alternatively, you can run Sphinx manually with::
 
     sphinx-build . docs/html
 
-The resulting documentation will be stored in ``docs/html`` (you can specify
-a different path when running ``sphinx-build`` manually, but be warned that
-Sphinx may overwrite existing files in this folder).
+or, to build plain-text output::
+
+    sphinx-build -b text . docs/text
 
 Sphinx has many options to enable clean builds, parallel builds, logging, and
-more - run ``sphinx-build --help`` for details.
+more - run ``sphinx-build --help`` for details. If you specify a different
+output path, be warned that Sphinx may overwrite existing files in the output
+folder.
 
 Building a PDF version
 ----------------------
@@ -295,10 +310,11 @@ want to build a PDF version locally, you will need ``pdflatex``, which is part
 of a TeX distribution. The following command will then build a PDF, located in
 ``docs/pdf/latex/DFHack.pdf``, with default options::
 
-  sphinx-build -M latexpdf . docs/pdf
+  docs/build.py pdf
 
-There is a ``docs/build-pdf.sh`` script provided for Linux and macOS that runs
-this command for convenience - see the script for additional options.
+Alternatively, you can run Sphinx manually with::
+
+  sphinx-build -M latexpdf . docs/pdf
 
 .. _build-changelog:
 

From 5521a5a45d29c60bd39ee7231dfebc93946d9932 Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Fri, 22 Jul 2022 00:47:33 -0400
Subject: [PATCH 267/854] Remove old build*.sh scripts

---
 docs/build-pdf.sh | 12 ------------
 docs/build.sh     | 12 ------------
 2 files changed, 24 deletions(-)
 delete mode 100755 docs/build-pdf.sh
 delete mode 100755 docs/build.sh

diff --git a/docs/build-pdf.sh b/docs/build-pdf.sh
deleted file mode 100755
index a7527cb34..000000000
--- a/docs/build-pdf.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/sh
-
-# usage:
-#   ./build-pdf.sh
-#   SPHINX=/path/to/sphinx-build ./build-pdf.sh
-#   JOBS=3 ./build-pdf.sh ...
-# all command-line arguments are passed directly to sphinx-build - run
-# ``sphinx-build --help`` for a list, or see
-# https://www.sphinx-doc.org/en/master/man/sphinx-build.html
-
-cd $(dirname "$0")
-python3 build.py pdf "$@"
diff --git a/docs/build.sh b/docs/build.sh
deleted file mode 100755
index 7a6bd0b33..000000000
--- a/docs/build.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/sh
-
-# usage:
-#   ./build.sh
-#   SPHINX=/path/to/sphinx-build ./build.sh
-#   JOBS=3 ./build.sh ...
-# all command-line arguments are passed directly to sphinx-build - run
-# ``sphinx-build --help`` for a list, or see
-# https://www.sphinx-doc.org/en/master/man/sphinx-build.html
-
-cd $(dirname "$0")
-python3 build.py html text "$@"

From 2ce7518562b31116feb9bd0cb925838e07f25d40 Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Thu, 21 Jul 2022 22:33:43 -0700
Subject: [PATCH 268/854] read plugin command docs from single plugin file

---
 library/LuaApi.cpp     |  65 ++++++----
 library/lua/helpdb.lua | 273 +++++++++++++++++++++++------------------
 2 files changed, 196 insertions(+), 142 deletions(-)

diff --git a/library/LuaApi.cpp b/library/LuaApi.cpp
index 770aab870..4ee1a4d1c 100644
--- a/library/LuaApi.cpp
+++ b/library/LuaApi.cpp
@@ -3109,41 +3109,58 @@ static int internal_listCommands(lua_State *L)
     }
     return 1;
 }
-static int internal_getCommandHelp(lua_State *L)
+
+static const PluginCommand * getPluginCommand(const char * command)
 {
     auto plugins = Core::getInstance().getPluginManager();
-
-    const char *name = luaL_checkstring(L, 1);
-
-    auto plugin = plugins->getPluginByCommand(name);
+    auto plugin = plugins->getPluginByCommand(command);
     if (!plugin)
     {
-        lua_pushnil(L);
-        return 1;
+        return NULL;
     }
 
     size_t num_commands = plugin->size();
     for (size_t i = 0; i < num_commands; ++i)
     {
-        if ((*plugin)[i].name == name)
-        {
-            const auto &pc = (*plugin)[i];
-            std::string help = pc.description;
-            if (help.size() && help[help.size()-1] != '.')
-            {
-                help += ".";
-            }
-            if (pc.usage.size())
-            {
-                help += "\n" + pc.usage;
-            }
-            lua_pushstring(L, help.c_str());
-            return 1;
-        }
+        if ((*plugin)[i].name == command)
+            return &(*plugin)[i];
     }
 
     // not found (somehow)
-    lua_pushnil(L);
+    return NULL;
+}
+
+static int internal_getCommandHelp(lua_State *L)
+{
+    const PluginCommand *pc = getPluginCommand(luaL_checkstring(L, 1));
+    if (!pc)
+    {
+        lua_pushnil(L);
+        return 1;
+    }
+
+    std::string help = pc->description;
+    if (help.size() && help[help.size()-1] != '.')
+        help += ".";
+    if (pc->usage.size())
+        help += "\n" + pc->usage;
+    lua_pushstring(L, help.c_str());
+    return 1;
+}
+
+static int internal_getCommandDescription(lua_State *L)
+{
+    const PluginCommand *pc = getPluginCommand(luaL_checkstring(L, 1));
+    if (!pc)
+    {
+        lua_pushnil(L);
+        return 1;
+    }
+
+    std::string help = pc->description;
+    if (help.size() && help[help.size()-1] != '.')
+        help += ".";
+    lua_pushstring(L, help.c_str());
     return 1;
 }
 
@@ -3218,6 +3235,7 @@ static const luaL_Reg dfhack_internal_funcs[] = {
     { "getAddress", internal_getAddress },
     { "setAddress", internal_setAddress },
     { "getVTable", internal_getVTable },
+
     { "adjustOffset", internal_adjustOffset },
     { "getMemRanges", internal_getMemRanges },
     { "patchMemory", internal_patchMemory },
@@ -3236,6 +3254,7 @@ static const luaL_Reg dfhack_internal_funcs[] = {
     { "listPlugins", internal_listPlugins },
     { "listCommands", internal_listCommands },
     { "getCommandHelp", internal_getCommandHelp },
+    { "getCommandDescription", internal_getCommandDescription },
     { "isPluginEnableable", internal_isPluginEnableable },
     { "threadid", internal_threadid },
     { "md5File", internal_md5file },
diff --git a/library/lua/helpdb.lua b/library/lua/helpdb.lua
index e35d2f125..647d08996 100644
--- a/library/lua/helpdb.lua
+++ b/library/lua/helpdb.lua
@@ -32,58 +32,75 @@ local ENTRY_TYPES = {
 }
 
 local HELP_SOURCES = {
-    STUB='stub',
-    RENDERED='rendered',
-    PLUGIN='plugin',
-    SCRIPT='script',
+    RENDERED='rendered', -- from the installed, rendered help text
+    PLUGIN='plugin',     -- from the plugin source code
+    SCRIPT='script',     -- from the script source code
+    STUB='stub',         -- from a generated stub
 }
 
--- builtins
+-- builtin command names, with aliases mapped to their canonical form
 local BUILTINS = {
-    'alias',
-    'clear',
-    'cls',
-    'devel/dump-rpc',
-    'die',
-    'dir',
-    'disable',
-    'enable',
-    'fpause',
-    'help',
-    'hide',
-    'keybinding',
-    'kill-lua',
-    'load',
-    'ls',
-    'man',
-    'plug',
-    'reload',
-    'script',
-    'sc-script',
-    'show',
-    'tags',
-    'type',
-    'unload',
+    alias=true,
+    clear='cls',
+    cls=true,
+    ['devel/dump-rpc']=true,
+    die=true,
+    dir='ls',
+    disable=true,
+    enable=true,
+    fpause=true,
+    help=true,
+    hide=true,
+    keybinding=true,
+    ['kill-lua']=true,
+    ['load']=true,
+    ls=true,
+    man='help',
+    plug=true,
+    reload=true,
+    script=true,
+    ['sc-script']=true,
+    show=true,
+    tags=true,
+    ['type']=true,
+    unload=true,
 }
 
+---------------------------------------------------------------------------
+-- data structures
+---------------------------------------------------------------------------
+
+-- help text database, keys are a subset of the entry database
 -- entry name -> {
---   entry_types (set of ENTRY_TYPES),
+--   help_source (element of HELP_SOURCES),
 --   short_help (string),
 --   long_help (string),
 --   tags (set),
---   help_source (element of HELP_SOURCES),
 --   source_timestamp (mtime, 0 for non-files),
 --   source_path (string, nil for non-files)
 -- }
+textdb = textdb or {}
+
+-- entry database, points to text in textdb
+-- entry name -> {
+--   entry_types (set of ENTRY_TYPES),
+--   short_help (string, if not nil then overrides short_help in text_entry),
+--   text_entry (string)
+-- }
 --
 -- entry_types is a set because plugin commands can also be the plugin names.
-db = db or {}
+entrydb = entrydb or {}
+
 
 -- tag name -> list of entry names
 -- Tags defined in the TAG_DEFINITIONS file that have no associated db entries
 -- will have an empty list.
 tag_index = tag_index or {}
 
+---------------------------------------------------------------------------
+-- data ingestion
+---------------------------------------------------------------------------
+
 local function get_rendered_path(entry_name)
     return RENDERED_PATH .. entry_name .. '.txt'
 end
@@ -98,18 +115,16 @@ local DEFAULT_HELP_TEMPLATE = [[
 
 No help available.
 ]]
-local function make_default_entry(entry_name, entry_types, source,
-                                  source_timestamp, source_path)
+local function make_default_entry(entry_name, help_source, kwargs)
     local default_long_help = DEFAULT_HELP_TEMPLATE:format(
                                             entry_name, ('*'):rep(#entry_name))
     return {
-        entry_types=entry_types,
+        help_source=help_source,
         short_help='No help available.',
         long_help=default_long_help,
         tags={},
-        help_source=source,
-        source_timestamp=source_timestamp or 0,
-        source_path=source_path}
+        source_timestamp=kwargs.source_timestamp or 0,
+        source_path=kwargs.source_path}
 end
 
 -- updates the short_text, the long_text, and the tags in the given entry based
@@ -129,7 +144,8 @@ local function update_entry(entry, iterator, opts)
     local lines = {}
     local first_line_is_short_help = opts.first_line_is_short_help
     local begin_marker_found,header_found = not opts.begin_marker,opts.no_header
-    local tags_found, short_help_found, in_short_help = false, false, false
+    local tags_found, short_help_found = false, opts.skip_short_help
+    local in_short_help = false
     for line in iterator do
         if not short_help_found and first_line_is_short_help then
             line = line:trim()
@@ -193,31 +209,30 @@ local function update_entry(entry, iterator, opts)
 end
 
 -- create db entry based on parsing sphinx-rendered help text
-local function make_rendered_entry(old_entry, entry_name, entry_types)
-    local rendered_path = get_rendered_path(entry_name)
-    local source_timestamp = dfhack.filesystem.mtime(rendered_path)
-    if old_entry and old_entry.source == HELP_SOURCES.RENDERED and
+local function make_rendered_entry(old_entry, entry_name, kwargs)
+    local source_path = get_rendered_path(entry_name)
+    local source_timestamp = dfhack.filesystem.mtime(source_path)
+    if old_entry and old_entry.help_source == HELP_SOURCES.RENDERED and
             old_entry.source_timestamp >= source_timestamp then
         -- we already have the latest info
         return old_entry
     end
-    local entry = make_default_entry(entry_name, entry_types,
-                HELP_SOURCES.RENDERED, source_timestamp, rendered_path)
-    update_entry(entry, io.lines(rendered_path))
+    kwargs.source_path, kwargs.source_timestamp = source_path, source_timestamp
+    local entry = make_default_entry(entry_name, HELP_SOURCES.RENDERED, kwargs)
+    update_entry(entry, io.lines(source_path))
     return entry
 end
 
 -- create db entry based on the help text in the plugin source (used by
 -- out-of-tree plugins)
-local function make_plugin_entry(old_entry, entry_name, entry_types)
+local function make_plugin_entry(old_entry, entry_name, kwargs)
     if old_entry and old_entry.source == HELP_SOURCES.PLUGIN then
         -- we can't tell when a plugin is reloaded, so we can either choose to
         -- always refresh or never refresh. let's go with never for now for
         -- performance.
         return old_entry
     end
-    local entry = make_default_entry(entry_name, entry_types,
-                                     HELP_SOURCES.PLUGIN)
+    local entry = make_default_entry(entry_name, HELP_SOURCES.PLUGIN, kwargs)
     local long_help = dfhack.internal.getCommandHelp(entry_name)
     if long_help and #long_help:trim() > 0 then
         update_entry(entry, long_help:trim():gmatch('[^\n]*'), {no_header=true})
@@ -227,19 +242,22 @@ end
 
 -- create db entry based on the help text in the script source (used by
 -- out-of-tree scripts)
-local function make_script_entry(old_entry, entry_name, script_source_path)
-    local source_timestamp = dfhack.filesystem.mtime(script_source_path)
+local function make_script_entry(old_entry, entry_name, kwargs)
+    local source_path = kwargs.source_path
+    local source_timestamp = dfhack.filesystem.mtime(source_path)
     if old_entry and old_entry.source == HELP_SOURCES.SCRIPT and
-            old_entry.script_source_path == script_source_path and
+            old_entry.source_path == source_path and
             old_entry.source_timestamp >= source_timestamp then
         -- we already have the latest info
         return old_entry
     end
-    local entry = make_default_entry(entry_name, {[ENTRY_TYPES.COMMAND]=true},
-                    HELP_SOURCES.SCRIPT, source_timestamp, script_source_path)
-    local ok, lines = pcall(io.lines, script_source_path)
-    if not ok then return entry end
-    local is_rb = script_source_path:endswith('.rb')
+    kwargs.source_timestamp, kwargs.entry_type = source_timestamp
+    local entry = make_default_entry(entry_name, HELP_SOURCES.SCRIPT, kwargs)
+    local ok, lines = pcall(io.lines, source_path)
+    if not ok then
+        return entry
+    end
+    local is_rb = source_path:endswith('.rb')
     update_entry(entry, lines,
             {begin_marker=(is_rb and SCRIPT_DOC_BEGIN_RUBY or SCRIPT_DOC_BEGIN),
              end_marker=(is_rb and SCRIPT_DOC_BEGIN_RUBY or SCRIPT_DOC_END),
@@ -247,78 +265,81 @@ local function make_script_entry(old_entry, entry_name, script_source_path)
     return entry
 end
 
--- updates the db (and associated tag index) with a new entry if the entry_name
--- doesn't already exist in the db.
-local function update_db(old_db, db, source, entry_name, kwargs)
-    if db[entry_name] then
+-- updates the dbs (and associated tag index) with a new entry if the entry_name
+-- doesn't already exist in the dbs.
+local function update_db(old_db, entry_name, text_entry, help_source, kwargs)
+    if entrydb[entry_name] then
         -- already in db (e.g. from a higher-priority script dir); skip
         return
     end
-    local entry, old_entry = nil, old_db[entry_name]
-    if source == HELP_SOURCES.RENDERED then
-        entry = make_rendered_entry(old_entry, entry_name, kwargs.entry_types)
-    elseif source == HELP_SOURCES.PLUGIN then
-        entry = make_plugin_entry(old_entry, entry_name, kwargs.entry_types)
-    elseif source == HELP_SOURCES.SCRIPT then
-        entry = make_script_entry(old_entry, entry_name, kwargs.script_source)
-    elseif source == HELP_SOURCES.STUB then
-        entry = make_default_entry(entry_name, kwargs.entry_types,
-                                   HELP_SOURCES.STUB)
-    else
-        error('unhandled help source: ' .. source)
+    entrydb[entry_name] = {
+        entry_types=kwargs.entry_types,
+        short_help=kwargs.short_help,
+        text_entry=text_entry
+    }
+    if entry_name ~= text_entry then
+        return
     end
-    db[entry_name] = entry
-    for tag in pairs(entry.tags) do
-        -- ignore unknown tags
-        if tag_index[tag] then
-            table.insert(tag_index[tag], entry_name)
-        end
+
+    local text_entry, old_entry = nil, old_db[entry_name]
+    if help_source == HELP_SOURCES.RENDERED then
+        text_entry = make_rendered_entry(old_entry, entry_name, kwargs)
+    elseif help_source == HELP_SOURCES.PLUGIN then
+        text_entry = make_plugin_entry(old_entry, entry_name, kwargs)
+    elseif help_source == HELP_SOURCES.SCRIPT then
+        text_entry = make_script_entry(old_entry, entry_name, kwargs)
+    elseif help_source == HELP_SOURCES.STUB then
+        text_entry = make_default_entry(entry_name, HELP_SOURCES.STUB, kwargs)
+    else
+        error('unhandled help source: ' .. help_source)
     end
+    textdb[entry_name] = text_entry
 end
 
 -- add the builtin commands to the db
-local function scan_builtins(old_db, db)
+local function scan_builtins(old_db)
     local entry_types = {[ENTRY_TYPES.BUILTIN]=true, [ENTRY_TYPES.COMMAND]=true}
-    for _,builtin in ipairs(BUILTINS) do
-        update_db(old_db, db,
-                    has_rendered_help(builtin) and
-                        HELP_SOURCES.RENDERED or HELP_SOURCES.STUB,
-                    builtin,
-                    {entry_types=entry_types})
+    for builtin,canonical in pairs(BUILTINS) do
+        if canonical == true then canonical = builtin end
+        update_db(old_db, builtin, canonical,
+            has_rendered_help(canonical) and
+                HELP_SOURCES.RENDERED or HELP_SOURCES.STUB,
+            {entry_types=entry_types})
     end
 end
 
--- scan for plugins and plugin-provided commands and add their help to the db
-local function scan_plugins(old_db, db)
+-- scan for enableable plugins and plugin-provided commands and add their help
+-- to the db
+local function scan_plugins(old_db)
     local plugin_names = dfhack.internal.listPlugins()
     for _,plugin in ipairs(plugin_names) do
         local commands = dfhack.internal.listCommands(plugin)
-        local includes_plugin = false
+        local includes_plugin, has_commands = false, false
         for _,command in ipairs(commands) do
-            local entry_types = {[ENTRY_TYPES.COMMAND]=true}
+            local kwargs = {entry_types={[ENTRY_TYPES.COMMAND]=true}}
             if command == plugin then
-                entry_types[ENTRY_TYPES.PLUGIN]=true
+                kwargs.entry_types[ENTRY_TYPES.PLUGIN]=true
                 includes_plugin = true
             end
-            update_db(old_db, db,
-                      has_rendered_help(command) and
+            kwargs.short_help = dfhack.internal.getCommandDescription(command)
+            update_db(old_db, command, plugin,
+                      has_rendered_help(plugin) and
                             HELP_SOURCES.RENDERED or HELP_SOURCES.PLUGIN,
-                      command, {entry_types=entry_types})
+                      kwargs)
+            has_commands = true
         end
-        if not includes_plugin and
-                dfhack.internal.isPluginEnableable(plugin) then
-            update_db(old_db, db,
+        if not includes_plugin and (has_commands or
+                dfhack.internal.isPluginEnableable(plugin)) then
+            update_db(old_db, plugin, plugin,
                       has_rendered_help(plugin) and
                             HELP_SOURCES.RENDERED or HELP_SOURCES.STUB,
-                      plugin, {entry_types={[ENTRY_TYPES.PLUGIN]=true}})
-            goto continue
+                      {entry_types={[ENTRY_TYPES.PLUGIN]=true}})
         end
-        ::continue::
     end
 end
 
 -- scan for scripts and add their help to the db
-local function scan_scripts(old_db, db)
+local function scan_scripts(old_db)
     local entry_types = {[ENTRY_TYPES.COMMAND]=true}
     for _,script_path in ipairs(dfhack.internal.getScriptPaths()) do
         local files = dfhack.filesystem.listdir_recursive(
@@ -333,12 +354,11 @@ local function scan_scripts(old_db, db)
             end
             local dot_index = f.path:find('%.[^.]*$')
             local entry_name = f.path:sub(1, dot_index - 1)
-            local script_source = script_path .. '/' .. f.path
-            update_db(old_db, db,
+            local source_path = script_path .. '/' .. f.path
+            update_db(old_db, entry_name, entry_name,
                       has_rendered_help(entry_name) and
                             HELP_SOURCES.RENDERED or HELP_SOURCES.SCRIPT,
-                      entry_name,
-                      {entry_types=entry_types, script_source=script_source})
+                      {entry_types=entry_types, source_path=source_path})
             ::continue::
         end
         ::skip_path::
@@ -370,6 +390,17 @@ local function initialize_tags()
     end
 end
 
+local function index_tags()
+    for entry_name,entry in pairs(entrydb) do
+        for tag in pairs(textdb[entry.text_entry].tags) do
+            -- ignore unknown tags
+            if tag_index[tag] then
+                table.insert(tag_index[tag], entry_name)
+            end
+        end
+    end
+end
+
 -- ensures the db is up to date by scanning all help sources. does not do
 -- anything if it has already been run within the last 60 seconds.
 last_refresh_ms = last_refresh_ms or 0
@@ -378,13 +409,14 @@ local function ensure_db()
     if now_ms - last_refresh_ms < 60000 then return end
     last_refresh_ms = now_ms
 
-    local old_db = db
-    db, tag_index = {}, {}
+    local old_db = textdb
+    textdb, entrydb, tag_index = {}, {}, {}
 
     initialize_tags()
-    scan_builtins(old_db, db)
-    scan_plugins(old_db, db)
-    scan_scripts(old_db, db)
+    scan_builtins(old_db)
+    scan_plugins(old_db)
+    scan_scripts(old_db)
+    index_tags()
 end
 
 ---------------------------------------------------------------------------
@@ -415,15 +447,16 @@ end
 
 -- returns whether the given string (or list of strings) is an entry in the db
 function is_entry(str)
-    return has_keys(str, db)
+    return has_keys(str, entrydb)
 end
 
 local function get_db_property(entry_name, property)
     ensure_db()
-    if not db[entry_name] then
+    if not entrydb[entry_name] then
         error(('helpdb entry not found: "%s"'):format(entry_name))
     end
-    return db[entry_name][property]
+    return entrydb[entry_name][property] or
+            textdb[entrydb[entry_name].text_entry][property]
 end
 
 -- returns the ~54 char summary blurb associated with the entry
@@ -504,11 +537,11 @@ local function sort_by_basename(a, b)
 end
 
 local function matches(entry_name, filter)
-    local db_entry = db[entry_name]
     if filter.tag then
         local matched = false
+        local tags = get_db_property(entry_name, 'tags')
         for _,tag in ipairs(filter.tag) do
-            if db_entry.tags[tag] then
+            if tags[tag] then
                 matched = true
                 break
             end
@@ -519,8 +552,9 @@ local function matches(entry_name, filter)
     end
     if filter.types then
         local matched = false
+        local etypes = get_db_property(entry_name, 'entry_types')
         for _,etype in ipairs(filter.types) do
-            if db_entry.entry_types[etype] then
+            if etypes[etype] then
                 matched = true
                 break
             end
@@ -577,7 +611,7 @@ function search_entries(include, exclude)
     include = normalize_filter(include)
     exclude = normalize_filter(exclude)
     local entries = {}
-    for entry in pairs(db) do
+    for entry in pairs(entrydb) do
         if (not include or matches(entry, include)) and
                 (not exclude or not matches(entry, exclude)) then
             table.insert(entries, entry)
@@ -595,7 +629,8 @@ end
 
 function is_builtin(command)
     ensure_db()
-    return db[command] and db[command].entry_types[ENTRY_TYPES.BUILTIN]
+    return entrydb[command] and
+            get_db_property(entry_name, 'entry_types')[ENTRY_TYPES.BUILTIN]
 end
 
 ---------------------------------------------------------------------------
@@ -605,7 +640,7 @@ end
 -- implements the 'help' builtin command
 function help(entry)
     ensure_db()
-    if not db[entry] then
+    if not entrydb[entry] then
         dfhack.printerr(('No help entry found for "%s"'):format(entry))
         return
     end

From 4b1696f783e46196bf0e5fbb5a2f71551305367a Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Thu, 21 Jul 2022 22:36:17 -0700
Subject: [PATCH 269/854] add '?' alias for help

---
 library/lua/helpdb.lua | 1 +
 1 file changed, 1 insertion(+)

diff --git a/library/lua/helpdb.lua b/library/lua/helpdb.lua
index 647d08996..c660a37dd 100644
--- a/library/lua/helpdb.lua
+++ b/library/lua/helpdb.lua
@@ -40,6 +40,7 @@ local HELP_SOURCES = {
 
 -- builtin command names, with aliases mapped to their canonical form
 local BUILTINS = {
+    ['?']='help',
     alias=true,
     clear='cls',
     cls=true,

From b3679bef25991fc141cef82db598d0c7af95600d Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Thu, 21 Jul 2022 23:21:56 -0700
Subject: [PATCH 270/854] enable index building and update builtin docs

---
 conf.py                          |  4 ++--
 docs/builtins/alias.rst          |  9 +++++----
 docs/builtins/clear.rst          |  7 -------
 docs/builtins/cls.rst            |  5 +++--
 docs/builtins/devel/dump-rpc.rst |  3 ++-
 docs/builtins/die.rst            |  3 ++-
 docs/builtins/dir.rst            |  7 -------
 docs/builtins/disable.rst        |  5 +++--
 docs/builtins/enable.rst         | 11 ++++++-----
 docs/builtins/fpause.rst         |  4 ++--
 docs/builtins/help.rst           |  4 +++-
 docs/builtins/hide.rst           |  3 ++-
 docs/builtins/keybinding.rst     |  9 +++++----
 docs/builtins/kill-lua.rst       |  5 +++--
 docs/builtins/load.rst           |  5 +++--
 docs/builtins/ls.rst             |  8 ++++----
 docs/builtins/man.rst            |  7 -------
 docs/builtins/plug.rst           |  3 ++-
 docs/builtins/reload.rst         |  5 +++--
 docs/builtins/sc-script.rst      |  6 ++++--
 docs/builtins/script.rst         |  7 ++++---
 docs/builtins/show.rst           |  9 +++++----
 docs/builtins/tags.rst           |  5 +++--
 docs/builtins/type.rst           |  7 ++++---
 docs/builtins/unload.rst         |  3 ++-
 25 files changed, 72 insertions(+), 72 deletions(-)
 delete mode 100644 docs/builtins/clear.rst
 delete mode 100644 docs/builtins/dir.rst
 delete mode 100644 docs/builtins/man.rst

diff --git a/conf.py b/conf.py
index 7cf4a3a32..0488a2afe 100644
--- a/conf.py
+++ b/conf.py
@@ -346,8 +346,8 @@ html_sidebars = {
 # If false, no module index is generated.
 html_domain_indices = False
 
-# If false, no index is generated.
-html_use_index = False
+# If false, no genindex.html is generated.
+html_use_index = True
 
 html_css_files = [
     'dfhack.css',
diff --git a/docs/builtins/alias.rst b/docs/builtins/alias.rst
index 325bb9dd7..59669fa39 100644
--- a/docs/builtins/alias.rst
+++ b/docs/builtins/alias.rst
@@ -4,10 +4,11 @@ alias
 Tags: system
 :dfhack-keybind:`alias`
 
-Configure helper aliases for other DFHack commands. Aliases are resolved
-immediately after built-in commands, which means that an alias cannot override
-a built-in command, but can override a command implemented by a plugin or
-script.
+:index:`Configure helper aliases for other DFHack commands.
+<alias; Configure helper aliases for other DFHack commands.>` Aliases are
+resolved immediately after built-in commands, which means that an alias cannot
+override a built-in command, but can override a command implemented by a plugin
+or script.
 
 Usage:
 
diff --git a/docs/builtins/clear.rst b/docs/builtins/clear.rst
deleted file mode 100644
index 44c4f679a..000000000
--- a/docs/builtins/clear.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-clear
-=====
-
-Tags: system
-:dfhack-keybind:`clear`
-
-Clear the terminal screen. This command is an alias for `cls`.
diff --git a/docs/builtins/cls.rst b/docs/builtins/cls.rst
index 0514353bd..bc22b54fc 100644
--- a/docs/builtins/cls.rst
+++ b/docs/builtins/cls.rst
@@ -4,5 +4,6 @@ cls
 Tags: system
 :dfhack-keybind:`cls`
 
-Clear the terminal screen. Can also be invoked as `clear`. Note that this
-command does not delete command history. It just clears the text on the screen.
+:index:`Clear the terminal screen. <cls; Clear the terminal screen.>` Can also
+be invoked as ``clear``. Note that this command does not delete command history.
+It just clears the text on the screen.
diff --git a/docs/builtins/devel/dump-rpc.rst b/docs/builtins/devel/dump-rpc.rst
index e6a710409..7babfb6a7 100644
--- a/docs/builtins/devel/dump-rpc.rst
+++ b/docs/builtins/devel/dump-rpc.rst
@@ -4,7 +4,8 @@ devel/dump-rpc
 Tags: system
 :dfhack-keybind:`devel/dump-rpc`
 
-Writes RPC endpoint information to the specified file.
+:index:`Writes RPC endpoint information to the specified file.
+<devel/dump-rpc; Writes RPC endpoint information to the specified file.>`
 
 Usage::
 
diff --git a/docs/builtins/die.rst b/docs/builtins/die.rst
index 7a7414b8c..8f20a825f 100644
--- a/docs/builtins/die.rst
+++ b/docs/builtins/die.rst
@@ -4,4 +4,5 @@ die
 Tags: system
 :dfhack-keybind:`die`
 
-Instantly exits DF without saving.
+:index:`Instantly exits DF without saving.
+<die; Instantly exits DF without saving.>`
diff --git a/docs/builtins/dir.rst b/docs/builtins/dir.rst
deleted file mode 100644
index 2eca9218c..000000000
--- a/docs/builtins/dir.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-dir
-===
-
-Tags: system
-:dfhack-keybind:`dir`
-
-List available DFHack commands. This is an alias of the `ls` command.
diff --git a/docs/builtins/disable.rst b/docs/builtins/disable.rst
index 413b8325f..3fb989328 100644
--- a/docs/builtins/disable.rst
+++ b/docs/builtins/disable.rst
@@ -4,8 +4,9 @@ disable
 Tags: system
 :dfhack-keybind:`disable`
 
-Deactivate a DFHack tool that has some persistent effect. See the `enable`
-command for more info.
+:index:`Deactivate a DFHack tool that has some persistent effect.
+<disable; Deactivate a DFHack tool that has some persistent effect.>` See the
+`enable` command for more info.
 
 Usage::
 
diff --git a/docs/builtins/enable.rst b/docs/builtins/enable.rst
index 78534a98c..3a4164485 100644
--- a/docs/builtins/enable.rst
+++ b/docs/builtins/enable.rst
@@ -4,11 +4,12 @@ enable
 Tags: system
 :dfhack-keybind:`enable`
 
-Activate a DFHack tool that has some persistent effect. Many plugins and scripts
-can be in a distinct enabled or disabled state. Some of them activate and
-deactivate automatically depending on the contents of the world raws. Others
-store their state in world data. However a number of them have to be enabled
-globally, and the init file is the right place to do it.
+:index:`Activate a DFHack tool that has some persistent effect.
+<enable; Activate a DFHack tool that has some persistent effect.>` Many plugins
+and scripts can be in a distinct enabled or disabled state. Some of them
+activate and deactivate automatically depending on the contents of the world
+raws. Others store their state in world data. However a number of them have to
+be enabled globally, and the init file is the right place to do it.
 
 Most such plugins or scripts support the built-in ``enable`` and `disable`
 commands. Calling them at any time without arguments prints a list of enabled
diff --git a/docs/builtins/fpause.rst b/docs/builtins/fpause.rst
index 60459848e..2e797129b 100644
--- a/docs/builtins/fpause.rst
+++ b/docs/builtins/fpause.rst
@@ -4,8 +4,8 @@ fpause
 Tags: system
 :dfhack-keybind:`fpause`
 
-Forces DF to pause. This is useful when your FPS drops below 1 and you lose
-control of the game.
+:index:`Forces DF to pause. <fpause; Forces DF to pause.>` This is useful when
+your FPS drops below 1 and you lose control of the game.
 
 Usage::
 
diff --git a/docs/builtins/help.rst b/docs/builtins/help.rst
index 49c010fec..9a1f3f1b8 100644
--- a/docs/builtins/help.rst
+++ b/docs/builtins/help.rst
@@ -4,7 +4,9 @@ help
 Tags: system
 :dfhack-keybind:`help`
 
-Display help about a command or plugin.
+:index:`Display help about a command or plugin.
+<help; Display help about a command or plugin.>` Can also be invoked as ``?``
+or ``man`` (short for "manual").
 
 Usage::
 
diff --git a/docs/builtins/hide.rst b/docs/builtins/hide.rst
index 6b391972f..51da0cc4f 100644
--- a/docs/builtins/hide.rst
+++ b/docs/builtins/hide.rst
@@ -4,7 +4,8 @@ hide
 Tags: system
 :dfhack-keybind:`hide`
 
-Hides the DFHack terminal window. You can show it again with the `show`
+:index:`Hides the DFHack terminal window.
+<hide; Hides the DFHack terminal window.>` You can show it again with the `show`
 command, though you'll need to use it from a `keybinding` set beforehand or the
 in-game `command-prompt`.
 
diff --git a/docs/builtins/keybinding.rst b/docs/builtins/keybinding.rst
index 72ceaaf71..f591ece34 100644
--- a/docs/builtins/keybinding.rst
+++ b/docs/builtins/keybinding.rst
@@ -4,12 +4,13 @@ keybinding
 Tags: system
 :dfhack-keybind:`keybinding`
 
-Create hotkeys that will run DFHack commands. Like any other command it can be
-used at any time from the console, but bindings are not remembered between runs
-of the game unless re-created in `dfhack.init`.
+:index:`Create hotkeys that will run DFHack commands.
+<keybinding; Create hotkeys that will run DFHack commands.>` Like any other
+command, it can be used at any time from the console, but bindings are not
+remembered between runs of the game unless re-created in `dfhack.init`.
 
 Hotkeys can be any combinations of Ctrl/Alt/Shift with A-Z, 0-9, F1-F12, or
-``\```.
+``\``` (the key below the ``Esc`` key.
 
 Usage:
 
diff --git a/docs/builtins/kill-lua.rst b/docs/builtins/kill-lua.rst
index 875376952..998277f96 100644
--- a/docs/builtins/kill-lua.rst
+++ b/docs/builtins/kill-lua.rst
@@ -4,8 +4,9 @@ kill-lua
 Tags: system
 :dfhack-keybind:`kill-lua`
 
-Gracefully stops any currently-running Lua scripts. Use this command to stop
-a misbehaving script that appears to be stuck.
+:index:`Gracefully stops any currently-running Lua scripts.
+<kill-lua; Gracefully stops any currently-running Lua scripts.>` Use this
+command to stop a misbehaving script that appears to be stuck.
 
 Usage::
 
diff --git a/docs/builtins/load.rst b/docs/builtins/load.rst
index cac760c2a..e84afe7d9 100644
--- a/docs/builtins/load.rst
+++ b/docs/builtins/load.rst
@@ -4,8 +4,9 @@ load
 Tags: system
 :dfhack-keybind:`load`
 
-Load and register a plugin library. Also see `unload` and `reload` for related
-actions.
+:index:`Load and register a plugin library.
+<load; Load and register a plugin library.>` Also see `unload` and `reload` for
+related actions.
 
 Usage::
 
diff --git a/docs/builtins/ls.rst b/docs/builtins/ls.rst
index 6875083f5..a6d2e637e 100644
--- a/docs/builtins/ls.rst
+++ b/docs/builtins/ls.rst
@@ -4,10 +4,10 @@ ls
 Tags: system
 :dfhack-keybind:`ls`
 
-List available DFHack commands. In order to group related commands, each command
-is associated with a list of tags. You can filter the listed commands by a tag
-or a substring of the command name. The `dir` command is an alias of this
-command.
+:index:`List available DFHack commands. <ls; List available DFHack commands.>`
+In order to group related commands, each command is associated with a list of
+tags. You can filter the listed commands by a tag or a substring of the
+command name. Can also be invoked as ``dir``.
 
 Usage:
 
diff --git a/docs/builtins/man.rst b/docs/builtins/man.rst
deleted file mode 100644
index 3b5b52515..000000000
--- a/docs/builtins/man.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-man
-===
-
-Tags: system
-:dfhack-keybind:`man`
-
-An alias for the `help` command.
diff --git a/docs/builtins/plug.rst b/docs/builtins/plug.rst
index 8f714b7cf..38b37aa84 100644
--- a/docs/builtins/plug.rst
+++ b/docs/builtins/plug.rst
@@ -4,7 +4,8 @@ plug
 Tags: system
 :dfhack-keybind:`plug`
 
-Lists available plugins and whether they are enabled.
+:index:`Lists available plugins and whether they are enabled.
+<plug; Lists available plugins and whether they are enabled.>`
 
 Usage:
 
diff --git a/docs/builtins/reload.rst b/docs/builtins/reload.rst
index d61e5c2fd..2fa817e3d 100644
--- a/docs/builtins/reload.rst
+++ b/docs/builtins/reload.rst
@@ -4,8 +4,9 @@ reload
 Tags: system
 :dfhack-keybind:`reload`
 
-Reload a loaded plugin. Developer use this command to reload a plugin that they
-are actively modifying. Also see `load` and `unload` for related actions.
+:index:`Reload a loaded plugin. <reload; Reload a loaded plugin.>` Developers
+use this command to reload a plugin that they are actively modifying. Also see
+`load` and `unload` for related actions.
 
 Usage::
 
diff --git a/docs/builtins/sc-script.rst b/docs/builtins/sc-script.rst
index 2c80e1130..eac65b463 100644
--- a/docs/builtins/sc-script.rst
+++ b/docs/builtins/sc-script.rst
@@ -4,8 +4,10 @@ sc-script
 Tags: system
 :dfhack-keybind:`sc-script`
 
-Runs commands when game state changes occur. This is similar to the static
-`init-files` but is slightly more flexible since it can be set dynamically.
+:index:`Run commands when game state changes occur.
+<sc-script; Run commands when game state changes occur.>` This is similar to
+the static `init-files` but is slightly more flexible since it can be set
+dynamically.
 
 Usage:
 
diff --git a/docs/builtins/script.rst b/docs/builtins/script.rst
index d69f3bbc7..17797ade7 100644
--- a/docs/builtins/script.rst
+++ b/docs/builtins/script.rst
@@ -4,9 +4,10 @@ script
 Tags: system
 :dfhack-keybind:`script`
 
-Executes a batch file of DFHack commands. It reads a text file and runs each
-line as a DFHack command as if it had been typed in by the user - treating the
-input like `an init file <init-files>`.
+:index:`Executes a batch file of DFHack commands.
+<script; Executes a batch file of DFHack commands.>` It reads a text file and
+runs each line as a DFHack command as if it had been typed in by the user --
+treating the input like `an init file <init-files>`.
 
 Some other tools, such as `autobutcher` and `workflow`, export their settings as
 the commands to create them - which can later be reloaded with ``script``.
diff --git a/docs/builtins/show.rst b/docs/builtins/show.rst
index e192f857c..81fda6943 100644
--- a/docs/builtins/show.rst
+++ b/docs/builtins/show.rst
@@ -4,10 +4,11 @@ show
 Tags: system
 :dfhack-keybind:`show`
 
-Unhides the DFHack terminal window. Useful if you have hidden the terminal with
-`hide` and you want it back. Since the terminal window won't be available to run
-this command, you'll need to use it from a `keybinding` set beforehand or the
-in-game `command-prompt`.
+:index:`Unhides the DFHack terminal window.
+<show; Unhides the DFHack terminal window.>` Useful if you have hidden the
+terminal with `hide` and you want it back. Since the terminal window won't be
+available to run this command, you'll need to use it from a `keybinding` set
+beforehand or the in-game `command-prompt`.
 
 Only available on Windows.
 
diff --git a/docs/builtins/tags.rst b/docs/builtins/tags.rst
index 3d7933fca..ad8f03b28 100644
--- a/docs/builtins/tags.rst
+++ b/docs/builtins/tags.rst
@@ -4,8 +4,9 @@ tags
 Tags: system
 :dfhack-keybind:`tags`
 
-List the strings that DFHack tools can be tagged with. You can find groups of
-related tools by passing the tag name to the `ls` command.
+:index:`List the strings that DFHack tools can be tagged with.
+<tags; List the strings that DFHack tools can be tagged with.>` You can find
+groups of related tools by passing the tag name to the `ls` command.
 
 Usage::
 
diff --git a/docs/builtins/type.rst b/docs/builtins/type.rst
index 16325c90f..2c16a3078 100644
--- a/docs/builtins/type.rst
+++ b/docs/builtins/type.rst
@@ -4,9 +4,10 @@ type
 Tags: system
 :dfhack-keybind:`type`
 
-Describes how a command is implemented. DFHack commands can be provided by
-plugins, scripts, or by the core library itself. The ``type`` command can tell
-you which is the source of a particular command.
+:index:`Describes how a command is implemented.
+<type; Describes how a command is implemented.>` DFHack commands can be provided
+by plugins, scripts, or by the core library itself. The ``type`` command can
+tell you which is the source of a particular command.
 
 Usage::
 
diff --git a/docs/builtins/unload.rst b/docs/builtins/unload.rst
index 99eed500c..15a0fa789 100644
--- a/docs/builtins/unload.rst
+++ b/docs/builtins/unload.rst
@@ -4,7 +4,8 @@ unload
 Tags: system
 :dfhack-keybind:`unload`
 
-Unload a plugin from memory. Also see `load` and `reload` for related actions.
+:index:`Unload a plugin from memory. <unload; Unload a plugin from memory.>`
+Also see `load` and `reload` for related actions.
 
 Usage::
 

From 6b9803daaf2c985d5f7e0943925dc8b08f9d9818 Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Fri, 22 Jul 2022 00:05:53 -0700
Subject: [PATCH 271/854] update docs up to the end of the b's

---
 docs/plugins/3dveins.rst               |  8 ++--
 docs/plugins/add-spatter.rst           |  1 -
 docs/plugins/autochop.rst              |  1 -
 docs/plugins/autoclothing.rst          |  5 ++-
 docs/plugins/autodump-destroy-here.rst | 13 -------
 docs/plugins/autodump-destroy-item.rst | 16 --------
 docs/plugins/autodump.rst              | 37 ++++++++++++------
 docs/plugins/autofarm.rst              |  9 +++--
 docs/plugins/autogems-reload.rst       | 12 ------
 docs/plugins/autogems.rst              | 16 +++++---
 docs/plugins/autohauler.rst            |  9 +++--
 docs/plugins/autolabor.rst             |  6 ++-
 docs/plugins/automaterial.rst          |  1 -
 docs/plugins/automelt.rst              |  1 -
 docs/plugins/autotrade.rst             |  1 -
 docs/plugins/blueprint.rst             |  7 ++--
 docs/plugins/building-hacks.rst        |  1 -
 docs/plugins/buildingplan.rst          | 13 ++++---
 docs/plugins/burrow.rst                | 49 ------------------------
 docs/plugins/burrows.rst               | 52 +++++++++++++++++++++++---
 docs/plugins/digl.rst                  | 20 ----------
 docs/plugins/diglx.rst                 | 20 ----------
 docs/plugins/digv.rst                  | 20 ----------
 docs/plugins/digvx.rst                 | 20 ----------
 24 files changed, 116 insertions(+), 222 deletions(-)
 delete mode 100644 docs/plugins/autodump-destroy-here.rst
 delete mode 100644 docs/plugins/autodump-destroy-item.rst
 delete mode 100644 docs/plugins/autogems-reload.rst
 delete mode 100644 docs/plugins/burrow.rst
 delete mode 100644 docs/plugins/digl.rst
 delete mode 100644 docs/plugins/diglx.rst
 delete mode 100644 docs/plugins/digv.rst
 delete mode 100644 docs/plugins/digvx.rst

diff --git a/docs/plugins/3dveins.rst b/docs/plugins/3dveins.rst
index 89c241df6..ff230679b 100644
--- a/docs/plugins/3dveins.rst
+++ b/docs/plugins/3dveins.rst
@@ -4,9 +4,11 @@
 Tags:
 :dfhack-keybind:`3dveins`
 
-Rewrites layer veins to expand in 3D space. Existing, flat veins are removed
-and new 3D veins that naturally span z-levels are generated in their place.
-The transformation preserves the mineral counts reported by `prospect`.
+:index:`Rewrites layer veins to expand in 3D space.
+<3dveins; Rewrites layer veins to expand in 3D space.>` Existing, flat veins
+are removed and new 3D veins that naturally span z-levels are generated in
+their place. The transformation preserves the mineral counts reported by
+`prospect`.
 
 Usage::
 
diff --git a/docs/plugins/add-spatter.rst b/docs/plugins/add-spatter.rst
index 92808017c..0c5c551b3 100644
--- a/docs/plugins/add-spatter.rst
+++ b/docs/plugins/add-spatter.rst
@@ -2,7 +2,6 @@ add-spatter
 ===========
 
 Tags:
-:dfhack-keybind:`add-spatter`
 
 Make tagged reactions produce contaminants. The plugin is intended to give some
 use to all those poisons that can be bought from caravans. It automatically
diff --git a/docs/plugins/autochop.rst b/docs/plugins/autochop.rst
index 704b97143..3fc65144e 100644
--- a/docs/plugins/autochop.rst
+++ b/docs/plugins/autochop.rst
@@ -2,7 +2,6 @@ autochop
 ========
 
 Tags:
-:dfhack-keybind:`autochop`
 
 Auto-harvest trees when low on stockpiled logs. This plugin can designate trees
 for chopping when your stocks are low on logs.
diff --git a/docs/plugins/autoclothing.rst b/docs/plugins/autoclothing.rst
index a8cc001dd..df937c338 100644
--- a/docs/plugins/autoclothing.rst
+++ b/docs/plugins/autoclothing.rst
@@ -4,8 +4,9 @@ autoclothing
 Tags:
 :dfhack-keybind:`autoclothing`
 
-Automatically manage clothing work orders. It allows you to set how many of each
-clothing type every citizen should have.
+:index:`Automatically manage clothing work orders.
+<autoclothing; Automatically manage clothing work orders.>` It allows you to
+set how many of each clothing type every citizen should have.
 
 Usage::
 
diff --git a/docs/plugins/autodump-destroy-here.rst b/docs/plugins/autodump-destroy-here.rst
deleted file mode 100644
index 35356166c..000000000
--- a/docs/plugins/autodump-destroy-here.rst
+++ /dev/null
@@ -1,13 +0,0 @@
-autodump-destroy-here
-=====================
-
-Tags:
-:dfhack-keybind:`autodump-destroy-here`
-
-Destroy items marked for dumping under cursor. If called again before the game
-is resumed, cancels destruction of the items. This is an alias for the
-`autodump` command ``autodump destroy-here``, intended for use as a keybinding.
-
-Usage::
-
-    autodump-destroy-here
diff --git a/docs/plugins/autodump-destroy-item.rst b/docs/plugins/autodump-destroy-item.rst
deleted file mode 100644
index 9447590d0..000000000
--- a/docs/plugins/autodump-destroy-item.rst
+++ /dev/null
@@ -1,16 +0,0 @@
-autodump-destroy-item
-=====================
-
-Tags:
-:dfhack-keybind:`autodump-destroy-item`
-
-Destroy the selected item. The item may be selected in the :kbd:`k` list or in
-the container item list. If called again before the game is resumed, cancels
-destruction of the item.
-
-This command is intended for use as a keybinding. See the `autodump` command
-for other dumping/destroying options.
-
-Usage::
-
-    autodump-destroy-item
diff --git a/docs/plugins/autodump.rst b/docs/plugins/autodump.rst
index 5ac0d1cd5..45f5f90e1 100644
--- a/docs/plugins/autodump.rst
+++ b/docs/plugins/autodump.rst
@@ -3,15 +3,17 @@ autodump
 
 Tags:
 :dfhack-keybind:`autodump`
+:dfhack-keybind:`autodump-destroy-here`
+:dfhack-keybind:`autodump-destroy-item`
 
-Quickly designate or teleport items to be dumped. When `enabled <enable>`, this
-plugin adds an option to the :kbd:`q` menu for stockpiles. When the ``autodump``
-option is selected for the stockpile, any items placed in the stockpile will
-automatically be designated to be dumped.
+Automatically set items in a stockpile to be dumped. When `enabled <enable>`,
+this plugin adds an option to the :kbd:`q` menu for stockpiles. When the
+``autodump`` option is selected for the stockpile, any items placed in the
+stockpile will automatically be designated to be dumped.
 
-When invoked as a command, it can instantly move all items designated to be
-dumped to the tile under the cursor. After moving the items, the dump flag is
-unset and the forbid flag is set, just as if it had been dumped normally. Be
+When invoked as a command, it can instantly move all unforbidden items marked
+for dumping to the tile under the cursor. After moving the items, the dump flag
+is unset and the forbid flag is set, just as if it had been dumped normally. Be
 aware that dwarves that are en route to pick up the item for dumping may still
 come and move the item to your dump zone.
 
@@ -21,6 +23,15 @@ Usage::
 
     enable autodump
     autodump [<options>]
+    autodump-destroy-here
+    autodump-destroy-item
+
+``autodump-destroy-here`` is an alias for ``autodump destroy-here`` and is
+intended for use as a keybinding.
+
+``autodump-destroy-item`` destroys only the selected item. The item may be
+selected in the :kbd:`k` list or in the container item list. If called again
+before the game is resumed, cancels destruction of the item.
 
 Options
 -------
@@ -28,10 +39,10 @@ Options
 - ``destroy``
     Destroy instead of dumping. Doesn't require a cursor. If ``autodump`` is
     called again with this option before the game is resumed, it cancels
-    the destroy action.
+    pending destroy actions.
 - ``destroy-here``
-    As ``destroy``, but only the selected item in the :kbd:`k` list, or inside a
-    container.
+    :index:`Destroy items marked for dumping under the cursor.
+    <autodump-destroy-here; Destroy items marked for dumping under the cursor.>`
 - ``visible``
     Only process items that are not hidden.
 - ``hidden``
@@ -43,6 +54,10 @@ Examples
 --------
 
 - ``autodump``
-    Teleports all unforbidden items marked for dumping to the cursor position.
+    :index:`Teleports items marked for dumping to the cursor position.
+    <autodump; Teleports items marked for dumping to the cursor position.>`
 - ``autodump destroy``
     Destroys all unforbidden items marked for dumping
+- ``autodump-destroy-item``
+    :index:`Destroys the selected item.
+    <autodump-destroy-item; Destroys the selected item.>`
diff --git a/docs/plugins/autofarm.rst b/docs/plugins/autofarm.rst
index 9a3e16d43..0294b574b 100644
--- a/docs/plugins/autofarm.rst
+++ b/docs/plugins/autofarm.rst
@@ -4,10 +4,11 @@ autofarm
 Tags:
 :dfhack-keybind:`autofarm`
 
-Automatically manage farm crop selection. This plugin periodically scans your
-plant stocks and assigns crops to your farm plots based on which plant stocks
-are low (as long as you have the appropriate seeds). The target threshold for
-each crop type is configurable.
+:index:`Automatically manage farm crop selection.
+<autofarm; Automatically manage farm crop selection.>` This plugin periodically
+scans your plant stocks and assigns crops to your farm plots based on which
+plant stocks are low (as long as you have the appropriate seeds). The target
+threshold for each crop type is configurable.
 
 Usage:
 
diff --git a/docs/plugins/autogems-reload.rst b/docs/plugins/autogems-reload.rst
deleted file mode 100644
index 0988496cb..000000000
--- a/docs/plugins/autogems-reload.rst
+++ /dev/null
@@ -1,12 +0,0 @@
-autogems-reload
-===============
-
-Tags:
-:dfhack-keybind:`autogems-reload`
-
-Reloads the autogems configuration file. You might need to do this if you have
-manually modified the contents while the game is running.
-
-Usage::
-
-    autogems-reload
diff --git a/docs/plugins/autogems.rst b/docs/plugins/autogems.rst
index 724752217..215c3b69f 100644
--- a/docs/plugins/autogems.rst
+++ b/docs/plugins/autogems.rst
@@ -2,14 +2,20 @@ autogems
 ========
 
 Tags:
-:dfhack-keybind:`autogems`
+:dfhack-keybind:`autogems-reload`
 
 Automatically cut rough gems. This plugin periodically scans your stocks of
 rough gems and creates manager orders for cutting them at a Jeweler's Workshop.
 
-Usage::
+Usage:
 
-    enable autogems
-
-Run `gui/autogems` for a configuration UI, or access the new ``Auto Cut Gems``
+- ``enable autogems``
+    Enables the plugin
+- ``autogems-reload``
+    :index:`Reloads the autogems configuration file.
+    <autogems-reload; Reloads the autogems configuration file.>` You might need
+    to do this if you have manually modified the contents while the game is
+    running.
+    
+Run `gui/autogems` for a configuration UI, or access the ``Auto Cut Gems``
 option from the Current Workshop Orders screen (:kbd:`o`-:kbd:`W`).
diff --git a/docs/plugins/autohauler.rst b/docs/plugins/autohauler.rst
index f28044479..1dce8a692 100644
--- a/docs/plugins/autohauler.rst
+++ b/docs/plugins/autohauler.rst
@@ -4,10 +4,11 @@ autohauler
 Tags:
 :dfhack-keybind:`autohauler`
 
-Automatically manage hauling labors. Similar to `autolabor`, but instead of
-managing all labors, ``autohauler`` only addresses hauling labors, leaving the
-assignment of skilled labors entirely up to you. You can use the in-game
-`manipulator` UI or an external tool like Dwarf Therapist to do so.
+:index:`Automatically manage hauling labors.
+<autohauler; Automatically manage hauling labors.>` Similar to `autolabor`, but
+instead of managing all labors, ``autohauler`` only addresses hauling labors,
+leaving the assignment of skilled labors entirely up to you. You can use the
+in-game `manipulator` UI or an external tool like Dwarf Therapist to do so.
 
 Idle dwarves who are not on active military duty will be assigned the hauling
 labors; everyone else (including those currently hauling) will have the hauling
diff --git a/docs/plugins/autolabor.rst b/docs/plugins/autolabor.rst
index f402703c8..7696efe71 100644
--- a/docs/plugins/autolabor.rst
+++ b/docs/plugins/autolabor.rst
@@ -4,8 +4,10 @@ autolabor
 Tags:
 :dfhack-keybind:`autolabor`
 
-Automatically manage dwarf labors. Autolabor attempts to keep as many dwarves as
-possible busy while allowing dwarves to specialize in specific skills.
+:index:`Automatically manage dwarf labors.
+<autolabor; Automatically manage dwarf labors.>` Autolabor attempts to keep as
+many dwarves as possible busy while allowing dwarves to specialize in specific
+skills.
 
 Autolabor frequently checks how many jobs of each type are available and sets
 labors proportionally in order to get them all done quickly. Labors with
diff --git a/docs/plugins/automaterial.rst b/docs/plugins/automaterial.rst
index 429a25d70..6c5e94c12 100644
--- a/docs/plugins/automaterial.rst
+++ b/docs/plugins/automaterial.rst
@@ -2,7 +2,6 @@ automaterial
 ============
 
 Tags:
-:dfhack-keybind:`automaterial`
 
 Sorts building materials by recent usage. This makes building constructions
 (walls, floors, fortifications, etc) much easier by saving you from having to
diff --git a/docs/plugins/automelt.rst b/docs/plugins/automelt.rst
index b16368ac5..38788ee93 100644
--- a/docs/plugins/automelt.rst
+++ b/docs/plugins/automelt.rst
@@ -2,7 +2,6 @@ automelt
 ========
 
 Tags:
-:dfhack-keybind:`automelt`
 
 Quickly designate items to be melted. When `enabled <enable>`, this plugin adds
 an option to the :kbd:`q` menu for stockpiles. When the ``automelt`` option is
diff --git a/docs/plugins/autotrade.rst b/docs/plugins/autotrade.rst
index 405621b2b..5a5053b8f 100644
--- a/docs/plugins/autotrade.rst
+++ b/docs/plugins/autotrade.rst
@@ -2,7 +2,6 @@ autotrade
 =========
 
 Tags:
-:dfhack-keybind:`autotrade`
 
 Quickly designate items to be traded. When `enabled <enable>`, this plugin adds
 an option to the :kbd:`q` menu for stockpiles. When the ``autotrade`` option is
diff --git a/docs/plugins/blueprint.rst b/docs/plugins/blueprint.rst
index 9d74fa47a..3825de7b2 100644
--- a/docs/plugins/blueprint.rst
+++ b/docs/plugins/blueprint.rst
@@ -4,9 +4,10 @@ blueprint
 Tags:
 :dfhack-keybind:`blueprint`
 
-Record a live game map in a quickfort blueprint. With ``blueprint``, you can
-export the structure of a portion of your fortress in a blueprint file that you
-(or anyone else) can later play back with `quickfort`.
+:index:`Record a live game map in a quickfort blueprint.
+<blueprint; Record a live game map in a quickfort blueprint.>` With
+``blueprint``, you can export the structure of a portion of your fortress in a
+blueprint file that you (or anyone else) can later play back with `quickfort`.
 
 Blueprints are ``.csv`` or ``.xlsx`` files created in the ``blueprints``
 subdirectory of your DF folder. The map area to turn into a blueprint is either
diff --git a/docs/plugins/building-hacks.rst b/docs/plugins/building-hacks.rst
index 78e94fba6..0c20a474f 100644
--- a/docs/plugins/building-hacks.rst
+++ b/docs/plugins/building-hacks.rst
@@ -2,7 +2,6 @@ building-hacks
 ==============
 
 Tags:
-:dfhack-keybind:`building-hacks`
 
 Allows mods to create and manage powered workshops.
 
diff --git a/docs/plugins/buildingplan.rst b/docs/plugins/buildingplan.rst
index 62a239e3d..ac73acd49 100644
--- a/docs/plugins/buildingplan.rst
+++ b/docs/plugins/buildingplan.rst
@@ -4,12 +4,13 @@ buildingplan
 Tags:
 :dfhack-keybind:`buildingplan`
 
-Plan building construction before you have materials. This plugin adds a
-planning mode for building placement. You can then place furniture,
-constructions, and other buildings before the required materials are available,
-and they will be created in a suspended state. Buildingplan will periodically
-scan for appropriate items, and the jobs will be unsuspended when the items are
-available.
+:index:`Plan building construction before you have materials.
+<buildingplan; Plan building construction before you have materials.>` This
+plugin adds a planning mode for building placement. You can then place
+furniture, constructions, and other buildings before the required materials are
+available, and they will be created in a suspended state. Buildingplan will
+periodically scan for appropriate items, and the jobs will be unsuspended when
+the items are available.
 
 This is very useful when combined with manager work orders or `workflow` -- you
 can set a constraint to always have one or two doors/beds/tables/chairs/etc.
diff --git a/docs/plugins/burrow.rst b/docs/plugins/burrow.rst
deleted file mode 100644
index 879a7cc78..000000000
--- a/docs/plugins/burrow.rst
+++ /dev/null
@@ -1,49 +0,0 @@
-burrow
-======
-
-Tags:
-:dfhack-keybind:`burrow`
-
-Quick commands for burrow control. Allows manipulating burrows and automated
-burrow expansion while digging.
-
-Usage:
-
-- ``burrows enable auto-grow``
-    When a wall inside a burrow with a name ending in '+' is dug out, the burrow
-    will be extended to newly-revealed adjacent walls. This final '+' may be
-    omitted in burrow name args of other ``burrows`` commands. Note that digging
-    1-wide corridors with the miner inside the burrow is SLOW. Be sure to also
-    run ``enable burrow`` for this feature to work.
-- ``burrows disable auto-grow``
-    Disables auto-grow processing.
-- ``burrows clear-unit <burrow> [<burrow> ...]``
-    Remove all units from the named burrows.
-- ``burrows clear-tiles <burrow> [<burrow> ...]``
-    Remove all tiles from the named burrows.
-- ``burrows set-units target-burrow <burrow> [<burrow> ...]``
-    Clear all units from the target burrow, then add units from the named source
-    burrows.
-- ``burrows add-units target-burrow <burrow> [<burrow> ...]``
-    Add units from the source burrows to the target.
-- ``burrows remove-units target-burrow <burrow> [<burrow> ...]``
-    Remove units in source burrows from the target.
-- ``burrows set-tiles target-burrow <burrow> [<burrow> ...]``
-    Clear target burrow tiles and adds tiles from the names source burrows.
-- ``burrows add-tiles target-burrow <burrow> [<burrow> ...]``
-    Add tiles from the source burrows to the target.
-- ``burrows remove-tiles target-burrow <burrow> [<burrow> ...]``
-    Remove tiles in source burrows from the target.
-
-In place of a source burrow, you can use one of the following keywords:
-
-- ``ABOVE_GROUND``
-- ``SUBTERRANEAN``
-- ``INSIDE``
-- ``OUTSIDE``
-- ``LIGHT``
-- ``DARK``
-- ``HIDDEN``
-- ``REVEALED``
-
-to add tiles with the given properties.
diff --git a/docs/plugins/burrows.rst b/docs/plugins/burrows.rst
index 9bf375fa8..bc80e5bb1 100644
--- a/docs/plugins/burrows.rst
+++ b/docs/plugins/burrows.rst
@@ -2,17 +2,57 @@ burrows
 =======
 
 Tags:
-:dfhack-keybind:`burrows`
+:dfhack-keybind:`burrow`
 
 Auto-expand burrows as you dig. When a wall inside a burrow with a name ending
 in ``+`` is dug out, the burrow will be extended to newly-revealed adjacent
 walls. Note that digging 1-wide corridors with the miner inside the burrow is
 SLOW.
 
-Usage::
+You can also use the ``burrow`` command to
+:index:`Quickly add units/tiles to burrows.
+<burrow; Quickly add units/tiles to burrows.>`
 
-    enable burrows
-    burrows enable auto-grow
+Usage:
 
-Both of the above commands need to be run for the auto-grow functionality to
-work. See the `burrow` command for more burrow-related tools.
+- ``enable burrows``
+    Enable the plugin for the auto-grow feature (see
+    ``burrow enable auto-grow`` below)
+- ``burrow enable auto-grow``
+    When a wall inside a burrow with a name ending in '+' is dug out, the burrow
+    will be extended to newly-revealed adjacent walls. This final '+' may be
+    omitted in burrow name args of other ``burrows`` commands. Note that digging
+    1-wide corridors with the miner inside the burrow is SLOW. Be sure to also
+    run ``enable burrows`` for this feature to work.
+- ``burrow disable auto-grow``
+    Disables auto-grow processing.
+- ``burrow clear-unit <burrow> [<burrow> ...]``
+    Remove all units from the named burrows.
+- ``burrow clear-tiles <burrow> [<burrow> ...]``
+    Remove all tiles from the named burrows.
+- ``burrow set-units target-burrow <burrow> [<burrow> ...]``
+    Clear all units from the target burrow, then add units from the named source
+    burrows.
+- ``burrow add-units target-burrow <burrow> [<burrow> ...]``
+    Add units from the source burrows to the target.
+- ``burrow remove-units target-burrow <burrow> [<burrow> ...]``
+    Remove units in source burrows from the target.
+- ``burrow set-tiles target-burrow <burrow> [<burrow> ...]``
+    Clear target burrow tiles and adds tiles from the names source burrows.
+- ``burrow add-tiles target-burrow <burrow> [<burrow> ...]``
+    Add tiles from the source burrows to the target.
+- ``burrow remove-tiles target-burrow <burrow> [<burrow> ...]``
+    Remove tiles in source burrows from the target.
+
+In place of a source burrow, you can use one of the following keywords:
+
+- ``ABOVE_GROUND``
+- ``SUBTERRANEAN``
+- ``INSIDE``
+- ``OUTSIDE``
+- ``LIGHT``
+- ``DARK``
+- ``HIDDEN``
+- ``REVEALED``
+
+to add tiles with the given properties.
diff --git a/docs/plugins/digl.rst b/docs/plugins/digl.rst
deleted file mode 100644
index f09626d0c..000000000
--- a/docs/plugins/digl.rst
+++ /dev/null
@@ -1,20 +0,0 @@
-dig
-===
-This plugin makes many automated or complicated dig patterns easy.
-
-Basic commands:
-
-:digv:      Designate all of the selected vein for digging.
-:digvx:     Also cross z-levels, digging stairs as needed.  Alias for ``digv x``.
-:digl:      Like ``digv``, for layer stone.  Also supports an ``undo`` option
-            to remove designations, for if you accidentally set 50 levels at once.
-:diglx:     Also cross z-levels, digging stairs as needed.  Alias for ``digl x``.
-
-:dfhack-keybind:`digv`
-
-.. note::
-
-    All commands implemented by the `dig` plugin (listed by ``ls dig``) support
-    specifying the designation priority with ``-p#``, ``-p #``, or ``p=#``,
-    where ``#`` is a number from 1 to 7. If a priority is not specified, the
-    priority selected in-game is used as the default.
diff --git a/docs/plugins/diglx.rst b/docs/plugins/diglx.rst
deleted file mode 100644
index f09626d0c..000000000
--- a/docs/plugins/diglx.rst
+++ /dev/null
@@ -1,20 +0,0 @@
-dig
-===
-This plugin makes many automated or complicated dig patterns easy.
-
-Basic commands:
-
-:digv:      Designate all of the selected vein for digging.
-:digvx:     Also cross z-levels, digging stairs as needed.  Alias for ``digv x``.
-:digl:      Like ``digv``, for layer stone.  Also supports an ``undo`` option
-            to remove designations, for if you accidentally set 50 levels at once.
-:diglx:     Also cross z-levels, digging stairs as needed.  Alias for ``digl x``.
-
-:dfhack-keybind:`digv`
-
-.. note::
-
-    All commands implemented by the `dig` plugin (listed by ``ls dig``) support
-    specifying the designation priority with ``-p#``, ``-p #``, or ``p=#``,
-    where ``#`` is a number from 1 to 7. If a priority is not specified, the
-    priority selected in-game is used as the default.
diff --git a/docs/plugins/digv.rst b/docs/plugins/digv.rst
deleted file mode 100644
index f09626d0c..000000000
--- a/docs/plugins/digv.rst
+++ /dev/null
@@ -1,20 +0,0 @@
-dig
-===
-This plugin makes many automated or complicated dig patterns easy.
-
-Basic commands:
-
-:digv:      Designate all of the selected vein for digging.
-:digvx:     Also cross z-levels, digging stairs as needed.  Alias for ``digv x``.
-:digl:      Like ``digv``, for layer stone.  Also supports an ``undo`` option
-            to remove designations, for if you accidentally set 50 levels at once.
-:diglx:     Also cross z-levels, digging stairs as needed.  Alias for ``digl x``.
-
-:dfhack-keybind:`digv`
-
-.. note::
-
-    All commands implemented by the `dig` plugin (listed by ``ls dig``) support
-    specifying the designation priority with ``-p#``, ``-p #``, or ``p=#``,
-    where ``#`` is a number from 1 to 7. If a priority is not specified, the
-    priority selected in-game is used as the default.
diff --git a/docs/plugins/digvx.rst b/docs/plugins/digvx.rst
deleted file mode 100644
index f09626d0c..000000000
--- a/docs/plugins/digvx.rst
+++ /dev/null
@@ -1,20 +0,0 @@
-dig
-===
-This plugin makes many automated or complicated dig patterns easy.
-
-Basic commands:
-
-:digv:      Designate all of the selected vein for digging.
-:digvx:     Also cross z-levels, digging stairs as needed.  Alias for ``digv x``.
-:digl:      Like ``digv``, for layer stone.  Also supports an ``undo`` option
-            to remove designations, for if you accidentally set 50 levels at once.
-:diglx:     Also cross z-levels, digging stairs as needed.  Alias for ``digl x``.
-
-:dfhack-keybind:`digv`
-
-.. note::
-
-    All commands implemented by the `dig` plugin (listed by ``ls dig``) support
-    specifying the designation priority with ``-p#``, ``-p #``, or ``p=#``,
-    where ``#`` is a number from 1 to 7. If a priority is not specified, the
-    priority selected in-game is used as the default.

From 53cdf57043d34e78f599e682198b93caa2bef8a4 Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Fri, 22 Jul 2022 00:08:03 -0700
Subject: [PATCH 272/854] add missing digv label

---
 docs/plugins/dig.rst | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docs/plugins/dig.rst b/docs/plugins/dig.rst
index f09626d0c..2b1e96a18 100644
--- a/docs/plugins/dig.rst
+++ b/docs/plugins/dig.rst
@@ -1,3 +1,5 @@
+.. _digv:
+
 dig
 ===
 This plugin makes many automated or complicated dig patterns easy.

From 3522b89f5ce66b92d7f92538f9b8e640bdfc8ada Mon Sep 17 00:00:00 2001
From: "pre-commit-ci[bot]"
 <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Date: Fri, 22 Jul 2022 14:20:01 +0000
Subject: [PATCH 273/854] [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci
---
 docs/plugins/autogems.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/plugins/autogems.rst b/docs/plugins/autogems.rst
index 215c3b69f..e1dd294e3 100644
--- a/docs/plugins/autogems.rst
+++ b/docs/plugins/autogems.rst
@@ -16,6 +16,6 @@ Usage:
     <autogems-reload; Reloads the autogems configuration file.>` You might need
     to do this if you have manually modified the contents while the game is
     running.
-    
+
 Run `gui/autogems` for a configuration UI, or access the ``Auto Cut Gems``
 option from the Current Workshop Orders screen (:kbd:`o`-:kbd:`W`).

From 9c7731f072f4998d7f530e0c14b316b3e3ddde9f Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Fri, 22 Jul 2022 09:19:11 -0700
Subject: [PATCH 274/854] remove reference to dfhack.init-example

---
 docs/Installing.rst | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/docs/Installing.rst b/docs/Installing.rst
index 5b564f45f..05db198b8 100644
--- a/docs/Installing.rst
+++ b/docs/Installing.rst
@@ -96,13 +96,14 @@ When you `download DFHack <downloading>`, you will end up with a release archive
 operating system should have built-in utilities capable of extracting files from
 these archives.
 
-The release archives contain several files and folders, including a ``hack``
-folder, a ``dfhack-config`` folder, and a ``dfhack.init-example`` file. To
-install DFHack, copy all of the files from the DFHack archive into the root DF
-folder, which should already include a ``data`` folder and a ``raw`` folder,
-among other things. Some packs and other redistributions of Dwarf Fortress may
-place DF in another folder, so ensure that the ``hack`` folder ends up next to
-the ``data`` folder.
+The release archives contain several folders, including a ``hack`` folder where
+DFHack binary and system data is stored, a ``dfhack-config`` folder where user
+data and configuration is stored, and a ``blueprints`` folder where `quickfort`
+blueprints are stored. To install DFHack, copy all of the files from the DFHack
+archive into the root DF folder, which should already include a ``data`` folder
+and a ``raw`` folder, among other things. Some packs and other redistributions
+of Dwarf Fortress may place DF in another folder, so ensure that the ``hack``
+folder ends up next to the ``data`` folder.
 
 .. note::
 

From bd581581267a57865b24fa73d58b4efc428bdd88 Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Fri, 22 Jul 2022 09:56:23 -0700
Subject: [PATCH 275/854] get rid of tool TOC, use genindex

also add a stub role for dfhack-tag
---
 conf.py               | 13 +++++++++++++
 docs/Introduction.rst |  6 ++++++
 docs/Tags.rst         | 42 +++++++++++++++++++++++-------------------
 docs/index-tools.rst  | 15 ---------------
 index.rst             | 29 +++++------------------------
 5 files changed, 47 insertions(+), 58 deletions(-)
 delete mode 100644 docs/index-tools.rst

diff --git a/conf.py b/conf.py
index 0488a2afe..abbd1dbb3 100644
--- a/conf.py
+++ b/conf.py
@@ -82,7 +82,18 @@ def dfhack_keybind_role_func(role, rawtext, text, lineno, inliner,
     return [newnode], []
 
 
+# pylint:disable=unused-argument,dangerous-default-value,too-many-arguments
+def dfhack_tag_role_func(role, rawtext, text, lineno, inliner,
+                             options={}, content=[]):
+    """Custom role parser for DFHack tags."""
+    roles.set_classes(options)
+    # TODO: link to generated tag index page
+    newnode = nodes.inline(text, text)
+    return [newnode], []
+
+
 roles.register_canonical_role('dfhack-keybind', dfhack_keybind_role_func)
+roles.register_canonical_role('dfhack-tag', dfhack_tag_role_func)
 
 # -- Autodoc for DFhack plugins and scripts -------------------------------
 
@@ -128,6 +139,7 @@ def write_tool_docs():
     footer.
     """
     for k in DOC_ALL_DIRS:
+        header = ':orphan:\n'
         label = ('.. _{name}:\n\n').format(name=k[0])
         # TODO: can we autogenerate the :dfhack-keybind: line? it would go beneath
         # the tool header, which is currently in the middle of the included file.
@@ -143,6 +155,7 @@ def write_tool_docs():
         os.makedirs(os.path.join('docs/tools', os.path.dirname(k[0])),
                     mode=0o755, exist_ok=True)
         with open('docs/tools/{}.rst'.format(k[0]), mode) as outfile:
+            outfile.write(header)
             if k[0] != 'search' and k[0] != 'stonesense':
                 outfile.write(label)
             outfile.write(include)
diff --git a/docs/Introduction.rst b/docs/Introduction.rst
index f0dc7a4b6..449f2d38a 100644
--- a/docs/Introduction.rst
+++ b/docs/Introduction.rst
@@ -59,6 +59,12 @@ used by the DFHack console.
 * Finally, some commands are persistent once enabled, and will sit in the
   background managing or changing some aspect of the game if you `enable` them.
 
+.. note::
+    In order to avoid user confusion, as a matter of policy all GUI tools
+    display the word :guilabel:`DFHack` on the screen somewhere while active.
+
+    When that is not appropriate because they merely add keybinding hints to
+    existing DF screens, they deliberately use red instead of green for the key.
 
 Getting help
 ============
diff --git a/docs/Tags.rst b/docs/Tags.rst
index 56e5af650..de4e4900b 100644
--- a/docs/Tags.rst
+++ b/docs/Tags.rst
@@ -1,23 +1,27 @@
 .. _tags:
 
-Tags
-====
+Tool categories
+===============
 
-This is the list of tags and their descriptions.
+Related DFHack tools are grouped by tags to make them easier to find. If you'd
+like to see the full list of commands, please refer to the `index <genindex>`.
 
-- adventure: Tools relevant to adventure mode
-- fort: Tools relevant to fort mode
-- legends: Tools relevant to legends mode
-- items: Tools that create or modify in-game items
-- units: Tools that create or modify units
-- jobs: Tools that create or modify jobs
-- labors: Tools that deal with labor assignment
-- auto: Tools that automatically manage some aspect of your fortress
-- map: Map modification
-- system: Tools related to working with DFHack commands or the core DFHack library
-- productivity: Tools that help you do things that you could do manually, but using the tool is better and faster
-- animals: Tools that help you manage animals
-- fix: Tools that fix specific bugs
-- inspection: Tools that let you inspect game data
-- buildings/furniture: Tools that help you work wtih placing or configuring buildings and furniture
-- quickfort: Tools that are involved in creating and playing back blueprints
+These are the DFHack tool categories. Note that a tool may belong to more than
+one category.
+
+- :dfhack-tag:`adventure`: Tools relevant to adventure mode
+- :dfhack-tag:`fort`: Tools relevant to fort mode
+- :dfhack-tag:`legends`: Tools relevant to legends mode
+- :dfhack-tag:`items`: Tools that create or modify in-game items
+- :dfhack-tag:`units`: Tools that create or modify units
+- :dfhack-tag:`jobs`: Tools that create or modify jobs
+- :dfhack-tag:`labors`: Tools that deal with labor assignment
+- :dfhack-tag:`auto`: Tools that automatically manage some aspect of your fortress
+- :dfhack-tag:`map`: Map modification
+- :dfhack-tag:`system`: Tools related to working with DFHack commands or the core DFHack library
+- :dfhack-tag:`productivity`: Tools that help you do things that you could do manually, but using the tool is better and faster
+- :dfhack-tag:`animals`: Tools that help you manage animals
+- :dfhack-tag:`fix`: Tools that fix specific bugs
+- :dfhack-tag:`inspection`: Tools that let you inspect game data
+- :dfhack-tag:`buildings/furniture`: Tools that help you work wtih placing or configuring buildings and furniture
+- :dfhack-tag:`quickfort`: Tools that are involved in creating and playing back blueprints
diff --git a/docs/index-tools.rst b/docs/index-tools.rst
deleted file mode 100644
index a9c540d66..000000000
--- a/docs/index-tools.rst
+++ /dev/null
@@ -1,15 +0,0 @@
-.. _tools-index:
-
-==================
-DFHack Tools Index
-==================
-
-These pages contain information about the plugins, scripts, and built-in
-commands distributed with DFHack.
-
-.. toctree::
-   :titlesonly:
-   :glob:
-
-   /docs/tools/*
-   /docs/tools/*/*
diff --git a/index.rst b/index.rst
index 3e5cdec5d..843797e4e 100644
--- a/index.rst
+++ b/index.rst
@@ -15,10 +15,9 @@ Quick Links
 
 * `Downloads <https://www.github.com/DFHack/dfhack/releases>`_
 * `Installation guide <installing>`
-* `Source code <https://www.github.com/DFHack/dfhack>`_
-  (**important:** read `compile` before attempting to build from source)
-* `Bay 12 forums thread <https://dfhack.org/bay12>`_
-* `Bug tracker <https://www.github.com/DFHack/dfhack/issues>`_
+* `Getting help <support>`
+* :source:`Source code <>`
+    (**important:** read `compile` before attempting to build from source.)
 
 User Manual
 ===========
@@ -30,25 +29,7 @@ User Manual
    /docs/Installing
    /docs/Support
    /docs/Core
+   /docs/Tags
    /docs/guides/index
-   /docs/index-about
    /docs/index-dev
-
-Tools
-=====
-
-DFHack commands, plugins, and scripts are grouped by tags to make it easier to
-find groups of related tools.
-
-.. note::
-    In order to avoid user confusion, as a matter of policy all GUI tools
-    display the word :guilabel:`DFHack` on the screen somewhere while active.
-
-    When that is not appropriate because they merely add keybinding hints to
-    existing DF screens, they deliberately use red instead of green for the key.
-
-.. toctree::
-   :maxdepth: 1
-
-   /docs/Tags
-   /docs/index-tools
+   /docs/index-about

From 3175e8b33d3cce98f775c0f7348e0064a5907704 Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Fri, 22 Jul 2022 10:01:04 -0700
Subject: [PATCH 276/854] update tags and text for builtins

---
 docs/builtins/alias.rst          | 2 +-
 docs/builtins/cls.rst            | 2 +-
 docs/builtins/devel/dump-rpc.rst | 4 ++--
 docs/builtins/die.rst            | 6 +++---
 docs/builtins/disable.rst        | 2 +-
 docs/builtins/enable.rst         | 2 +-
 docs/builtins/fpause.rst         | 2 +-
 docs/builtins/help.rst           | 2 +-
 docs/builtins/hide.rst           | 6 +++---
 docs/builtins/keybinding.rst     | 2 +-
 docs/builtins/kill-lua.rst       | 2 +-
 docs/builtins/load.rst           | 2 +-
 docs/builtins/ls.rst             | 2 +-
 docs/builtins/plug.rst           | 6 +++---
 docs/builtins/reload.rst         | 2 +-
 docs/builtins/sc-script.rst      | 2 +-
 docs/builtins/script.rst         | 6 +++---
 docs/builtins/show.rst           | 2 +-
 docs/builtins/tags.rst           | 2 +-
 docs/builtins/type.rst           | 6 +++---
 docs/builtins/unload.rst         | 2 +-
 21 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/docs/builtins/alias.rst b/docs/builtins/alias.rst
index 59669fa39..6de550875 100644
--- a/docs/builtins/alias.rst
+++ b/docs/builtins/alias.rst
@@ -1,7 +1,7 @@
 alias
 =====
 
-Tags: system
+Tags: :dfhack-tag:`system`
 :dfhack-keybind:`alias`
 
 :index:`Configure helper aliases for other DFHack commands.
diff --git a/docs/builtins/cls.rst b/docs/builtins/cls.rst
index bc22b54fc..5c1189951 100644
--- a/docs/builtins/cls.rst
+++ b/docs/builtins/cls.rst
@@ -1,7 +1,7 @@
 cls
 ===
 
-Tags: system
+Tags: :dfhack-tag:`system`
 :dfhack-keybind:`cls`
 
 :index:`Clear the terminal screen. <cls; Clear the terminal screen.>` Can also
diff --git a/docs/builtins/devel/dump-rpc.rst b/docs/builtins/devel/dump-rpc.rst
index 7babfb6a7..05f1d4e9e 100644
--- a/docs/builtins/devel/dump-rpc.rst
+++ b/docs/builtins/devel/dump-rpc.rst
@@ -1,10 +1,10 @@
 devel/dump-rpc
 ==============
 
-Tags: system
+Tags: :dfhack-tag:`system`
 :dfhack-keybind:`devel/dump-rpc`
 
-:index:`Writes RPC endpoint information to the specified file.
+:index:`Write RPC endpoint information to the specified file.
 <devel/dump-rpc; Writes RPC endpoint information to the specified file.>`
 
 Usage::
diff --git a/docs/builtins/die.rst b/docs/builtins/die.rst
index 8f20a825f..c2ea083fd 100644
--- a/docs/builtins/die.rst
+++ b/docs/builtins/die.rst
@@ -1,8 +1,8 @@
 die
 ===
 
-Tags: system
+Tags: :dfhack-tag:`system`
 :dfhack-keybind:`die`
 
-:index:`Instantly exits DF without saving.
-<die; Instantly exits DF without saving.>`
+:index:`Instantly exit DF without saving.
+<die; Instantly exit DF without saving.>`
diff --git a/docs/builtins/disable.rst b/docs/builtins/disable.rst
index 3fb989328..1e2336545 100644
--- a/docs/builtins/disable.rst
+++ b/docs/builtins/disable.rst
@@ -1,7 +1,7 @@
 disable
 =======
 
-Tags: system
+Tags: :dfhack-tag:`system`
 :dfhack-keybind:`disable`
 
 :index:`Deactivate a DFHack tool that has some persistent effect.
diff --git a/docs/builtins/enable.rst b/docs/builtins/enable.rst
index 3a4164485..4630c2004 100644
--- a/docs/builtins/enable.rst
+++ b/docs/builtins/enable.rst
@@ -1,7 +1,7 @@
 enable
 ======
 
-Tags: system
+Tags: :dfhack-tag:`system`
 :dfhack-keybind:`enable`
 
 :index:`Activate a DFHack tool that has some persistent effect.
diff --git a/docs/builtins/fpause.rst b/docs/builtins/fpause.rst
index 2e797129b..927206e8d 100644
--- a/docs/builtins/fpause.rst
+++ b/docs/builtins/fpause.rst
@@ -1,7 +1,7 @@
 fpause
 ======
 
-Tags: system
+Tags: :dfhack-tag:`system`
 :dfhack-keybind:`fpause`
 
 :index:`Forces DF to pause. <fpause; Forces DF to pause.>` This is useful when
diff --git a/docs/builtins/help.rst b/docs/builtins/help.rst
index 9a1f3f1b8..6249bdbe9 100644
--- a/docs/builtins/help.rst
+++ b/docs/builtins/help.rst
@@ -1,7 +1,7 @@
 help
 ====
 
-Tags: system
+Tags: :dfhack-tag:`system`
 :dfhack-keybind:`help`
 
 :index:`Display help about a command or plugin.
diff --git a/docs/builtins/hide.rst b/docs/builtins/hide.rst
index 51da0cc4f..3c79f9ff0 100644
--- a/docs/builtins/hide.rst
+++ b/docs/builtins/hide.rst
@@ -1,11 +1,11 @@
 hide
 ====
 
-Tags: system
+Tags: :dfhack-tag:`system`
 :dfhack-keybind:`hide`
 
-:index:`Hides the DFHack terminal window.
-<hide; Hides the DFHack terminal window.>` You can show it again with the `show`
+:index:`Hide the DFHack terminal window.
+<hide; Hide the DFHack terminal window.>` You can show it again with the `show`
 command, though you'll need to use it from a `keybinding` set beforehand or the
 in-game `command-prompt`.
 
diff --git a/docs/builtins/keybinding.rst b/docs/builtins/keybinding.rst
index f591ece34..27ab86da6 100644
--- a/docs/builtins/keybinding.rst
+++ b/docs/builtins/keybinding.rst
@@ -1,7 +1,7 @@
 keybinding
 ==========
 
-Tags: system
+Tags: :dfhack-tag:`system`
 :dfhack-keybind:`keybinding`
 
 :index:`Create hotkeys that will run DFHack commands.
diff --git a/docs/builtins/kill-lua.rst b/docs/builtins/kill-lua.rst
index 998277f96..3f4bbf3c4 100644
--- a/docs/builtins/kill-lua.rst
+++ b/docs/builtins/kill-lua.rst
@@ -1,7 +1,7 @@
 kill-lua
 ========
 
-Tags: system
+Tags: :dfhack-tag:`system`
 :dfhack-keybind:`kill-lua`
 
 :index:`Gracefully stops any currently-running Lua scripts.
diff --git a/docs/builtins/load.rst b/docs/builtins/load.rst
index e84afe7d9..22e8067f3 100644
--- a/docs/builtins/load.rst
+++ b/docs/builtins/load.rst
@@ -1,7 +1,7 @@
 load
 ====
 
-Tags: system
+Tags: :dfhack-tag:`system`
 :dfhack-keybind:`load`
 
 :index:`Load and register a plugin library.
diff --git a/docs/builtins/ls.rst b/docs/builtins/ls.rst
index a6d2e637e..775ccfc63 100644
--- a/docs/builtins/ls.rst
+++ b/docs/builtins/ls.rst
@@ -1,7 +1,7 @@
 ls
 ==
 
-Tags: system
+Tags: :dfhack-tag:`system`
 :dfhack-keybind:`ls`
 
 :index:`List available DFHack commands. <ls; List available DFHack commands.>`
diff --git a/docs/builtins/plug.rst b/docs/builtins/plug.rst
index 38b37aa84..7dbbf0115 100644
--- a/docs/builtins/plug.rst
+++ b/docs/builtins/plug.rst
@@ -1,11 +1,11 @@
 plug
 ====
 
-Tags: system
+Tags: :dfhack-tag:`system`
 :dfhack-keybind:`plug`
 
-:index:`Lists available plugins and whether they are enabled.
-<plug; Lists available plugins and whether they are enabled.>`
+:index:`List available plugins and whether they are enabled.
+<plug; List available plugins and whether they are enabled.>`
 
 Usage:
 
diff --git a/docs/builtins/reload.rst b/docs/builtins/reload.rst
index 2fa817e3d..a5ab60859 100644
--- a/docs/builtins/reload.rst
+++ b/docs/builtins/reload.rst
@@ -1,7 +1,7 @@
 reload
 ======
 
-Tags: system
+Tags: :dfhack-tag:`system`
 :dfhack-keybind:`reload`
 
 :index:`Reload a loaded plugin. <reload; Reload a loaded plugin.>` Developers
diff --git a/docs/builtins/sc-script.rst b/docs/builtins/sc-script.rst
index eac65b463..feabe4c6f 100644
--- a/docs/builtins/sc-script.rst
+++ b/docs/builtins/sc-script.rst
@@ -1,7 +1,7 @@
 sc-script
 =========
 
-Tags: system
+Tags: :dfhack-tag:`system`
 :dfhack-keybind:`sc-script`
 
 :index:`Run commands when game state changes occur.
diff --git a/docs/builtins/script.rst b/docs/builtins/script.rst
index 17797ade7..b83f19171 100644
--- a/docs/builtins/script.rst
+++ b/docs/builtins/script.rst
@@ -1,11 +1,11 @@
 script
 ======
 
-Tags: system
+Tags: :dfhack-tag:`system`
 :dfhack-keybind:`script`
 
-:index:`Executes a batch file of DFHack commands.
-<script; Executes a batch file of DFHack commands.>` It reads a text file and
+:index:`Execute a batch file of DFHack commands.
+<script; Execute a batch file of DFHack commands.>` It reads a text file and
 runs each line as a DFHack command as if it had been typed in by the user --
 treating the input like `an init file <init-files>`.
 
diff --git a/docs/builtins/show.rst b/docs/builtins/show.rst
index 81fda6943..e337bbbb6 100644
--- a/docs/builtins/show.rst
+++ b/docs/builtins/show.rst
@@ -1,7 +1,7 @@
 show
 ====
 
-Tags: system
+Tags: :dfhack-tag:`system`
 :dfhack-keybind:`show`
 
 :index:`Unhides the DFHack terminal window.
diff --git a/docs/builtins/tags.rst b/docs/builtins/tags.rst
index ad8f03b28..cc5c86a4b 100644
--- a/docs/builtins/tags.rst
+++ b/docs/builtins/tags.rst
@@ -1,7 +1,7 @@
 tags
 ====
 
-Tags: system
+Tags: :dfhack-tag:`system`
 :dfhack-keybind:`tags`
 
 :index:`List the strings that DFHack tools can be tagged with.
diff --git a/docs/builtins/type.rst b/docs/builtins/type.rst
index 2c16a3078..33ef7562f 100644
--- a/docs/builtins/type.rst
+++ b/docs/builtins/type.rst
@@ -1,11 +1,11 @@
 type
 ====
 
-Tags: system
+Tags: :dfhack-tag:`system`
 :dfhack-keybind:`type`
 
-:index:`Describes how a command is implemented.
-<type; Describes how a command is implemented.>` DFHack commands can be provided
+:index:`Describe how a command is implemented.
+<type; Describe how a command is implemented.>` DFHack commands can be provided
 by plugins, scripts, or by the core library itself. The ``type`` command can
 tell you which is the source of a particular command.
 
diff --git a/docs/builtins/unload.rst b/docs/builtins/unload.rst
index 15a0fa789..3d1575c20 100644
--- a/docs/builtins/unload.rst
+++ b/docs/builtins/unload.rst
@@ -1,7 +1,7 @@
 unload
 ======
 
-Tags: system
+Tags: :dfhack-tag:`system`
 :dfhack-keybind:`unload`
 
 :index:`Unload a plugin from memory. <unload; Unload a plugin from memory.>`

From d637c874963f6f9e1045d8946730aefdbc28e00b Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Fri, 22 Jul 2022 10:14:50 -0700
Subject: [PATCH 277/854] ensure all plugins are indexed

---
 docs/plugins/3dveins.rst        |  6 ++++--
 docs/plugins/add-spatter.rst    |  9 +++++----
 docs/plugins/autochop.rst       |  5 +++--
 docs/plugins/autodump.rst       |  9 +++++----
 docs/plugins/autogems.rst       |  5 +++--
 docs/plugins/automaterial.rst   |  7 ++++---
 docs/plugins/automelt.rst       |  9 +++++----
 docs/plugins/autotrade.rst      |  9 +++++----
 docs/plugins/building-hacks.rst |  3 ++-
 docs/plugins/burrows.rst        | 11 ++++++-----
 10 files changed, 42 insertions(+), 31 deletions(-)

diff --git a/docs/plugins/3dveins.rst b/docs/plugins/3dveins.rst
index ff230679b..3c1276b46 100644
--- a/docs/plugins/3dveins.rst
+++ b/docs/plugins/3dveins.rst
@@ -4,8 +4,8 @@
 Tags:
 :dfhack-keybind:`3dveins`
 
-:index:`Rewrites layer veins to expand in 3D space.
-<3dveins; Rewrites layer veins to expand in 3D space.>` Existing, flat veins
+:index:`Rewrite layer veins to expand in 3D space.
+<3dveins; Rewrite layer veins to expand in 3D space.>` Existing, flat veins
 are removed and new 3D veins that naturally span z-levels are generated in
 their place. The transformation preserves the mineral counts reported by
 `prospect`.
@@ -19,6 +19,8 @@ The ``verbose`` option prints out extra information to the console.
 Example
 -------
 
+::
+
     3dveins
 
 New veins are generated using 3D Perlin noise in order to produce a layout that
diff --git a/docs/plugins/add-spatter.rst b/docs/plugins/add-spatter.rst
index 0c5c551b3..38a9f91f0 100644
--- a/docs/plugins/add-spatter.rst
+++ b/docs/plugins/add-spatter.rst
@@ -3,9 +3,10 @@ add-spatter
 
 Tags:
 
-Make tagged reactions produce contaminants. The plugin is intended to give some
-use to all those poisons that can be bought from caravans. It automatically
-enables itself when you load a world with reactions that include names starting
-with ``SPATTER_ADD_``. These reactions will then produce contaminants on items
+:index:`Make tagged reactions produce contaminants.
+<add-spatter; Make tagged reactions produce contaminants.>` Give some use to all
+those poisons that can be bought from caravans! The plugin automatically enables
+itself when you load a world with reactions that include names starting with
+``SPATTER_ADD_``. These reactions will then produce contaminants on items
 instead of improvements. The contaminants are immune to being washed away by
 water or destroyed by `clean`.
diff --git a/docs/plugins/autochop.rst b/docs/plugins/autochop.rst
index 3fc65144e..3a2284aef 100644
--- a/docs/plugins/autochop.rst
+++ b/docs/plugins/autochop.rst
@@ -3,8 +3,9 @@ autochop
 
 Tags:
 
-Auto-harvest trees when low on stockpiled logs. This plugin can designate trees
-for chopping when your stocks are low on logs.
+:index:`Auto-harvest trees when low on stockpiled logs.
+<autochop; Auto-harvest trees when low on stockpiled logs.>` This plugin can
+designate trees for chopping when your stocks are low on logs.
 
 Usage::
 
diff --git a/docs/plugins/autodump.rst b/docs/plugins/autodump.rst
index 45f5f90e1..a47878c34 100644
--- a/docs/plugins/autodump.rst
+++ b/docs/plugins/autodump.rst
@@ -6,10 +6,11 @@ Tags:
 :dfhack-keybind:`autodump-destroy-here`
 :dfhack-keybind:`autodump-destroy-item`
 
-Automatically set items in a stockpile to be dumped. When `enabled <enable>`,
-this plugin adds an option to the :kbd:`q` menu for stockpiles. When the
-``autodump`` option is selected for the stockpile, any items placed in the
-stockpile will automatically be designated to be dumped.
+:index:`Automatically set items in a stockpile to be dumped.
+<autodump (plugin); Automatically set items in a stockpile to be dumped.>` When
+`enabled <enable>`, this plugin adds an option to the :kbd:`q` menu for
+stockpiles. When the ``autodump`` option is selected for the stockpile, any
+items placed in the stockpile will automatically be designated to be dumped.
 
 When invoked as a command, it can instantly move all unforbidden items marked
 for dumping to the tile under the cursor. After moving the items, the dump flag
diff --git a/docs/plugins/autogems.rst b/docs/plugins/autogems.rst
index e1dd294e3..bdfd51864 100644
--- a/docs/plugins/autogems.rst
+++ b/docs/plugins/autogems.rst
@@ -4,8 +4,9 @@ autogems
 Tags:
 :dfhack-keybind:`autogems-reload`
 
-Automatically cut rough gems. This plugin periodically scans your stocks of
-rough gems and creates manager orders for cutting them at a Jeweler's Workshop.
+:index:`Automatically cut rough gems. <autogems; Automatically cut rough gems.>`
+This plugin periodically scans your stocks of rough gems and creates manager
+orders for cutting them at a Jeweler's Workshop.
 
 Usage:
 
diff --git a/docs/plugins/automaterial.rst b/docs/plugins/automaterial.rst
index 6c5e94c12..e51276772 100644
--- a/docs/plugins/automaterial.rst
+++ b/docs/plugins/automaterial.rst
@@ -3,9 +3,10 @@ automaterial
 
 Tags:
 
-Sorts building materials by recent usage. This makes building constructions
-(walls, floors, fortifications, etc) much easier by saving you from having to
-trawl through long lists of materials each time you place one.
+:index:`Sorts building materials by recent usage.
+<automaterial>; Sorts building materials by recent usage.>` This makes building
+constructions (walls, floors, fortifications, etc) much easier by saving you
+from having to trawl through long lists of materials each time you place one.
 
 It moves the last used material for a given construction type to the top of the
 list, if there are any left. So if you build a wall with chalk blocks, the next
diff --git a/docs/plugins/automelt.rst b/docs/plugins/automelt.rst
index 38788ee93..b51a431c0 100644
--- a/docs/plugins/automelt.rst
+++ b/docs/plugins/automelt.rst
@@ -3,10 +3,11 @@ automelt
 
 Tags:
 
-Quickly designate items to be melted. When `enabled <enable>`, this plugin adds
-an option to the :kbd:`q` menu for stockpiles. When the ``automelt`` option is
-selected for the stockpile, any items placed in the stockpile will automatically
-be designated to be melted.
+:index:`Quickly designate items to be melted.
+<automelt; Quickly designate items to be melted.>` When `enabled <enable>`, this
+plugin adds an option to the :kbd:`q` menu for stockpiles. When the ``automelt``
+option is selected for the stockpile, any items placed in the stockpile will
+automatically be designated to be melted.
 
 Usage::
 
diff --git a/docs/plugins/autotrade.rst b/docs/plugins/autotrade.rst
index 5a5053b8f..ed2d65bc5 100644
--- a/docs/plugins/autotrade.rst
+++ b/docs/plugins/autotrade.rst
@@ -3,10 +3,11 @@ autotrade
 
 Tags:
 
-Quickly designate items to be traded. When `enabled <enable>`, this plugin adds
-an option to the :kbd:`q` menu for stockpiles. When the ``autotrade`` option is
-selected for the stockpile, any items placed in the stockpile will automatically
-be designated to be traded.
+:index:`Quickly designate items to be traded.
+<autotrade; Quickly designate items to be traded.>` When `enabled <enable>`,
+this plugin adds an option to the :kbd:`q` menu for stockpiles. When the
+``autotrade`` option is selected for the stockpile, any items placed in the
+stockpile will automatically be designated to be traded.
 
 Usage::
 
diff --git a/docs/plugins/building-hacks.rst b/docs/plugins/building-hacks.rst
index 0c20a474f..abd6ac4b4 100644
--- a/docs/plugins/building-hacks.rst
+++ b/docs/plugins/building-hacks.rst
@@ -3,7 +3,8 @@ building-hacks
 
 Tags:
 
-Allows mods to create and manage powered workshops.
+:index:`Allows mods to create and manage powered workshops.
+<building-hacks; Allows mods to create and manage powered workshops.>`
 
 Usage::
 
diff --git a/docs/plugins/burrows.rst b/docs/plugins/burrows.rst
index bc80e5bb1..6ab26caa2 100644
--- a/docs/plugins/burrows.rst
+++ b/docs/plugins/burrows.rst
@@ -4,13 +4,14 @@ burrows
 Tags:
 :dfhack-keybind:`burrow`
 
-Auto-expand burrows as you dig. When a wall inside a burrow with a name ending
-in ``+`` is dug out, the burrow will be extended to newly-revealed adjacent
-walls. Note that digging 1-wide corridors with the miner inside the burrow is
-SLOW.
+:index:`Auto-expand burrows as you dig.
+<burrows (plugin); Auto-expand burrows as you dig.>` When a wall inside a burrow
+with a name ending in ``+`` is dug out, the burrow will be extended to
+newly-revealed adjacent walls. Note that digging 1-wide corridors with the miner
+inside the burrow is **SLOW**.
 
 You can also use the ``burrow`` command to
-:index:`Quickly add units/tiles to burrows.
+:index:`quickly add units/tiles to burrows.
 <burrow; Quickly add units/tiles to burrows.>`
 
 Usage:

From b38ccfe03d1493a10b9d0c339468e25f871e8d80 Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Fri, 22 Jul 2022 10:18:32 -0700
Subject: [PATCH 278/854] fix typo in automaterial docs

---
 docs/plugins/automaterial.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/plugins/automaterial.rst b/docs/plugins/automaterial.rst
index e51276772..7f8355b49 100644
--- a/docs/plugins/automaterial.rst
+++ b/docs/plugins/automaterial.rst
@@ -4,7 +4,7 @@ automaterial
 Tags:
 
 :index:`Sorts building materials by recent usage.
-<automaterial>; Sorts building materials by recent usage.>` This makes building
+<automaterial; Sorts building materials by recent usage.>` This makes building
 constructions (walls, floors, fortifications, etc) much easier by saving you
 from having to trawl through long lists of materials each time you place one.
 

From 6a31b316dc694e6a7838b001d649074ee61532b5 Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Fri, 22 Jul 2022 14:37:24 -0700
Subject: [PATCH 279/854] add structure for category indices

---
 conf.py             | 35 +++++++++++++++++++++++++++++++----
 docs/Categories.rst | 13 +++++++++++++
 docs/Tags.rst       | 20 ++++++--------------
 3 files changed, 50 insertions(+), 18 deletions(-)
 create mode 100644 docs/Categories.rst

diff --git a/conf.py b/conf.py
index abbd1dbb3..e80b5a027 100644
--- a/conf.py
+++ b/conf.py
@@ -126,10 +126,38 @@ def doc_all_dirs():
 
 DOC_ALL_DIRS = doc_all_dirs()
 
+
+def get_tags():
+    tags = []
+    tag_re = re.compile(r'- :dfhack-tag:`([^`]+)`: (.*)')
+    with open('docs/Tags.rst') as f:
+        lines = f.readlines()
+        for line in lines:
+            m = re.match(tag_re, line.strip())
+            if m:
+                tags.append((m.group(1), m.group(2)))
+    return tags
+
+
+def get_open_mode():
+    return 'w' if sys.version_info.major > 2 else 'wb'
+
+
 def generate_tag_indices():
-    #TODO: generate docs/tags/<tag>.rst with the tag description and links to the
-    # tools that have that tag
     os.makedirs('docs/tags', mode=0o755, exist_ok=True)
+    with open('docs/tags/index.rst', get_open_mode()) as topidx:
+        #topidx.write(':orphan:\n\n')
+        for tag_tuple in get_tags():
+            tag = tag_tuple[0]
+            with open(('docs/tags/{name}.rst').format(name=tag),
+                      get_open_mode()) as tagidx:
+                #tagidx.write(':orphan:\n\n')
+                tagidx.write('TODO: add links to the tools that have this tag')
+            topidx.write(('.. _tag/{name}:\n\n').format(name=tag))
+            topidx.write(('{name}\n').format(name=tag))
+            topidx.write(('{underline}\n').format(underline='-'*len(tag)))
+            topidx.write(('{desc}\n\n').format(desc=tag_tuple[1]))
+            topidx.write(('.. include:: /docs/tags/{name}.rst\n\n').format(name=tag))
 
 
 def write_tool_docs():
@@ -151,10 +179,9 @@ def write_tool_docs():
         # TODO: generate a footer with links to tools that share at least one
         # tag with this tool. Just the tool names, strung across the bottom of
         # the page in one long wrapped line, similar to how the wiki does it
-        mode = 'w' if sys.version_info.major > 2 else 'wb'
         os.makedirs(os.path.join('docs/tools', os.path.dirname(k[0])),
                     mode=0o755, exist_ok=True)
-        with open('docs/tools/{}.rst'.format(k[0]), mode) as outfile:
+        with open('docs/tools/{}.rst'.format(k[0]), get_open_mode()) as outfile:
             outfile.write(header)
             if k[0] != 'search' and k[0] != 'stonesense':
                 outfile.write(label)
diff --git a/docs/Categories.rst b/docs/Categories.rst
new file mode 100644
index 000000000..541f89195
--- /dev/null
+++ b/docs/Categories.rst
@@ -0,0 +1,13 @@
+.. _categories:
+
+Tool categories
+===============
+
+DFHack tools are grouped to make them easier to find. Note that a tool can
+belong to more than one category. If you'd like to see the full list of tools,
+please refer to the `index <genindex>`.
+
+.. contents:: Contents
+  :local:
+
+.. include:: tags/index.rst
diff --git a/docs/Tags.rst b/docs/Tags.rst
index de4e4900b..7afbe0a02 100644
--- a/docs/Tags.rst
+++ b/docs/Tags.rst
@@ -1,17 +1,8 @@
-.. _tags:
+:orphan:
 
-Tool categories
-===============
-
-Related DFHack tools are grouped by tags to make them easier to find. If you'd
-like to see the full list of commands, please refer to the `index <genindex>`.
-
-These are the DFHack tool categories. Note that a tool may belong to more than
-one category.
-
-- :dfhack-tag:`adventure`: Tools relevant to adventure mode
-- :dfhack-tag:`fort`: Tools relevant to fort mode
-- :dfhack-tag:`legends`: Tools relevant to legends mode
+- :dfhack-tag:`adventure`: Tools that are useful while in adventure mode
+- :dfhack-tag:`fort`: Tools that are useful while in fort mode
+- :dfhack-tag:`legends`: Tools that are useful while in legends mode
 - :dfhack-tag:`items`: Tools that create or modify in-game items
 - :dfhack-tag:`units`: Tools that create or modify units
 - :dfhack-tag:`jobs`: Tools that create or modify jobs
@@ -23,5 +14,6 @@ one category.
 - :dfhack-tag:`animals`: Tools that help you manage animals
 - :dfhack-tag:`fix`: Tools that fix specific bugs
 - :dfhack-tag:`inspection`: Tools that let you inspect game data
-- :dfhack-tag:`buildings/furniture`: Tools that help you work wtih placing or configuring buildings and furniture
+- :dfhack-tag:`buildings`: Tools that help you work wtih placing or configuring buildings and furniture
 - :dfhack-tag:`quickfort`: Tools that are involved in creating and playing back blueprints
+- :dfhack-tag:`dev`: Tools useful for develpers and modders

From 2fd6d528ce084c87ebe1c2c923a734470a05cf7c Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Fri, 22 Jul 2022 14:37:47 -0700
Subject: [PATCH 280/854] move support docs to the intro page

but leave an orphan link to the new section in case external links still
point to the old page
---
 docs/Introduction.rst | 34 ++++++++++++++++++++++++++++++++--
 docs/Support.rst      | 35 ++---------------------------------
 index.rst             |  3 +--
 3 files changed, 35 insertions(+), 37 deletions(-)

diff --git a/docs/Introduction.rst b/docs/Introduction.rst
index 449f2d38a..ad24f8f43 100644
--- a/docs/Introduction.rst
+++ b/docs/Introduction.rst
@@ -21,7 +21,7 @@ enhancements by default, and more can be enabled.  There are also many tools
 You can even add third-party scripts and plugins to do almost anything!
 
 For modders, DFHack makes many things possible.  Custom reactions, new
-interactions, magic creature abilities, and more can be set through `DFHack tools <tools-index>`
+interactions, magic creature abilities, and more can be set through `DFHack tools <genindex>`
 and custom raws.  Non-standard DFHack scripts and inits can be stored in the
 raw directory, making raws or saves fully self-contained for distribution -
 or for coexistence in a single DF install, even with incompatible components.
@@ -66,6 +66,36 @@ used by the DFHack console.
     When that is not appropriate because they merely add keybinding hints to
     existing DF screens, they deliberately use red instead of green for the key.
 
+.. _support:
+
 Getting help
 ============
-There are several support channels available - see `support` for details.
+
+DFHack has several ways to get help online, including:
+
+- The `DFHack Discord server <https://dfhack.org/discord>`__
+- The ``#dfhack`` IRC channel on `Libera <https://libera.chat/>`__
+- GitHub:
+    - for bugs, use the :issue:`issue tracker <>`
+    - for more open-ended questions, use the `discussion board
+      <https://github.com/DFHack/dfhack/discussions>`__. Note that this is a
+      relatively-new feature as of 2021, but maintainers should still be
+      notified of any discussions here.
+- The `DFHack thread on the Bay 12 Forum <https://dfhack.org/bay12>`__
+
+Some additional, but less DFHack-specific, places where questions may be answered include:
+
+- The `/r/dwarffortress <https://dwarffortress.reddit.com>`_ questions thread on Reddit
+- If you are using a starter pack, the relevant thread on the `Bay 12 Forum <http://www.bay12forums.com/smf/index.php?board=2.0>`__ -
+  see the :wiki:`DF Wiki <Utility:Lazy_Newb_Pack>` for a list of these threads
+
+When reaching out to any support channels regarding problems with DFHack, please
+remember to provide enough details for others to identify the issue. For
+instance, specific error messages (copied text or screenshots) are helpful, as
+well as any steps you can follow to reproduce the problem. Sometimes, log output
+from ``stderr.log`` in the DF folder can point to the cause of issues as well.
+
+Some common questions may also be answered in documentation, including:
+
+- This documentation (`online here <https://dfhack.readthedocs.io>`__; search functionality available `here <search>`)
+- :wiki:`The DF wiki <>`
diff --git a/docs/Support.rst b/docs/Support.rst
index 00e055baa..af8bd583c 100644
--- a/docs/Support.rst
+++ b/docs/Support.rst
@@ -1,34 +1,3 @@
-.. _support:
+:orphan:
 
-===============
-Getting Support
-===============
-
-DFHack has several ways to get help online, including:
-
-- The `DFHack Discord server <https://dfhack.org/discord>`__
-- The ``#dfhack`` IRC channel on `Libera <https://libera.chat/>`__
-- GitHub:
-    - for bugs, use the :issue:`issue tracker <>`
-    - for more open-ended questions, use the `discussion board
-      <https://github.com/DFHack/dfhack/discussions>`__. Note that this is a
-      relatively-new feature as of 2021, but maintainers should still be
-      notified of any discussions here.
-- The `DFHack thread on the Bay 12 Forum <https://dfhack.org/bay12>`__
-
-Some additional, but less DFHack-specific, places where questions may be answered include:
-
-- The `/r/dwarffortress <https://dwarffortress.reddit.com>`_ questions thread on Reddit
-- If you are using a starter pack, the relevant thread on the `Bay 12 Forum <http://www.bay12forums.com/smf/index.php?board=2.0>`__ -
-  see the :wiki:`DF Wiki <Utility:Lazy_Newb_Pack>` for a list of these threads
-
-When reaching out to any support channels regarding problems with DFHack, please
-remember to provide enough details for others to identify the issue. For
-instance, specific error messages (copied text or screenshots) are helpful, as
-well as any steps you can follow to reproduce the problem. Sometimes, log output
-from ``stderr.log`` in the DF folder can point to the cause of issues as well.
-
-Some common questions may also be answered in documentation, including:
-
-- This documentation (`online here <https://dfhack.readthedocs.io>`__; search functionality available `here <search>`)
-- :wiki:`The DF wiki <>`
+Please continue to the new `support` page.
diff --git a/index.rst b/index.rst
index 843797e4e..d627267f0 100644
--- a/index.rst
+++ b/index.rst
@@ -27,9 +27,8 @@ User Manual
 
    /docs/Introduction
    /docs/Installing
-   /docs/Support
    /docs/Core
-   /docs/Tags
+   /docs/Categories
    /docs/guides/index
    /docs/index-dev
    /docs/index-about

From 67520258482bdd94729982f05b94ce6db2899f3b Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Fri, 22 Jul 2022 14:38:16 -0700
Subject: [PATCH 281/854] fix up some index links

---
 docs/Core.rst            | 4 ++--
 docs/Dev-intro.rst       | 9 ++++-----
 docs/Memory-research.rst | 2 +-
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/docs/Core.rst b/docs/Core.rst
index f7ba0824b..dd00885d0 100644
--- a/docs/Core.rst
+++ b/docs/Core.rst
@@ -26,7 +26,7 @@ DFHack commands can be implemented in any of three ways:
             more flexible about versions, and easier to distribute.
             Most third-party DFHack addons are scripts.
 
-All tools distributed with DFHack are documented `here <tools-index>`.
+All tools distributed with DFHack are documented `here <genindex>`.
 
 Using DFHack Commands
 =====================
@@ -185,7 +185,7 @@ where ``*`` can be any string, including the empty string.
 A world being loaded can mean a fortress, an adventurer, or legends mode.
 
 These files are best used for non-persistent commands, such as setting
-a `fix <tools-index>` script to run on `repeat`.
+a :dfhack-tag:`fix` script to run on `repeat`.
 
 
 .. _onMapLoad.init:
diff --git a/docs/Dev-intro.rst b/docs/Dev-intro.rst
index 6f46d86c5..09a68a0f9 100644
--- a/docs/Dev-intro.rst
+++ b/docs/Dev-intro.rst
@@ -51,11 +51,10 @@ is more complete and currently better-documented, however. Referring to existing
 scripts as well as the API documentation can be helpful when developing new
 scripts.
 
-`Scripts included in DFHack <tools-index>` live in a separate
-`scripts repository <https://github.com/dfhack/scripts>`_. This can be found in
-the ``scripts`` submodule if you have
-`cloned DFHack <compile-how-to-get-the-code>`, or the ``hack/scripts`` folder
-of an installed copy of DFHack.
+Scripts included in DFHack live in a separate
+:source-scripts:`scripts repository <>`. This can be found in the ``scripts``
+submodule if you have `cloned DFHack <compile-how-to-get-the-code>`, or the
+``hack/scripts`` folder of an installed copy of DFHack.
 
 Core
 ----
diff --git a/docs/Memory-research.rst b/docs/Memory-research.rst
index bc7b45fd7..091f1c8e7 100644
--- a/docs/Memory-research.rst
+++ b/docs/Memory-research.rst
@@ -63,7 +63,7 @@ are not built by default, but can be built by setting the ``BUILD_DEVEL``
 Scripts
 ~~~~~~~
 
-Several `development scripts <tools-index>` can be useful for memory research.
+Several :dfhack-tag:`development tools <dev>` can be useful for memory research.
 These include (but are not limited to):
 
 - `devel/dump-offsets`

From e8ffa55dfe98ecd8003514eada5531fa30d35c03 Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Fri, 22 Jul 2022 15:16:57 -0700
Subject: [PATCH 282/854] use a label instead of a custom role

since I can't seem to figure out how to inject a link to a label via the
role processing code
---
 conf.py                          | 13 +-----------
 docs/Categories.rst              |  4 ++--
 docs/Core.rst                    |  2 +-
 docs/Memory-research.rst         |  2 +-
 docs/Tags.rst                    | 34 ++++++++++++++++----------------
 docs/builtins/alias.rst          |  2 +-
 docs/builtins/cls.rst            |  2 +-
 docs/builtins/devel/dump-rpc.rst |  2 +-
 docs/builtins/die.rst            |  2 +-
 docs/builtins/disable.rst        |  2 +-
 docs/builtins/enable.rst         |  2 +-
 docs/builtins/fpause.rst         |  2 +-
 docs/builtins/help.rst           |  2 +-
 docs/builtins/hide.rst           |  2 +-
 docs/builtins/keybinding.rst     |  2 +-
 docs/builtins/kill-lua.rst       |  2 +-
 docs/builtins/load.rst           |  2 +-
 docs/builtins/ls.rst             |  2 +-
 docs/builtins/plug.rst           |  2 +-
 docs/builtins/reload.rst         |  2 +-
 docs/builtins/sc-script.rst      |  2 +-
 docs/builtins/script.rst         |  2 +-
 docs/builtins/show.rst           |  2 +-
 docs/builtins/tags.rst           |  2 +-
 docs/builtins/type.rst           |  2 +-
 docs/builtins/unload.rst         |  2 +-
 26 files changed, 43 insertions(+), 54 deletions(-)

diff --git a/conf.py b/conf.py
index e80b5a027..854693ad0 100644
--- a/conf.py
+++ b/conf.py
@@ -82,18 +82,7 @@ def dfhack_keybind_role_func(role, rawtext, text, lineno, inliner,
     return [newnode], []
 
 
-# pylint:disable=unused-argument,dangerous-default-value,too-many-arguments
-def dfhack_tag_role_func(role, rawtext, text, lineno, inliner,
-                             options={}, content=[]):
-    """Custom role parser for DFHack tags."""
-    roles.set_classes(options)
-    # TODO: link to generated tag index page
-    newnode = nodes.inline(text, text)
-    return [newnode], []
-
-
 roles.register_canonical_role('dfhack-keybind', dfhack_keybind_role_func)
-roles.register_canonical_role('dfhack-tag', dfhack_tag_role_func)
 
 # -- Autodoc for DFhack plugins and scripts -------------------------------
 
@@ -129,7 +118,7 @@ DOC_ALL_DIRS = doc_all_dirs()
 
 def get_tags():
     tags = []
-    tag_re = re.compile(r'- :dfhack-tag:`([^`]+)`: (.*)')
+    tag_re = re.compile(r'- `tag/([^`]+)`: (.*)')
     with open('docs/Tags.rst') as f:
         lines = f.readlines()
         for line in lines:
diff --git a/docs/Categories.rst b/docs/Categories.rst
index 541f89195..46fc71bdf 100644
--- a/docs/Categories.rst
+++ b/docs/Categories.rst
@@ -4,8 +4,8 @@ Tool categories
 ===============
 
 DFHack tools are grouped to make them easier to find. Note that a tool can
-belong to more than one category. If you'd like to see the full list of tools,
-please refer to the `index <genindex>`.
+belong to more than one category. If you'd like to see the full list of tools
+in one flat list, please refer to the `index <genindex>`.
 
 .. contents:: Contents
   :local:
diff --git a/docs/Core.rst b/docs/Core.rst
index dd00885d0..025e951e6 100644
--- a/docs/Core.rst
+++ b/docs/Core.rst
@@ -185,7 +185,7 @@ where ``*`` can be any string, including the empty string.
 A world being loaded can mean a fortress, an adventurer, or legends mode.
 
 These files are best used for non-persistent commands, such as setting
-a :dfhack-tag:`fix` script to run on `repeat`.
+a `tag/fix` script to run on `repeat`.
 
 
 .. _onMapLoad.init:
diff --git a/docs/Memory-research.rst b/docs/Memory-research.rst
index 091f1c8e7..d9c0833e3 100644
--- a/docs/Memory-research.rst
+++ b/docs/Memory-research.rst
@@ -63,7 +63,7 @@ are not built by default, but can be built by setting the ``BUILD_DEVEL``
 Scripts
 ~~~~~~~
 
-Several :dfhack-tag:`development tools <dev>` can be useful for memory research.
+Several `development tools <tag/dev>` can be useful for memory research.
 These include (but are not limited to):
 
 - `devel/dump-offsets`
diff --git a/docs/Tags.rst b/docs/Tags.rst
index 7afbe0a02..432632ba1 100644
--- a/docs/Tags.rst
+++ b/docs/Tags.rst
@@ -1,19 +1,19 @@
 :orphan:
 
-- :dfhack-tag:`adventure`: Tools that are useful while in adventure mode
-- :dfhack-tag:`fort`: Tools that are useful while in fort mode
-- :dfhack-tag:`legends`: Tools that are useful while in legends mode
-- :dfhack-tag:`items`: Tools that create or modify in-game items
-- :dfhack-tag:`units`: Tools that create or modify units
-- :dfhack-tag:`jobs`: Tools that create or modify jobs
-- :dfhack-tag:`labors`: Tools that deal with labor assignment
-- :dfhack-tag:`auto`: Tools that automatically manage some aspect of your fortress
-- :dfhack-tag:`map`: Map modification
-- :dfhack-tag:`system`: Tools related to working with DFHack commands or the core DFHack library
-- :dfhack-tag:`productivity`: Tools that help you do things that you could do manually, but using the tool is better and faster
-- :dfhack-tag:`animals`: Tools that help you manage animals
-- :dfhack-tag:`fix`: Tools that fix specific bugs
-- :dfhack-tag:`inspection`: Tools that let you inspect game data
-- :dfhack-tag:`buildings`: Tools that help you work wtih placing or configuring buildings and furniture
-- :dfhack-tag:`quickfort`: Tools that are involved in creating and playing back blueprints
-- :dfhack-tag:`dev`: Tools useful for develpers and modders
+- `tag/adventure`: Tools that are useful while in adventure mode
+- `tag/fort`: Tools that are useful while in fort mode
+- `tag/legends`: Tools that are useful while in legends mode
+- `tag/items`: Tools that create or modify in-game items
+- `tag/units`: Tools that create or modify units
+- `tag/jobs`: Tools that create or modify jobs
+- `tag/labors`: Tools that deal with labor assignment
+- `tag/auto`: Tools that automatically manage some aspect of your fortress
+- `tag/map`: Map modification
+- `tag/system`: Tools related to working with DFHack commands or the core DFHack library
+- `tag/productivity`: Tools that help you do things that you could do manually, but using the tool is better and faster
+- `tag/animals`: Tools that help you manage animals
+- `tag/fix`: Tools that fix specific bugs
+- `tag/inspection`: Tools that let you inspect game data
+- `tag/buildings`: Tools that help you work wtih placing or configuring buildings and furniture
+- `tag/quickfort`: Tools that are involved in creating and playing back blueprints
+- `tag/dev`: Tools useful for develpers and modders
diff --git a/docs/builtins/alias.rst b/docs/builtins/alias.rst
index 6de550875..234f8ae4a 100644
--- a/docs/builtins/alias.rst
+++ b/docs/builtins/alias.rst
@@ -1,7 +1,7 @@
 alias
 =====
 
-Tags: :dfhack-tag:`system`
+Tags: `tag/system`
 :dfhack-keybind:`alias`
 
 :index:`Configure helper aliases for other DFHack commands.
diff --git a/docs/builtins/cls.rst b/docs/builtins/cls.rst
index 5c1189951..2f5387c7f 100644
--- a/docs/builtins/cls.rst
+++ b/docs/builtins/cls.rst
@@ -1,7 +1,7 @@
 cls
 ===
 
-Tags: :dfhack-tag:`system`
+Tags: `tag/system`
 :dfhack-keybind:`cls`
 
 :index:`Clear the terminal screen. <cls; Clear the terminal screen.>` Can also
diff --git a/docs/builtins/devel/dump-rpc.rst b/docs/builtins/devel/dump-rpc.rst
index 05f1d4e9e..2f798c79e 100644
--- a/docs/builtins/devel/dump-rpc.rst
+++ b/docs/builtins/devel/dump-rpc.rst
@@ -1,7 +1,7 @@
 devel/dump-rpc
 ==============
 
-Tags: :dfhack-tag:`system`
+Tags: `tag/system`
 :dfhack-keybind:`devel/dump-rpc`
 
 :index:`Write RPC endpoint information to the specified file.
diff --git a/docs/builtins/die.rst b/docs/builtins/die.rst
index c2ea083fd..df53c94bd 100644
--- a/docs/builtins/die.rst
+++ b/docs/builtins/die.rst
@@ -1,7 +1,7 @@
 die
 ===
 
-Tags: :dfhack-tag:`system`
+Tags: `tag/system`
 :dfhack-keybind:`die`
 
 :index:`Instantly exit DF without saving.
diff --git a/docs/builtins/disable.rst b/docs/builtins/disable.rst
index 1e2336545..d17706486 100644
--- a/docs/builtins/disable.rst
+++ b/docs/builtins/disable.rst
@@ -1,7 +1,7 @@
 disable
 =======
 
-Tags: :dfhack-tag:`system`
+Tags: `tag/system`
 :dfhack-keybind:`disable`
 
 :index:`Deactivate a DFHack tool that has some persistent effect.
diff --git a/docs/builtins/enable.rst b/docs/builtins/enable.rst
index 4630c2004..1a714f602 100644
--- a/docs/builtins/enable.rst
+++ b/docs/builtins/enable.rst
@@ -1,7 +1,7 @@
 enable
 ======
 
-Tags: :dfhack-tag:`system`
+Tags: `tag/system`
 :dfhack-keybind:`enable`
 
 :index:`Activate a DFHack tool that has some persistent effect.
diff --git a/docs/builtins/fpause.rst b/docs/builtins/fpause.rst
index 927206e8d..f40f6d55c 100644
--- a/docs/builtins/fpause.rst
+++ b/docs/builtins/fpause.rst
@@ -1,7 +1,7 @@
 fpause
 ======
 
-Tags: :dfhack-tag:`system`
+Tags: `tag/system`
 :dfhack-keybind:`fpause`
 
 :index:`Forces DF to pause. <fpause; Forces DF to pause.>` This is useful when
diff --git a/docs/builtins/help.rst b/docs/builtins/help.rst
index 6249bdbe9..290d62e4c 100644
--- a/docs/builtins/help.rst
+++ b/docs/builtins/help.rst
@@ -1,7 +1,7 @@
 help
 ====
 
-Tags: :dfhack-tag:`system`
+Tags: `tag/system`
 :dfhack-keybind:`help`
 
 :index:`Display help about a command or plugin.
diff --git a/docs/builtins/hide.rst b/docs/builtins/hide.rst
index 3c79f9ff0..e4f91abaa 100644
--- a/docs/builtins/hide.rst
+++ b/docs/builtins/hide.rst
@@ -1,7 +1,7 @@
 hide
 ====
 
-Tags: :dfhack-tag:`system`
+Tags: `tag/system`
 :dfhack-keybind:`hide`
 
 :index:`Hide the DFHack terminal window.
diff --git a/docs/builtins/keybinding.rst b/docs/builtins/keybinding.rst
index 27ab86da6..2ad9e1542 100644
--- a/docs/builtins/keybinding.rst
+++ b/docs/builtins/keybinding.rst
@@ -1,7 +1,7 @@
 keybinding
 ==========
 
-Tags: :dfhack-tag:`system`
+Tags: `tag/system`
 :dfhack-keybind:`keybinding`
 
 :index:`Create hotkeys that will run DFHack commands.
diff --git a/docs/builtins/kill-lua.rst b/docs/builtins/kill-lua.rst
index 3f4bbf3c4..4b93b8734 100644
--- a/docs/builtins/kill-lua.rst
+++ b/docs/builtins/kill-lua.rst
@@ -1,7 +1,7 @@
 kill-lua
 ========
 
-Tags: :dfhack-tag:`system`
+Tags: `tag/system`
 :dfhack-keybind:`kill-lua`
 
 :index:`Gracefully stops any currently-running Lua scripts.
diff --git a/docs/builtins/load.rst b/docs/builtins/load.rst
index 22e8067f3..8e51847dd 100644
--- a/docs/builtins/load.rst
+++ b/docs/builtins/load.rst
@@ -1,7 +1,7 @@
 load
 ====
 
-Tags: :dfhack-tag:`system`
+Tags: `tag/system`
 :dfhack-keybind:`load`
 
 :index:`Load and register a plugin library.
diff --git a/docs/builtins/ls.rst b/docs/builtins/ls.rst
index 775ccfc63..e68b740c7 100644
--- a/docs/builtins/ls.rst
+++ b/docs/builtins/ls.rst
@@ -1,7 +1,7 @@
 ls
 ==
 
-Tags: :dfhack-tag:`system`
+Tags: `tag/system`
 :dfhack-keybind:`ls`
 
 :index:`List available DFHack commands. <ls; List available DFHack commands.>`
diff --git a/docs/builtins/plug.rst b/docs/builtins/plug.rst
index 7dbbf0115..47efe66b3 100644
--- a/docs/builtins/plug.rst
+++ b/docs/builtins/plug.rst
@@ -1,7 +1,7 @@
 plug
 ====
 
-Tags: :dfhack-tag:`system`
+Tags: `tag/system`
 :dfhack-keybind:`plug`
 
 :index:`List available plugins and whether they are enabled.
diff --git a/docs/builtins/reload.rst b/docs/builtins/reload.rst
index a5ab60859..cde113ac8 100644
--- a/docs/builtins/reload.rst
+++ b/docs/builtins/reload.rst
@@ -1,7 +1,7 @@
 reload
 ======
 
-Tags: :dfhack-tag:`system`
+Tags: `tag/system`
 :dfhack-keybind:`reload`
 
 :index:`Reload a loaded plugin. <reload; Reload a loaded plugin.>` Developers
diff --git a/docs/builtins/sc-script.rst b/docs/builtins/sc-script.rst
index feabe4c6f..bcedb610e 100644
--- a/docs/builtins/sc-script.rst
+++ b/docs/builtins/sc-script.rst
@@ -1,7 +1,7 @@
 sc-script
 =========
 
-Tags: :dfhack-tag:`system`
+Tags: `tag/system`
 :dfhack-keybind:`sc-script`
 
 :index:`Run commands when game state changes occur.
diff --git a/docs/builtins/script.rst b/docs/builtins/script.rst
index b83f19171..ef1aab64a 100644
--- a/docs/builtins/script.rst
+++ b/docs/builtins/script.rst
@@ -1,7 +1,7 @@
 script
 ======
 
-Tags: :dfhack-tag:`system`
+Tags: `tag/system`
 :dfhack-keybind:`script`
 
 :index:`Execute a batch file of DFHack commands.
diff --git a/docs/builtins/show.rst b/docs/builtins/show.rst
index e337bbbb6..b22d4bab9 100644
--- a/docs/builtins/show.rst
+++ b/docs/builtins/show.rst
@@ -1,7 +1,7 @@
 show
 ====
 
-Tags: :dfhack-tag:`system`
+Tags: `tag/system`
 :dfhack-keybind:`show`
 
 :index:`Unhides the DFHack terminal window.
diff --git a/docs/builtins/tags.rst b/docs/builtins/tags.rst
index cc5c86a4b..b601a73a1 100644
--- a/docs/builtins/tags.rst
+++ b/docs/builtins/tags.rst
@@ -1,7 +1,7 @@
 tags
 ====
 
-Tags: :dfhack-tag:`system`
+Tags: `tag/system`
 :dfhack-keybind:`tags`
 
 :index:`List the strings that DFHack tools can be tagged with.
diff --git a/docs/builtins/type.rst b/docs/builtins/type.rst
index 33ef7562f..755548da9 100644
--- a/docs/builtins/type.rst
+++ b/docs/builtins/type.rst
@@ -1,7 +1,7 @@
 type
 ====
 
-Tags: :dfhack-tag:`system`
+Tags: `tag/system`
 :dfhack-keybind:`type`
 
 :index:`Describe how a command is implemented.
diff --git a/docs/builtins/unload.rst b/docs/builtins/unload.rst
index 3d1575c20..1fc8c311e 100644
--- a/docs/builtins/unload.rst
+++ b/docs/builtins/unload.rst
@@ -1,7 +1,7 @@
 unload
 ======
 
-Tags: :dfhack-tag:`system`
+Tags: `tag/system`
 :dfhack-keybind:`unload`
 
 :index:`Unload a plugin from memory. <unload; Unload a plugin from memory.>`

From f9c8d36e0357b2f6f48eba1db9fb87bedf4d44d8 Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Fri, 22 Jul 2022 15:21:16 -0700
Subject: [PATCH 283/854] mark the generated index as an orphan

---
 conf.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/conf.py b/conf.py
index 854693ad0..b36e8aaad 100644
--- a/conf.py
+++ b/conf.py
@@ -135,12 +135,11 @@ def get_open_mode():
 def generate_tag_indices():
     os.makedirs('docs/tags', mode=0o755, exist_ok=True)
     with open('docs/tags/index.rst', get_open_mode()) as topidx:
-        #topidx.write(':orphan:\n\n')
+        topidx.write(':orphan:\n\n')
         for tag_tuple in get_tags():
             tag = tag_tuple[0]
             with open(('docs/tags/{name}.rst').format(name=tag),
                       get_open_mode()) as tagidx:
-                #tagidx.write(':orphan:\n\n')
                 tagidx.write('TODO: add links to the tools that have this tag')
             topidx.write(('.. _tag/{name}:\n\n').format(name=tag))
             topidx.write(('{name}\n').format(name=tag))

From 47af2ef396c175beedf1bf90ea5c2d737a719494 Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Fri, 22 Jul 2022 15:28:09 -0700
Subject: [PATCH 284/854] exclude the generated included tags/ files

---
 conf.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/conf.py b/conf.py
index b36e8aaad..b2c5b3008 100644
--- a/conf.py
+++ b/conf.py
@@ -295,6 +295,7 @@ exclude_patterns = [
     'build*',
     'depends/*',
     'docs/html/*',
+    'docs/tags/*',
     'docs/text/*',
     'docs/builtins/*',
     'docs/plugins/*',

From 93923e12f4a74c2dc0dc7e220e65569fe4266901 Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Fri, 22 Jul 2022 15:31:58 -0700
Subject: [PATCH 285/854] no need to mark the included file as an orphan

---
 conf.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/conf.py b/conf.py
index b2c5b3008..814c7c2cb 100644
--- a/conf.py
+++ b/conf.py
@@ -135,7 +135,6 @@ def get_open_mode():
 def generate_tag_indices():
     os.makedirs('docs/tags', mode=0o755, exist_ok=True)
     with open('docs/tags/index.rst', get_open_mode()) as topidx:
-        topidx.write(':orphan:\n\n')
         for tag_tuple in get_tags():
             tag = tag_tuple[0]
             with open(('docs/tags/{name}.rst').format(name=tag),

From 19a49059337b56bfcea47e4c4f3a364c91ebee79 Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Fri, 22 Jul 2022 16:42:36 -0700
Subject: [PATCH 286/854] update docs for "c" plugins

---
 docs/plugins/changeitem.rst     |  5 ++-
 docs/plugins/changelayer.rst    |  9 +++--
 docs/plugins/changevein.rst     |  9 +++--
 docs/plugins/clean.rst          | 37 ------------------
 docs/plugins/cleanconst.rst     | 11 +++---
 docs/plugins/cleaners.rst       | 46 +++++++++++++++++++++++
 docs/plugins/cleanowned.rst     | 11 +++---
 docs/plugins/command-prompt.rst | 19 ++++++----
 docs/plugins/confirm.rst        | 22 +++++++----
 docs/plugins/createitem.rst     | 66 +++++++++++++++++----------------
 docs/plugins/cromulate.rst      | 14 ++++---
 docs/plugins/cursecheck.rst     | 66 ++++++++++++++++++++-------------
 docs/plugins/spotclean.rst      | 14 -------
 plugins/changelayer.cpp         |  2 +-
 plugins/changevein.cpp          |  2 +-
 plugins/cleaners.cpp            |  4 +-
 plugins/command-prompt.cpp      |  9 ++---
 plugins/confirm.cpp             |  9 +----
 plugins/createitem.cpp          | 25 ++-----------
 plugins/cromulate.cpp           |  4 +-
 plugins/cursecheck.cpp          |  5 ++-
 21 files changed, 199 insertions(+), 190 deletions(-)
 delete mode 100644 docs/plugins/clean.rst
 create mode 100644 docs/plugins/cleaners.rst
 delete mode 100644 docs/plugins/spotclean.rst

diff --git a/docs/plugins/changeitem.rst b/docs/plugins/changeitem.rst
index 0a841511c..5dd537a60 100644
--- a/docs/plugins/changeitem.rst
+++ b/docs/plugins/changeitem.rst
@@ -4,8 +4,9 @@ changeitem
 Tags:
 :dfhack-keybind:
 
-Allows changing item material and base quality. By default, a change is only
-allowed if the existing and desired item materials are of the same subtype
+:index:`Change item material and base quality.
+<changeitem; Change item material and base quality.>` By default, a change is
+only allowed if the existing and desired item materials are of the same subtype
 (for example wood -> wood, stone -> stone, etc). But since some transformations
 work pretty well and may be desired you can override this with ``force``. Note
 that forced changes can possibly result in items that crafters and haulers
diff --git a/docs/plugins/changelayer.rst b/docs/plugins/changelayer.rst
index 535409e90..76d631cdf 100644
--- a/docs/plugins/changelayer.rst
+++ b/docs/plugins/changelayer.rst
@@ -4,10 +4,11 @@ changelayer
 Tags:
 :dfhack-keybind:
 
-Change the material of an entire geology layer. Note that one layer can stretch
-across many z-levels, and changes to the geology layer will affect all
-surrounding regions, not just your embark! Mineral veins and gem clusters will
-not be affected. Use `changevein` if you want to modify those.
+:index:`Change the material of an entire geology layer.
+<changelayer; Change the material of an entire geology layer.>` Note that one
+layer can stretch across many z-levels, and changes to the geology layer will
+affect all surrounding regions, not just your embark! Mineral veins and gem
+clusters will not be affected. Use `changevein` if you want to modify those.
 
 tl;dr: You will end up with changing large areas in one go, especially if you
 use it in lower z levels. Use this command with care!
diff --git a/docs/plugins/changevein.rst b/docs/plugins/changevein.rst
index f4871772e..7de94a3f0 100644
--- a/docs/plugins/changevein.rst
+++ b/docs/plugins/changevein.rst
@@ -4,10 +4,11 @@ changevein
 Tags:
 :dfhack-keybind:
 
-Changes the material of a mineral inclusion. You can change it to any incorganic
-material RAW id. Note that this command only affects tiles within the current
-16x16 block - for large veins and clusters, you will need to use this command
-multiple times.
+:index:`Change the material of a mineral inclusion.
+<changevein; Change the material of a mineral inclusion.>` You can change it to
+any incorganic material RAW id. Note that this command only affects tiles within
+the current 16x16 block - for large veins and clusters, you will need to use
+this command multiple times.
 
 You can use the `probe` command to discover the material RAW ids for existing
 veins that you want to duplicate.
diff --git a/docs/plugins/clean.rst b/docs/plugins/clean.rst
deleted file mode 100644
index 54421ce91..000000000
--- a/docs/plugins/clean.rst
+++ /dev/null
@@ -1,37 +0,0 @@
-clean
-=====
-
-Tags:
-:dfhack-keybind:
-
-Removes contaminants from tiles, items, and units. More specifically, it
-cleans all the splatter that get scattered all over the map and that clings to
-your items and units. In an old fortress, this can significantly reduce FPS lag.
-It can also spoil your !!FUN!!, so think before you use it.
-
-Usage::
-
-    clean all|map|items|units|plants [<options>]
-
-By default, cleaning the map leaves mud and snow alone. Note that cleaning units
-includes hostiles, and that cleaning items removes poisons from weapons.
-
-Options
--------
-
-When cleaning the map, you can specify extra options for extra cleaning:
-
-- ``mud``
-    Also remove mud.
-- ``item``
-    Also remove item spatter, like fallen leaves and flowers.
-- ``snow``
-    Also remove snow coverings.
-
-Examples
---------
-
-- ``clean all``
-    Clean everything that can be cleaned (except mud and snow).
-- ``clean all mud item snow``
-    Removes all spatter, including mud, leaves, and snow from map tiles.
diff --git a/docs/plugins/cleanconst.rst b/docs/plugins/cleanconst.rst
index c34bac6bf..286069b63 100644
--- a/docs/plugins/cleanconst.rst
+++ b/docs/plugins/cleanconst.rst
@@ -2,12 +2,13 @@ cleanconst
 ==========
 
 Tags:
-:dfhack-keybind:
+:dfhack-keybind:`cleanconst`
 
-Cleans up construction materials. This tool alters all constructions on the map
-so that they spawn their building component when they are disassembled, allowing
-their actual build items to be safely deleted. This can improve FPS when you
-have many constructions on the map.
+:index:`Cleans up construction materials.
+<cleanconst; Cleans up construction materials.>` This tool alters all
+constructions on the map so that they spawn their building component when they
+are disassembled, allowing their actual build items to be safely deleted. This
+can improve FPS when you have many constructions on the map.
 
 Usage::
 
diff --git a/docs/plugins/cleaners.rst b/docs/plugins/cleaners.rst
new file mode 100644
index 000000000..b290a73a4
--- /dev/null
+++ b/docs/plugins/cleaners.rst
@@ -0,0 +1,46 @@
+cleaners
+========
+
+Tags:
+:dfhack-keybind:`clean`
+:dfhack-keybind:`spotclean`
+
+:index:`Removes contaminants from tiles, items, and units.
+<clean; Removes contaminants from tiles, items, and units.>` More specifically,
+it cleans all the splatter that get scattered all over the map and that clings
+to your items and units. In an old fortress, this can significantly reduce FPS
+lag. It can also spoil your !!FUN!!, so think before you use it.
+
+Usage::
+
+    clean all|map|items|units|plants [<options>]
+    spotclean
+
+By default, cleaning the map leaves mud and snow alone. Note that cleaning units
+includes hostiles, and that cleaning items removes poisons from weapons.
+
+``spotclean`` works like ``clean map snow mud``,
+:index:`removing all contaminants from the tile under the cursor.
+<clean; Remove all contaminants from the tile under the cursor.>` This is ideal
+if you just want to clean a specific tile but don't want the `clean` command to
+remove all the glorious blood from your entranceway.
+
+Options
+-------
+
+When cleaning the map, you can specify extra options for extra cleaning:
+
+- ``mud``
+    Also remove mud.
+- ``item``
+    Also remove item spatter, like fallen leaves and flowers.
+- ``snow``
+    Also remove snow coverings.
+
+Examples
+--------
+
+- ``clean all``
+    Clean everything that can be cleaned (except mud and snow).
+- ``clean all mud item snow``
+    Removes all spatter, including mud, leaves, and snow from map tiles.
diff --git a/docs/plugins/cleanowned.rst b/docs/plugins/cleanowned.rst
index 27e4806a2..e827989c9 100644
--- a/docs/plugins/cleanowned.rst
+++ b/docs/plugins/cleanowned.rst
@@ -2,12 +2,13 @@ cleanowned
 ==========
 
 Tags:
-:dfhack-keybind:
+:dfhack-keybind:`cleanowned`
 
-Confiscates and dumps garbage owned by dwarves. This tool gets dwarves to give
-up ownership of scattered items and items with heavy wear and then marks those
-items for dumping. Now you can finally get your dwarves to give up their rotten
-food and tattered loincloths and go get new ones!
+:index:`Confiscates and dumps garbage owned by dwarves.
+<cleanowned; Confiscates and dumps garbage owned by dwarves.>` This tool gets
+dwarves to give up ownership of scattered items and items with heavy wear and
+then marks those items for dumping. Now you can finally get your dwarves to give
+up their rotten food and tattered loincloths and go get new ones!
 
 Usage::
 
diff --git a/docs/plugins/command-prompt.rst b/docs/plugins/command-prompt.rst
index 061b405ef..6e3d2a829 100644
--- a/docs/plugins/command-prompt.rst
+++ b/docs/plugins/command-prompt.rst
@@ -1,16 +1,21 @@
 command-prompt
 ==============
-An in-game DFHack terminal, where you can enter other commands.
 
+Tags:
 :dfhack-keybind:`command-prompt`
 
-Usage: ``command-prompt [entry]``
+:index:`An in-game DFHack terminal, where you can enter other commands.
+<command-prompt; An in-game DFHack terminal, where you can enter other commands.>`
 
-If called with an entry, it starts with that text filled in.
-Most useful for developers, who can set a keybinding to open
-a laungage interpreter for lua or Ruby by starting with the
-`:lua <lua>` or `:rb <rb>` commands.
+Usage::
 
-Otherwise somewhat similar to `gui/quickcmd`.
+    command-prompt [entry]
+
+If called with parameters, it starts with that text in the command edit area.
+This is most useful for developers, who can set a keybinding to open a laungage
+interpreter for lua or Ruby by starting with the `:lua <lua>` or `:rb <rb>`
+portions of the command already filled in.
+
+Also see `gui/quickcmd` for a different take on running commands from the UI.
 
 .. image:: ../images/command-prompt.png
diff --git a/docs/plugins/confirm.rst b/docs/plugins/confirm.rst
index c7fb89bb0..25cc04956 100644
--- a/docs/plugins/confirm.rst
+++ b/docs/plugins/confirm.rst
@@ -1,12 +1,20 @@
 confirm
 =======
-Implements several confirmation dialogs for potentially destructive actions
-(for example, seizing goods from traders or deleting hauling routes).
+
+Tags:
+:dfhack-keybind:`confirm`
+
+:index:`Adds confirmation dialogs for destructive actions.
+<confirm; Adds confirmation dialogs for destructive actions.>` Now you can get
+the chance to avoid seizing goods from traders or deleting a hauling route in
+case you hit the key accidentally.
 
 Usage:
 
-:enable confirm:    Enable all confirmations; alias ``confirm enable all``.
-                    Replace with ``disable`` to disable.
-:confirm help:      List available confirmation dialogues.
-:confirm enable option1 [option2...]:
-                    Enable (or disable) specific confirmation dialogues.
+- ``enable confirm``, ``confirm enable all``
+    Enable all confirmation options. Replace with ``disable`` to disable all.
+- ``confirm enable option1 [option2...]``
+    Enable (or ``disable``) specific confirmation dialogs.
+
+When run without parameters, ``confirm`` will report which confirmation dialogs
+are currently enabled.
diff --git a/docs/plugins/createitem.rst b/docs/plugins/createitem.rst
index f37154f80..13ecc2e58 100644
--- a/docs/plugins/createitem.rst
+++ b/docs/plugins/createitem.rst
@@ -1,48 +1,52 @@
 createitem
 ==========
-Allows creating new items of arbitrary types and made of arbitrary materials. A
-unit must be selected in-game to use this command. By default, items created are
-spawned at the feet of the selected unit.
 
-Specify the item and material information as you would indicate them in
-custom reaction raws, with the following differences:
+Tags:
+:dfhack-keybind:`createitem`
+
+:index:`Create arbitrary items. <createitem; Create arbitrary items.>` You can
+create new items of any type and made of any material. A unit must be selected
+in-game to use this command. By default, items created are spawned at the feet
+of the selected unit.
+
+Specify the item and material information as you would indicate them in custom
+reaction raws, with the following differences:
 
 * Separate the item and material with a space rather than a colon
 * If the item has no subtype, the ``:NONE`` can be omitted
-* If the item is ``REMAINS``, ``FISH``, ``FISH_RAW``, ``VERMIN``, ``PET``, or ``EGG``,
-  specify a ``CREATURE:CASTE`` pair instead of a material token.
+* If the item is ``REMAINS``, ``FISH``, ``FISH_RAW``, ``VERMIN``, ``PET``, or
+  ``EGG``, then specify a ``CREATURE:CASTE`` pair instead of a material token.
 * If the item is a ``PLANT_GROWTH``, specify a ``PLANT_ID:GROWTH_ID`` pair
   instead of a material token.
 
 Corpses, body parts, and prepared meals cannot be created using this tool.
 
-To obtain the item and material tokens of an existing item, run
-``createitem inspect``. Its output can be passed directly as arguments to
-``createitem`` to create new matching items, as long as the item type is
-supported.
-
-Examples:
-
-* Create 2 pairs of steel gauntlets::
+Usage:
 
-    createitem GLOVES:ITEM_GLOVES_GAUNTLETS INORGANIC:STEEL 2
+- ``createitem <item> <material> [<count>]``
+    Create <count> copies (default is 1) of the specified item made out of the
+    specified material.
+- ``createitem inspect``
+    Obtain the item and material tokens of an existing item. Its output can be
+    used directly as arguments to ``createitem`` to create new matching items
+    (as long as the item type is supported).
+- ``createitem floor|item|building``
+    Subsequently created items will be placed on the floor beneath the selected
+    unit's, inside the selected item, or as part of the selected building.
 
-* Create tower-cap logs::
+.. note::
 
-    createitem WOOD PLANT_MAT:TOWER_CAP:WOOD
+    ``createitem building`` is good for loading traps, but if you use it with
+    workshops, you will have to deconstruct the workshop to access the item.
 
-* Create bilberries::
-
-    createitem PLANT_GROWTH BILBERRY:FRUIT
-
-For more examples, :wiki:`see this wiki page <Utility:DFHack/createitem>`.
-
-To change where new items are placed, first run the command with a
-destination type while an appropriate destination is selected.
+Examples:
 
-Options:
+- ``createitem GLOVES:ITEM_GLOVES_GAUNTLETS INORGANIC:STEEL 2``
+    Create 2 pairs of steel gauntlets (that is, 2 left gauntlets and 2 right
+    gauntlets).
+- ``createitem WOOD PLANT_MAT:TOWER_CAP:WOOD 100``
+    Create 100 tower-cap logs.
+- ``createitem PLANT_GROWTH BILBERRY:FRUIT``
+    Create a single bilberry.
 
-:floor:     Subsequent items will be placed on the floor beneath the selected unit's feet.
-:item:      Subsequent items will be stored inside the currently selected item.
-:building:  Subsequent items will become part of the currently selected building.
-            Good for loading traps; do not use with workshops (or deconstruct to use the item).
+For more examples, :wiki:`the wiki <Utility:DFHack/createitem>`.
diff --git a/docs/plugins/cromulate.rst b/docs/plugins/cromulate.rst
index ca07ae0ca..b025fe877 100644
--- a/docs/plugins/cromulate.rst
+++ b/docs/plugins/cromulate.rst
@@ -1,12 +1,14 @@
 cromulate
 =========
 
-Tags: productivity, unit, adventure
+Tags: `tag/productivity`, `tag/unit`, `tag/adventure`
 :dfhack-keybind:`cromulate`
 
-Collects all widgets into a frobozz electric cromufiler. You might want to do
-this if you discover that your widgets have become decromulated. It is safe to
-run this command periodically even if you are unsure if that's the case.
+:index:`Collects all widgets into a frobozz electric cromufiler.
+<cromulate; Collects all widgets into a frobozz electric cromufiler.>` You might
+want to do this if you discover that your widgets have become decromulated. It
+is safe to run this command periodically even if you are unsure if that's the
+case.
 
 Usage::
 
@@ -18,9 +20,9 @@ collect those under the cursor.
 
 Options:
 
-:``-d``, ``--destroy``:
+- ``-d``, ``--destroy``
     Destroy the widgets instead of collecting them into the cromufiler.
-:``-q``, ``--quiet``:
+- ``-q``, ``--quiet``
     Don't display any informational output. Errors will still be printed to the
     console.
 
diff --git a/docs/plugins/cursecheck.rst b/docs/plugins/cursecheck.rst
index 1bf1803fa..79da6d621 100644
--- a/docs/plugins/cursecheck.rst
+++ b/docs/plugins/cursecheck.rst
@@ -1,42 +1,56 @@
 cursecheck
 ==========
-Checks a single map tile or the whole map/world for cursed creatures (ghosts,
-vampires, necromancers, werebeasts, zombies).
 
-With an active in-game cursor only the selected tile will be observed.
-Without a cursor the whole map will be checked.
+Tags:
+:dfhack-keybind:`cursecheck`
 
-By default cursed creatures will be only counted in case you just want to find
-out if you have any of them running around in your fort. Dead and passive
-creatures (ghosts who were put to rest, killed vampires, ...) are ignored.
-Undead skeletons, corpses, bodyparts and the like are all thrown into the curse
-category "zombie". Anonymous zombies and resurrected body parts will show
-as "unnamed creature".
+:index:`Check for cursed creatures. <cursecheck; Check for cursed creatures.>`
+This command checks a single map tile (or the whole map/world) for cursed
+creatures (ghosts, vampires, necromancers, werebeasts, zombies, etc.).
+
+With an active in-game cursor, only the selected tile will be checked. Without a
+cursor, the whole map will be checked.
+
+By default, you will just see the count of cursed creatures in case you just
+want to find out if you have any of them running around in your fort. Dead and
+passive creatures (ghosts who were put to rest, killed vampires, etc.) are
+ignored. Undead skeletons, corpses, bodyparts and the like are all thrown into
+the curse category "zombie". Anonymous zombies and resurrected body parts will
+show as "unnamed creature".
+
+Usage::
+
+   cursecheck [<options>]
 
 Options:
 
-:detail:      Print full name, date of birth, date of curse and some status
-              info (some vampires might use fake identities in-game, though).
-:ids:         Print the creature and race IDs.
-:nick:        Set the type of curse as nickname (does not always show up
-              in-game, some vamps don't like nicknames).
-:all:         Include dead and passive cursed creatures (can result in a quite
-              long list after having FUN with necromancers).
-:verbose:     Print all curse tags (if you really want to know it all).
+- ``detail``
+   Print full name, date of birth, date of curse, and some status info (some
+   vampires might use fake identities in-game, though).
+- ``nick``
+   Set the type of curse as nickname (does not always show up in-game; some
+   vamps don't like nicknames).
+- ``ids``
+   Print the creature and race IDs.
+- ``all``
+   Include dead and passive cursed creatures (this can result in quite a long
+   list after having !!FUN!! with necromancers).
+- ``verbose``
+   Print all curse tags (if you really want to know it all).
 
 Examples:
 
-``cursecheck detail all``
-   Give detailed info about all cursed creatures including deceased ones (no
-   in-game cursor).
-``cursecheck nick``
-   Give a nickname all living/active cursed creatures on the map(no in-game
-   cursor).
+- ``cursecheck``
+   Display a count of cursed creatures on the map (or under the cursor).
+- ``cursecheck detail all``
+   Give detailed info about all cursed creatures including deceased ones.
+- ``cursecheck nick``
+   Give a nickname all living/active cursed creatures.
 
 .. note::
 
     If you do a full search (with the option "all") former ghosts will show up
     with the cursetype "unknown" because their ghostly flag is not set.
 
-    Please report any living/active creatures with cursetype "unknown" -
-    this is most likely with mods which introduce new types of curses.
+    If you see any living/active creatures with a cursetype of "unknown", then
+    it is most likely a new type of curse introduced by a mod.
diff --git a/docs/plugins/spotclean.rst b/docs/plugins/spotclean.rst
deleted file mode 100644
index dcad047a4..000000000
--- a/docs/plugins/spotclean.rst
+++ /dev/null
@@ -1,14 +0,0 @@
-spotclean
-=========
-
-Tags:
-:dfhack-keybind:
-
-Cleans a map tile of contaminants and spatter. It works like
-``clean map snow mud``, but only for the tile under the cursor. Ideal if you
-just want to clean a specific tile but don't want the `clean` command to remove
-all the glorious blood from your entranceway.
-
-Usage::
-
-    spotclean
diff --git a/plugins/changelayer.cpp b/plugins/changelayer.cpp
index 347f29b95..7520ac932 100644
--- a/plugins/changelayer.cpp
+++ b/plugins/changelayer.cpp
@@ -37,7 +37,7 @@ DFhackCExport command_result plugin_init ( color_ostream &out, std::vector <Plug
 {
     commands.push_back(PluginCommand(
         "changelayer",
-        "Change a whole geology layer.",
+        "Change the material of an entire geology layer.",
         changelayer));
     return CR_OK;
 }
diff --git a/plugins/changevein.cpp b/plugins/changevein.cpp
index 48a1e7325..f531ca256 100644
--- a/plugins/changevein.cpp
+++ b/plugins/changevein.cpp
@@ -85,7 +85,7 @@ command_result df_changevein (color_ostream &out, vector <string> & parameters)
 DFhackCExport command_result plugin_init ( color_ostream &out, std::vector <PluginCommand> &commands)
 {
     commands.push_back(PluginCommand("changevein",
-        "Changes the material of a mineral inclusion.",
+        "Change the material of a mineral inclusion.",
         df_changevein));
     return CR_OK;
 }
diff --git a/plugins/cleaners.cpp b/plugins/cleaners.cpp
index 7389488f1..00075e9d7 100644
--- a/plugins/cleaners.cpp
+++ b/plugins/cleaners.cpp
@@ -242,11 +242,11 @@ DFhackCExport command_result plugin_init ( color_ostream &out, std::vector <Plug
 {
     commands.push_back(PluginCommand(
         "clean",
-        "Remove contaminants from tiles, items and creatures.",
+        "Remove contaminants from tiles, items, and creatures.",
         clean));
     commands.push_back(PluginCommand(
         "spotclean",
-        "Cleans map tile under cursor.",
+        "Clean the map tile under the cursor.",
         spotclean,Gui::cursor_hotkey));
     return CR_OK;
 }
diff --git a/plugins/command-prompt.cpp b/plugins/command-prompt.cpp
index ba2fe0e87..1994d66b5 100644
--- a/plugins/command-prompt.cpp
+++ b/plugins/command-prompt.cpp
@@ -344,11 +344,10 @@ bool hotkey_allow_all(df::viewscreen *top)
 DFhackCExport command_result plugin_init(color_ostream &out, std::vector <PluginCommand> &commands)
 {
     commands.push_back(PluginCommand(
-                "command-prompt", "Shows a command prompt on window.",
-                show_prompt, hotkey_allow_all,
-                "command-prompt [entry] - shows a cmd prompt in df window."
-                " Entry is used for default prefix (e.g. ':lua')"
-        ));
+                "command-prompt",
+                "An in-game DFHack terminal.",
+                show_prompt,
+                hotkey_allow_all));
     return CR_OK;
 }
 
diff --git a/plugins/confirm.cpp b/plugins/confirm.cpp
index 32da4e1f8..5cef6376f 100644
--- a/plugins/confirm.cpp
+++ b/plugins/confirm.cpp
@@ -547,13 +547,8 @@ DFhackCExport command_result plugin_init (color_ostream &out, vector <PluginComm
         return CR_FAILURE;
     commands.push_back(PluginCommand(
         "confirm",
-        "Confirmation dialogs",
-        df_confirm,
-        false, //allow non-interactive use
-
-        "  confirm enable|disable option|all ...\n"
-        "  confirm help|status\n"
-    ));
+        "Add confirmation dialogs for destructive actions.",
+        df_confirm));
     return CR_OK;
 }
 
diff --git a/plugins/createitem.cpp b/plugins/createitem.cpp
index ffc2e1ca8..09c6d8e20 100644
--- a/plugins/createitem.cpp
+++ b/plugins/createitem.cpp
@@ -48,27 +48,10 @@ command_result df_createitem (color_ostream &out, vector <string> & parameters);
 
 DFhackCExport command_result plugin_init (color_ostream &out, std::vector<PluginCommand> &commands)
 {
-    commands.push_back(PluginCommand("createitem", "Create arbitrary items.", df_createitem, false,
-        "Syntax: createitem <item> <material> [count]\n"
-        "    <item> - Item token for what you wish to create, as specified in custom\n"
-        "             reactions. If the item has no subtype, omit the :NONE.\n"
-        "    <material> - The material you want the item to be made of, as specified\n"
-        "                 in custom reactions. For REMAINS, FISH, FISH_RAW, VERMIN,\n"
-        "                 PET, and EGG, replace this with a creature ID and caste.\n"
-        "                 For PLANT_GROWTH, replace this with a plant ID and growth ID.\n"
-        "    [count] - How many of the item you wish to create.\n"
-        "\n"
-        "To obtain the item and material of an existing item, run \n"
-        "'createitem inspect' with that item selected in-game.\n"
-        "\n"
-        "To use this command, you must select which unit will create the items.\n"
-        "By default, items created will be placed at that unit's feet.\n"
-        "To change this, run 'createitem <destination>'.\n"
-        "Valid destinations:\n"
-        "* floor - Place items on floor beneath maker's feet.\n"
-        "* item - Place items inside selected container.\n"
-        "* building - Place items inside selected building.\n"
-    ));
+    commands.push_back(
+        PluginCommand("createitem",
+                      "Create arbitrary items.",
+                      df_createitem));
     return CR_OK;
 }
 
diff --git a/plugins/cromulate.cpp b/plugins/cromulate.cpp
index 9f7fdb9f9..7ed9ed115 100644
--- a/plugins/cromulate.cpp
+++ b/plugins/cromulate.cpp
@@ -13,9 +13,7 @@ command_result cromulate (color_ostream &out, std::vector <std::string> & parame
 DFhackCExport command_result plugin_init (color_ostream &out, std::vector <PluginCommand> &commands) {
     commands.push_back(PluginCommand("cromulate",
                                      "in-cpp plugin short desc", //to use one line in the ``[DFHack]# ls`` output
-                                     cromulate,
-                                     false,
-                                     "in-cpp plugin long help"));
+                                     cromulate));
     return CR_OK;
 }
 
diff --git a/plugins/cursecheck.cpp b/plugins/cursecheck.cpp
index d20c645ab..007c81228 100644
--- a/plugins/cursecheck.cpp
+++ b/plugins/cursecheck.cpp
@@ -79,9 +79,10 @@ command_result cursecheck (color_ostream &out, vector <string> & parameters);
 
 DFhackCExport command_result plugin_init ( color_ostream &out, std::vector <PluginCommand> &commands)
 {
-    commands.push_back(PluginCommand("cursecheck",
+    commands.push_back(PluginCommand(
+        "cursecheck",
         "Check for cursed creatures (undead, necromancers...)",
-        cursecheck, false ));
+        cursecheck));
     return CR_OK;
 }
 

From 65b3ce6e9698abbb2e634f72fcf15ab926f84ddc Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Fri, 22 Jul 2022 17:45:23 -0700
Subject: [PATCH 287/854] remove unattached docs and plugins

---
 docs/plugins/alltraffic.rst  |  11 --
 docs/plugins/autobutcher.rst |  91 ----------
 docs/plugins/autonestbox.rst |  19 ---
 docs/plugins/digcircle.rst   |  35 ----
 docs/plugins/digexp.rst      |  31 ----
 docs/plugins/digtype.rst     |  19 ---
 plugins/dfstream.cpp         | 316 -----------------------------------
 7 files changed, 522 deletions(-)
 delete mode 100644 docs/plugins/alltraffic.rst
 delete mode 100644 docs/plugins/autobutcher.rst
 delete mode 100644 docs/plugins/autonestbox.rst
 delete mode 100644 docs/plugins/digcircle.rst
 delete mode 100644 docs/plugins/digexp.rst
 delete mode 100644 docs/plugins/digtype.rst
 delete mode 100644 plugins/dfstream.cpp

diff --git a/docs/plugins/alltraffic.rst b/docs/plugins/alltraffic.rst
deleted file mode 100644
index 1e9116954..000000000
--- a/docs/plugins/alltraffic.rst
+++ /dev/null
@@ -1,11 +0,0 @@
-alltraffic
-==========
-Set traffic designations for every single tile of the map - useful for resetting
-traffic designations.  See also `filltraffic`, `restrictice`, and `restrictliquids`.
-
-Options:
-
-:H:     High Traffic
-:N:     Normal Traffic
-:L:     Low Traffic
-:R:     Restricted Traffic
diff --git a/docs/plugins/autobutcher.rst b/docs/plugins/autobutcher.rst
deleted file mode 100644
index d761cbdbe..000000000
--- a/docs/plugins/autobutcher.rst
+++ /dev/null
@@ -1,91 +0,0 @@
-autobutcher
-===========
-Assigns lifestock for slaughter once it reaches a specific count. Requires that
-you add the target race(s) to a watch list. Only tame units will be processed.
-
-Units will be ignored if they are:
-
-* Nicknamed (for custom protection; you can use the `rename` ``unit`` tool
-  individually, or `zone` ``nick`` for groups)
-* Caged, if and only if the cage is defined as a room (to protect zoos)
-* Trained for war or hunting
-
-Creatures who will not reproduce (because they're not interested in the
-opposite sex or have been gelded) will be butchered before those who will.
-Older adults and younger children will be butchered first if the population
-is above the target (default 1 male, 5 female kids and adults).  Note that
-you may need to set a target above 1 to have a reliable breeding population
-due to asexuality etc.  See `fix-ster` if this is a problem.
-
-Options:
-
-:example:      Print some usage examples.
-:start:        Start running every X frames (df simulation ticks).
-               Default: X=6000, which would be every 60 seconds at 100fps.
-:stop:         Stop running automatically.
-:sleep <x>:    Changes the timer to sleep X frames between runs.
-:watch R:      Start watching a race. R can be a valid race RAW id (ALPACA,
-               BIRD_TURKEY, etc) or a list of ids seperated by spaces or
-               the keyword 'all' which affects all races on your current
-               watchlist.
-:unwatch R:    Stop watching race(s). The current target settings will be
-               remembered. R can be a list of ids or the keyword 'all'.
-:forget R:     Stop watching race(s) and forget it's/their target settings.
-               R can be a list of ids or the keyword 'all'.
-:autowatch:    Automatically adds all new races (animals you buy from merchants,
-               tame yourself or get from migrants) to the watch list using
-               default target count.
-:noautowatch:  Stop auto-adding new races to the watchlist.
-:list:         Print the current status and watchlist.
-:list_export:  Print the commands needed to set up status and watchlist,
-               which can be used to import them to another save (see notes).
-:target <fk> <mk> <fa> <ma> <R>:
-               Set target count for specified race(s).  The first four arguments
-               are the number of female and male kids, and female and male adults.
-               R can be a list of spceies ids, or the keyword ``all`` or ``new``.
-               ``R = 'all'``: change target count for all races on watchlist
-               and set the new default for the future. ``R = 'new'``: don't touch
-               current settings on the watchlist, only set the new default
-               for future entries.
-:list_export:  Print the commands required to rebuild your current settings.
-
-.. note::
-
-    Settings and watchlist are stored in the savegame, so that you can have
-    different settings for each save. If you want to copy your watchlist to
-    another savegame you must export the commands required to recreate your settings.
-
-    To export, open an external terminal in the DF directory, and run
-    ``dfhack-run autobutcher list_export > filename.txt``.  To import, load your
-    new save and run ``script filename.txt`` in the DFHack terminal.
-
-
-Examples:
-
-You want to keep max 7 kids (4 female, 3 male) and max 3 adults (2 female,
-1 male) of the race alpaca. Once the kids grow up the oldest adults will get
-slaughtered. Excess kids will get slaughtered starting with the youngest
-to allow that the older ones grow into adults. Any unnamed cats will
-be slaughtered as soon as possible. ::
-
-     autobutcher target 4 3 2 1 ALPACA BIRD_TURKEY
-     autobutcher target 0 0 0 0 CAT
-     autobutcher watch ALPACA BIRD_TURKEY CAT
-     autobutcher start
-
-Automatically put all new races onto the watchlist and mark unnamed tame units
-for slaughter as soon as they arrive in your fort. Settings already made
-for specific races will be left untouched. ::
-
-     autobutcher target 0 0 0 0 new
-     autobutcher autowatch
-     autobutcher start
-
-Stop watching the races alpaca and cat, but remember the target count
-settings so that you can use 'unwatch' without the need to enter the
-values again. Note: 'autobutcher unwatch all' works, but only makes sense
-if you want to keep the plugin running with the 'autowatch' feature or manually
-add some new races with 'watch'. If you simply want to stop it completely use
-'autobutcher stop' instead. ::
-
-    autobutcher unwatch ALPACA CAT
diff --git a/docs/plugins/autonestbox.rst b/docs/plugins/autonestbox.rst
deleted file mode 100644
index f19cad42c..000000000
--- a/docs/plugins/autonestbox.rst
+++ /dev/null
@@ -1,19 +0,0 @@
-autonestbox
-===========
-Assigns unpastured female egg-layers to nestbox zones. Requires that you create
-pen/pasture zones above nestboxes. If the pen is bigger than 1x1 the nestbox
-must be in the top left corner. Only 1 unit will be assigned per pen, regardless
-of the size. The age of the units is currently not checked, most birds grow up
-quite fast. Egglayers who are also grazers will be ignored, since confining them
-to a 1x1 pasture is not a good idea. Only tame and domesticated own units are
-processed since pasturing half-trained wild egglayers could destroy your neat
-nestbox zones when they revert to wild. When called without options autonestbox
-will instantly run once.
-
-Options:
-
-:start:        Start running every X frames (df simulation ticks).
-               Default: X=6000, which would be every 60 seconds at 100fps.
-:stop:         Stop running automatically.
-:sleep:        Must be followed by number X. Changes the timer to sleep X
-               frames between runs.
diff --git a/docs/plugins/digcircle.rst b/docs/plugins/digcircle.rst
deleted file mode 100644
index fc31b65df..000000000
--- a/docs/plugins/digcircle.rst
+++ /dev/null
@@ -1,35 +0,0 @@
-digcircle
-=========
-A command for easy designation of filled and hollow circles.
-It has several types of options.
-
-Shape:
-
-:hollow:   Set the circle to hollow (default)
-:filled:   Set the circle to filled
-:#:        Diameter in tiles (default = 0, does nothing)
-
-Action:
-
-:set:      Set designation (default)
-:unset:    Unset current designation
-:invert:   Invert designations already present
-
-Designation types:
-
-:dig:      Normal digging designation (default)
-:ramp:     Ramp digging
-:ustair:   Staircase up
-:dstair:   Staircase down
-:xstair:   Staircase up/down
-:chan:     Dig channel
-
-After you have set the options, the command called with no options
-repeats with the last selected parameters.
-
-Examples:
-
-``digcircle filled 3``
-        Dig a filled circle with diameter = 3.
-``digcircle``
-        Do it again.
diff --git a/docs/plugins/digexp.rst b/docs/plugins/digexp.rst
deleted file mode 100644
index e4412d051..000000000
--- a/docs/plugins/digexp.rst
+++ /dev/null
@@ -1,31 +0,0 @@
-digexp
-======
-This command is for :wiki:`exploratory mining <Exploratory_mining>`.
-
-There are two variables that can be set: pattern and filter.
-
-Patterns:
-
-:diag5:            diagonals separated by 5 tiles
-:diag5r:           diag5 rotated 90 degrees
-:ladder:           A 'ladder' pattern
-:ladderr:          ladder rotated 90 degrees
-:clear:            Just remove all dig designations
-:cross:            A cross, exactly in the middle of the map.
-
-Filters:
-
-:all:              designate whole z-level
-:hidden:           designate only hidden tiles of z-level (default)
-:designated:       Take current designation and apply pattern to it.
-
-After you have a pattern set, you can use ``expdig`` to apply it again.
-
-Examples:
-
-``expdig diag5 hidden``
-  Designate the diagonal 5 patter over all hidden tiles
-``expdig``
-  Apply last used pattern and filter
-``expdig ladder designated``
-  Take current designations and replace them with the ladder pattern
diff --git a/docs/plugins/digtype.rst b/docs/plugins/digtype.rst
deleted file mode 100644
index 1c2d49eaa..000000000
--- a/docs/plugins/digtype.rst
+++ /dev/null
@@ -1,19 +0,0 @@
-digtype
-=======
-For every tile on the map of the same vein type as the selected tile,
-this command designates it to have the same designation as the
-selected tile. If the selected tile has no designation, they will be
-dig designated.
-If an argument is given, the designation of the selected tile is
-ignored, and all appropriate tiles are set to the specified
-designation.
-
-Options:
-
-:dig:
-:channel:
-:ramp:
-:updown: up/down stairs
-:up:     up stairs
-:down:   down stairs
-:clear:  clear designation
diff --git a/plugins/dfstream.cpp b/plugins/dfstream.cpp
deleted file mode 100644
index eb98c181b..000000000
--- a/plugins/dfstream.cpp
+++ /dev/null
@@ -1,316 +0,0 @@
-#include "Core.h"
-#include "Console.h"
-#include "Export.h"
-#include "PluginManager.h"
-
-#include "DataDefs.h"
-#include "df/graphic.h"
-#include "df/enabler.h"
-#include "df/renderer.h"
-
-#include <vector>
-#include <string>
-#include "PassiveSocket.h"
-#include "tinythread.h"
-
-using namespace DFHack;
-using namespace df::enums;
-
-using std::string;
-using std::vector;
-
-DFHACK_PLUGIN("dfstream");
-REQUIRE_GLOBAL(gps);
-REQUIRE_GLOBAL(enabler);
-
-// Owns the thread that accepts TCP connections and forwards messages to clients;
-// has a mutex
-class client_pool {
-    typedef tthread::mutex mutex;
-
-    mutex clients_lock;
-    std::vector<CActiveSocket *> clients;
-
-    // TODO - delete this at some point
-    tthread::thread * accepter;
-
-    static void accept_clients(void * client_pool_pointer) {
-        client_pool * p = reinterpret_cast<client_pool *>(client_pool_pointer);
-        CPassiveSocket socket;
-        socket.Initialize();
-        if (socket.Listen((const uint8_t *)"0.0.0.0", 8008)) {
-            std::cout << "Listening on a socket" << std::endl;
-        } else {
-            std::cout << "Not listening: " << socket.GetSocketError() << std::endl;
-            std::cout << socket.DescribeError() << std::endl;
-        }
-        while (true) {
-            CActiveSocket * client = socket.Accept();
-            if (client != 0) {
-                lock l(*p);
-                p->clients.push_back(client);
-            }
-        }
-    }
-
-public:
-    class lock {
-        tthread::lock_guard<mutex> l;
-    public:
-        lock(client_pool & p)
-            : l(p.clients_lock)
-        {
-        }
-    };
-    friend class client_pool::lock;
-
-    client_pool() {
-        accepter = new tthread::thread(accept_clients, this);
-    }
-
-    // MUST have lock
-    bool has_clients() {
-        return !clients.empty();
-    }
-
-    // MUST have lock
-    void add_client(CActiveSocket * sock) {
-        clients.push_back(sock);
-    }
-
-    // MUST have lock
-    void broadcast(const std::string & message) {
-        unsigned int sz = htonl(message.size());
-        for (size_t i = 0; i < clients.size(); ++i) {
-            clients[i]->Send(reinterpret_cast<const uint8_t *>(&sz), sizeof(sz));
-            clients[i]->Send((const uint8_t *) message.c_str(), message.size());
-        }
-    }
-};
-
-// A decorator (in the design pattern sense) of the DF renderer class.
-// Sends the screen contents to a client_pool.
-class renderer_decorator : public df::renderer {
-    // the renderer we're decorating
-    df::renderer * inner;
-
-    // how many frames have passed since we last sent a frame
-    int framesNotPrinted;
-
-    // set to false in the destructor
-    bool * alive;
-
-    // clients to which we send the frame
-    client_pool clients;
-
-    // The following three methods facilitate copying of state to the inner object
-    void set_to_null() {
-        screen = NULL;
-        screentexpos = NULL;
-        screentexpos_addcolor = NULL;
-        screentexpos_grayscale = NULL;
-        screentexpos_cf = NULL;
-        screentexpos_cbr = NULL;
-        screen_old = NULL;
-        screentexpos_old = NULL;
-        screentexpos_addcolor_old = NULL;
-        screentexpos_grayscale_old = NULL;
-        screentexpos_cf_old = NULL;
-        screentexpos_cbr_old = NULL;
-    }
-
-    void copy_from_inner() {
-        screen = inner->screen;
-        screentexpos = inner->screentexpos;
-        screentexpos_addcolor = inner->screentexpos_addcolor;
-        screentexpos_grayscale = inner->screentexpos_grayscale;
-        screentexpos_cf = inner->screentexpos_cf;
-        screentexpos_cbr = inner->screentexpos_cbr;
-        screen_old = inner->screen_old;
-        screentexpos_old = inner->screentexpos_old;
-        screentexpos_addcolor_old = inner->screentexpos_addcolor_old;
-        screentexpos_grayscale_old = inner->screentexpos_grayscale_old;
-        screentexpos_cf_old = inner->screentexpos_cf_old;
-        screentexpos_cbr_old = inner->screentexpos_cbr_old;
-    }
-
-    void copy_to_inner() {
-        inner->screen = screen;
-        inner->screentexpos = screentexpos;
-        inner->screentexpos_addcolor = screentexpos_addcolor;
-        inner->screentexpos_grayscale = screentexpos_grayscale;
-        inner->screentexpos_cf = screentexpos_cf;
-        inner->screentexpos_cbr = screentexpos_cbr;
-        inner->screen_old = screen_old;
-        inner->screentexpos_old = screentexpos_old;
-        inner->screentexpos_addcolor_old = screentexpos_addcolor_old;
-        inner->screentexpos_grayscale_old = screentexpos_grayscale_old;
-        inner->screentexpos_cf_old = screentexpos_cf_old;
-        inner->screentexpos_cbr_old = screentexpos_cbr_old;
-    }
-
-public:
-    renderer_decorator(df::renderer * inner, bool * alive)
-        : inner(inner)
-        , framesNotPrinted(0)
-        , alive(alive)
-    {
-        copy_from_inner();
-    }
-    virtual void update_tile(int x, int y) {
-        copy_to_inner();
-        inner->update_tile(x, y);
-    }
-    virtual void update_all() {
-        copy_to_inner();
-        inner->update_all();
-    }
-    virtual void render() {
-        copy_to_inner();
-        inner->render();
-
-        ++framesNotPrinted;
-        int gfps = enabler->calculated_gfps;
-        if (gfps == 0) gfps = 1;
-        // send a frame roughly every 128 mibiseconds (1 second = 1024 mibiseconds)
-        if ((framesNotPrinted * 1024) / gfps <= 128) return;
-
-        client_pool::lock lock(clients);
-        if (!clients.has_clients()) return;
-        framesNotPrinted = 0;
-        std::stringstream frame;
-        frame << gps->dimx << ' ' << gps->dimy << " 0 0 " << gps->dimx << ' ' << gps->dimy << '\n';
-        unsigned char * sc_ = gps->screen;
-        for (int y = 0; y < gps->dimy; ++y) {
-            unsigned char * sc = sc_;
-            for (int x = 0; x < gps->dimx; ++x) {
-                unsigned char ch   = sc[0];
-                unsigned char bold = (sc[3] != 0) * 8;
-                unsigned char translate[] =
-                { 0, 4, 2, 6, 1, 5, 3, 7, 8, 12, 10, 14, 9, 13, 11, 15 };
-                unsigned char fg   = translate[(sc[1] + bold) % 16];
-                unsigned char bg   = translate[sc[2] % 16]*16;
-                frame.put(ch);
-                frame.put(fg+bg);
-                sc += 4*gps->dimy;
-            }
-            sc_ += 4;
-        }
-        clients.broadcast(frame.str());
-    }
-    virtual void set_fullscreen() { inner->set_fullscreen(); }
-    virtual void zoom(df::zoom_commands cmd) {
-        copy_to_inner();
-        inner->zoom(cmd);
-    }
-    virtual void resize(int w, int h) {
-        copy_to_inner();
-        inner->resize(w, h);
-        copy_from_inner();
-    }
-    virtual void grid_resize(int w, int h) {
-        copy_to_inner();
-        inner->grid_resize(w, h);
-        copy_from_inner();
-    }
-    virtual ~renderer_decorator() {
-        *alive = false;
-        if (inner) {
-            copy_to_inner();
-            delete inner;
-            inner = 0;
-        }
-        set_to_null();
-    }
-    virtual bool get_mouse_coords(int *x, int *y) { return inner->get_mouse_coords(x, y); }
-    virtual bool uses_opengl() { return inner->uses_opengl(); }
-
-    static renderer_decorator * hook(df::renderer *& ptr, bool * alive) {
-        renderer_decorator * r = new renderer_decorator(ptr, alive);
-        ptr = r;
-        return r;
-    }
-
-    static void unhook(df::renderer *& ptr, renderer_decorator * dec, color_ostream & out) {
-        dec->copy_to_inner();
-        ptr = dec->inner;
-        dec->inner = 0;
-        delete dec;
-    }
-};
-
-inline df::renderer *& active_renderer() {
-    return enabler->renderer;
-}
-
-// This class is a smart pointer around a renderer_decorator.
-// It should only be assigned r_d pointers that use the alive-pointer of this
-// instance.
-// If the r_d has been deleted by an external force, this smart pointer doesn't
-// redelete it.
-class auto_renderer_decorator {
-    renderer_decorator * p;
-public:
-    // pass this member to the ctor of renderer_decorator
-    bool alive;
-
-    auto_renderer_decorator()
-        : p(0)
-    {
-    }
-
-    ~auto_renderer_decorator() {
-        reset();
-    }
-
-    void reset() {
-        if (*this) {
-            delete p;
-            p = 0;
-        }
-    }
-
-    operator bool() {
-        return (p != 0) && alive;
-    }
-
-    auto_renderer_decorator & operator=(renderer_decorator *p) {
-        reset();
-        this->p = p;
-        return *this;
-    }
-
-    renderer_decorator * get() {
-        return p;
-    }
-
-    renderer_decorator * operator->() {
-        return get();
-    }
-};
-
-auto_renderer_decorator decorator;
-
-DFhackCExport command_result plugin_init ( color_ostream &out, vector <PluginCommand> &commands)
-{
-    if (!df::renderer::_identity.can_instantiate())
-    {
-        out.printerr("Cannot allocate a renderer\n");
-        return CR_OK;
-    }
-    if (!decorator) {
-        decorator = renderer_decorator::hook(active_renderer(), &decorator.alive);
-    }
-    return CR_OK;
-}
-
-DFhackCExport command_result plugin_shutdown ( color_ostream &out )
-{
-    if (decorator && active_renderer() == decorator.get())
-    {
-        renderer_decorator::unhook(active_renderer(), decorator.get(), out);
-    }
-    decorator.reset();
-    return CR_OK;
-}
-// vim:set sw=4 sts=4 et:

From 0858b95c408a07318b17e0e8ad1b84c3cfc9f104 Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Fri, 22 Jul 2022 17:45:48 -0700
Subject: [PATCH 288/854] print help from helpdb on CR_WRONG_USAGE

---
 library/Core.cpp          | 6 +++++-
 library/PluginManager.cpp | 2 --
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/library/Core.cpp b/library/Core.cpp
index 9b4b065a1..12675054c 100644
--- a/library/Core.cpp
+++ b/library/Core.cpp
@@ -1197,7 +1197,11 @@ command_result Core::runCommand(color_ostream &con, const std::string &first_, v
     else
     {
         res = plug_mgr->InvokeCommand(con, first, parts);
-        if(res == CR_NOT_IMPLEMENTED)
+        if (res == CR_WRONG_USAGE)
+        {
+            help_helper(con, first);
+        }
+        else if (res == CR_NOT_IMPLEMENTED)
         {
             string completed;
             string filename = findScript(first + ".lua");
diff --git a/library/PluginManager.cpp b/library/PluginManager.cpp
index a1b1bd293..223abfeac 100644
--- a/library/PluginManager.cpp
+++ b/library/PluginManager.cpp
@@ -503,8 +503,6 @@ command_result Plugin::invoke(color_ostream &out, const std::string & command, s
                 {
                     cr = cmd.function(out, parameters);
                 }
-                if (cr == CR_WRONG_USAGE && !cmd.usage.empty())
-                    out << "Usage:\n" << cmd.usage << flush;
                 break;
             }
         }

From 0f3811b93393bb754c6c558140f7d2c9e40e7c64 Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Fri, 22 Jul 2022 17:46:11 -0700
Subject: [PATCH 289/854] update debugfilter docs

---
 docs/plugins/debug.rst | 149 ++++++++++++++++++-----------------------
 plugins/debug.cpp      | 121 +++++----------------------------
 2 files changed, 81 insertions(+), 189 deletions(-)

diff --git a/docs/plugins/debug.rst b/docs/plugins/debug.rst
index 2bef7d28a..331e675ab 100644
--- a/docs/plugins/debug.rst
+++ b/docs/plugins/debug.rst
@@ -1,89 +1,72 @@
 debug
 =====
-Manager for DFHack runtime debug prints. Debug prints are grouped by plugin name,
-category name and print level. Levels are ``trace``, ``debug``, ``info``,
-``warning`` and ``error``.
+
+Tags:
+:dfhack-keybind:`debugfilter`
+
+:index:`Configure verbosity of DFHack debug output.
+<debugfilter; Configure verbosity of DFHack debug output.>` Debug output is
+grouped by plugin name, category name, and verbosity level.
+
+The verbosity levels are:
+
+- ``Trace``
+    Possibly very noisy messages which can be printed many times per second.
+- ``Debug``
+    Messages that happen often but they should happen only a couple of times per
+    second.
+- ``Info``
+    Important state changes that happen rarely during normal execution.
+- ``Warning``
+    Enabled by default. Shows warnings about unexpected events which code
+    managed to handle correctly.
+- ``Error``
+    Enabled by default. Shows errors which code can't handle without user
+    intervention.
 
 The runtime message printing is controlled using filters. Filters set the
-visible messages of all matching categories. Matching uses regular expression syntax,
-which allows listing multiple alternative matches or partial name matches.
-This syntax is a C++ version of the ECMA-262 grammar (Javascript regular expressions).
-Details of differences can be found at
+visible messages of all matching categories. Matching uses regular expression
+syntax, which allows listing multiple alternative matches or partial name
+matches. This syntax is a C++ version of the ECMA-262 grammar (Javascript
+regular expressions). Details of differences can be found at
 https://en.cppreference.com/w/cpp/regex/ecmascript
 
-Persistent filters are stored in ``dfhack-config/runtime-debug.json``.
-Oldest filters are applied first. That means a newer filter can override the
-older printing level selection.
-
-Usage: ``debugfilter [subcommand] [parameters...]``
-
-The following subcommands are supported:
-
-help
-----
-Give overall help or a detailed help for a subcommand.
-
-Usage: ``debugfilter help [subcommand]``
-
-category
---------
-List available debug plugin and category names.
-
-Usage: ``debugfilter category [plugin regex] [category regex]``
-
-The list can be filtered using optional regex parameters. If filters aren't
-given then the it uses ``"."`` regex which matches any character. The regex
-parameters are good way to test regex before passing them to ``set``.
-
-filter
-------
-List active and passive debug print level changes.
-
-Usage: ``debugfilter filter [id]``
-
-Optional ``id`` parameter is the id listed as first column in the filter list.
-If id is given then the command shows information for the given filter only in
-multi line format that is better format if filter has long regex.
-
-set
----
-Creates a new debug filter to set category printing levels.
-
-Usage: ``debugfilter set [level] [plugin regex] [category regex]``
-
-Adds a filter that will be deleted when DF process exists or plugin is unloaded.
-
-Usage: ``debugfilter set persistent [level] [plugin regex] [category regex]``
-
-Stores the filter in the configuration file to until ``unset`` is used to remove
-it.
-
-Level is the minimum debug printing level to show in log.
-
-* ``trace``: Possibly very noisy messages which can be printed many times per second
-
-* ``debug``: Messages that happen often but they should happen only a couple of times per second
-
-* ``info``: Important state changes that happen rarely during normal execution
-
-* ``warning``: Enabled by default. Shows warnings about unexpected events which code managed to handle correctly.
-
-* ``error``: Enabled by default. Shows errors which code can't handle without user intervention.
-
-unset
------
-Delete a space separated list of filters
-
-Usage: ``debugfilter unset [id...]``
-
-disable
--------
-Disable a space separated list of filters but keep it in the filter list
-
-Usage: ``debugfilter disable [id...]``
-
-enable
-------
-Enable a space sperate list of filters
-
-Usage: ``debugfilter enable [id...]``
+Persistent filters are stored in ``dfhack-config/runtime-debug.json``. Oldest
+filters are applied first. That means a newer filter can override the older
+printing level selection.
+
+Usage:
+
+- ``debugfilter category [<plugin regex>] [<category regex>]``
+    List available debug plugin and category names. If filters aren't givenm
+    then all plugins/categories are matched. This command is a good way to test
+    regex parameters before you pass them to ``set``.
+- ``debugfilter filter [<id>]``
+    List active and passive debug print level changes. The optional ``id``
+    parameter is the id listed as first column in the filter list. If ``id`` is
+    given, then the command shows extended information for the given filter
+    only.
+- ``debugfilter set [<level>] [<plugin regex>] [<category regex>]``
+    Create a new debug filter to set category verbosity levels. This filter
+    will not be saved when the DF process exists or the plugin is unloaded.
+- ``debugfilter set persistent [<level>] [<plugin regex>] [<category regex>]``
+    Store the filter in the configuration file to until ``unset`` is used to
+    remove it.
+- ``debugfilter unset <id> [<id> ...]``
+    Delete a space separated list of filters.
+- ``debugfilter disable <id> [<id> ...]``
+    Disable a space separated list of filters but keep it in the filter list.
+- ``debugfilter enable <id> [<id> ...]``
+    Enable a space sperate list of filters.
+- ``debugfilter header [enable] | [disable] [<element> ...]``
+    Control which header metadata is shown along with each log message. Run it
+    without parameters to see the list of configurable elements. Include an
+    ``enable`` or ``disable``  keyword to change whether specific elements are
+    shown.
+
+Examples:
+
+- ``debugfilter set Warning core script``
+    Hide script execution log messages (e.g. "Loading script:
+    dfhack-config/dfhack.init"), which are normally output at Info verbosity
+    in the "core" plugin with the "script" category.
diff --git a/plugins/debug.cpp b/plugins/debug.cpp
index 4fbc48759..f4a22b8d1 100644
--- a/plugins/debug.cpp
+++ b/plugins/debug.cpp
@@ -104,85 +104,13 @@ JsonArchive& operator>>(JsonArchive& ar, const serialization::nvp<T>& target)
 static constexpr auto defaultRegex =
     std::regex::optimize | std::regex::nosubs | std::regex::collate;
 
-static const char* const commandHelp =
-    "  Manage runtime debug print filters.\n"
-    "\n"
-    "  debugfilter category [<plugin regex> [<category regex>]]\n"
-    "    List categories matching regular expressions.\n"
-    "  debugfilter filter [<filter id>]\n"
-    "    List active filters or show detailed information for a filter.\n"
-    "  debugfilter set [persistent] <level> [<plugin regex> [<category regex>]]\n"
-    "    Set a filter level to categories matching regular expressions.\n"
-    "  debugfilter unset <filter id> [<filter id> ...]\n"
-    "    Unset filters matching space separated list of ids from 'filter'.\n"
-    "  debugfilter disable <filter id> [<filter id> ...]\n"
-    "    Disable filters matching space separated list of ids from 'filter'.\n"
-    "  debugfilter enable <filter id> [<filter id> ...]\n"
-    "    Enable filters matching space separated list of ids from 'filter'.\n"
-    "  debugfilter header [enable] | [disable] [<element> ...]\n"
-    "    Control which header metadata is shown along with each log message.\n"
-    "  debugfilter help [<subcommand>]\n"
-    "    Show detailed help for a command or this help.\n";
-static const char* const commandCategory =
-    "  category [<plugin regex> [<category regex>]]\n"
-    "    List categories with optional filters. Parameters are passed to\n"
-    "    std::regex to limit which once are shown. The first regular\n"
-    "    expression is used to match the category and the second is used\n"
-    "    to match the plugin name.\n";
-static const char* const commandSet =
-    "  set [persistent] <level> [<plugin regex> [<category regex>]]\n"
-    "    Set filtering level for matching categories. 'level' must be one of\n"
-    "    trace, debug, info, warning and error. The 'level' parameter sets\n"
-    "    the lowest message level that will be shown. The command doesn't\n"
-    "    allow filters to disable any error messages.\n"
-    "    Default filter life time is until Dwarf Fortress process exists or\n"
-    "    plugin is unloaded. Passing 'persistent' as second parameter tells\n"
-    "    the plugin to store the filter to dfhack-config. Stored filters\n"
-    "    will be active until always when the plugin is loaded. 'unset'\n"
-    "    command can be used to remove persistent filters.\n"
-    "    Filters are applied FIFO order. The latest filter will override any\n"
-    "    older filter that also matches.\n";
-static const char* const commandFilters =
-    "  filter [<filter id>]\n"
-    "    Show the list of active filters. The first column is 'id' which can\n"
-    "    be used to deactivate filters using 'unset' command.\n"
-    "    Filters are printed in same order as applied - the oldest first.\n";
-static const char* const commandUnset =
-    "  unset <filter id> [<filter id> ...]\n"
-    "    'unset' takes space separated list of filter ids from 'filter'.\n"
-    "    It will reset any matching category back to the default 'warning'\n"
-    "    level or any other still active matching filter level.\n";
-static const char* const commandDisable =
-    "  disable <filter id> [<filter id> ...]\n"
-    "    'disable' takes space separated list of filter ids from 'filter'.\n"
-    "    It will reset any matching category back to the default 'warning'\n"
-    "    level or any other still active matching filter level.\n"
-    "    'disable' will print red filters that were already disabled.\n";
-static const char* const commandEnable =
-    "  enable <filter id> [<filter id> ...]\n"
-    "    'enable' takes space separated list of filter ids from 'filter'.\n"
-    "    It will reset any matching category back to the default 'warning'\n"
-    "    level or any other still active matching filter level.\n"
-    "    'enable' will print red filters that were already enabled.\n";
-static const char* const commandHeader =
-    "  header [enable] | [disable] [<element> ...]\n"
-    "    'header' allows you to customize what metadata is displayed with\n"
-    "    each log message. Run it without parameters to see the list of\n"
-    "    configurable elements. Include an 'enable' or 'disable' keyword to\n"
-    "    change specific elements.\n";
-static const char* const commandHelpDetails =
-    "  help [<subcommand>]\n"
-    "    Show help for any of subcommands. Without any parameters it shows\n"
-    "    short help for all subcommands.\n";
-
 //! Helper type to hold static dispatch table for subcommands
 struct CommandDispatch {
     //! Store handler function pointer and help message for commands
     struct Command {
         using handler_t = command_result(*)(color_ostream&,std::vector<std::string>&);
-        Command(handler_t handler, const char* help) :
-            handler_(handler),
-            help_(help)
+        Command(handler_t handler) :
+            handler_(handler)
         {}
 
         command_result operator()(color_ostream& out,
@@ -193,12 +121,8 @@ struct CommandDispatch {
 
         handler_t handler() const noexcept
         { return handler_; }
-
-        const char* help() const noexcept
-        { return help_; }
     private:
         handler_t handler_;
-        const char* help_;
     };
     using dispatch_t = const std::map<std::string, Command>;
     //! Name to handler function and help message mapping
@@ -1125,28 +1049,14 @@ static command_result configureHeader(color_ostream& out,
 
 using DFHack::debugPlugin::CommandDispatch;
 
-static command_result printHelp(color_ostream& out,
-        std::vector<std::string>& parameters)
-{
-    const char* help = commandHelp;
-    auto iter = CommandDispatch::dispatch.end();
-    if (1u < parameters.size())
-        iter = CommandDispatch::dispatch.find(parameters[1]);
-    if (iter != CommandDispatch::dispatch.end())
-        help = iter->second.help();
-    out << help << std::flush;
-    return CR_OK;
-}
-
 CommandDispatch::dispatch_t CommandDispatch::dispatch {
-    {"category", {listCategories,commandCategory}},
-    {"filter", {listFilters,commandFilters}},
-    {"set", {setFilter,commandSet}},
-    {"unset", {unsetFilter,commandUnset}},
-    {"enable", {enableFilter,commandEnable}},
-    {"disable", {disableFilter,commandDisable}},
-    {"header", {configureHeader,commandHeader}},
-    {"help", {printHelp,commandHelpDetails}},
+    {"category", {listCategories}},
+    {"filter", {listFilters}},
+    {"set", {setFilter}},
+    {"unset", {unsetFilter}},
+    {"enable", {enableFilter}},
+    {"disable", {disableFilter}},
+    {"header", {configureHeader}},
 };
 
 //! Dispatch command handling to the subcommand or help
@@ -1156,13 +1066,14 @@ static command_result commandDebugFilter(color_ostream& out,
     DEBUG(command,out).print("debugfilter %s, parameter count %zu\n",
             parameters.size() > 0 ? parameters[0].c_str() : "",
             parameters.size());
-    auto handler = printHelp;
     auto iter = CommandDispatch::dispatch.end();
     if (0u < parameters.size())
         iter = CommandDispatch::dispatch.find(parameters[0]);
-    if (iter != CommandDispatch::dispatch.end())
-        handler = iter->second.handler();
-    return (handler)(out, parameters);
+    if (iter != CommandDispatch::dispatch.end()) {
+        iter->second.handler()(out, parameters);
+        return CR_OK;
+    }
+    return CR_WRONG_USAGE;
 }
 
 } } /* namespace debug */
@@ -1173,9 +1084,7 @@ DFhackCExport DFHack::command_result plugin_init(DFHack::color_ostream& out,
     commands.emplace_back(
             "debugfilter",
             "Manage runtime debug print filters",
-            DFHack::debugPlugin::commandDebugFilter,
-            false,
-            DFHack::debugPlugin::commandHelp);
+            DFHack::debugPlugin::commandDebugFilter);
     auto& filMan = DFHack::debugPlugin::FilterManager::getInstance();
     DFHack::command_result rv = DFHack::CR_OK;
     if ((rv = filMan.loadConfig(out)) != DFHack::CR_OK)

From 675f2edee2ef414089c8076fec8041c3124fcd3d Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Fri, 22 Jul 2022 17:46:22 -0700
Subject: [PATCH 290/854] update deramp docs

---
 docs/plugins/deramp.rst | 15 +++++++++++----
 plugins/deramp.cpp      | 12 +++++-------
 2 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/docs/plugins/deramp.rst b/docs/plugins/deramp.rst
index a6b944381..7489e506e 100644
--- a/docs/plugins/deramp.rst
+++ b/docs/plugins/deramp.rst
@@ -1,6 +1,13 @@
 deramp
 ======
-Removes all ramps designated for removal from the map. This is useful for
-replicating the old channel digging designation.  It also removes any and
-all 'down ramps' that can remain after a cave-in (you don't have to designate
-anything for that to happen).
+
+Tags:
+:dfhack-keybind:`deramp`
+
+:index:`Removes all ramps designated for removal from the map.
+<deramp; Removes all ramps designated for removal from the map.>` It also
+removes any "floating" down ramps that can remain after a cave-in.
+
+Usage::
+
+    deramp
diff --git a/plugins/deramp.cpp b/plugins/deramp.cpp
index 62679cae0..1c397242b 100644
--- a/plugins/deramp.cpp
+++ b/plugins/deramp.cpp
@@ -109,13 +109,11 @@ command_result df_deramp (color_ostream &out, vector <string> & parameters)
 
 DFhackCExport command_result plugin_init ( color_ostream &out, std::vector <PluginCommand> &commands)
 {
-    commands.push_back(PluginCommand(
-        "deramp", "Replace all ramps marked for removal with floors.",
-        df_deramp, false,
-        "  If there are any ramps designated for removal, they will be instantly\n"
-        "  removed. Any ramps that don't have their counterpart will also be removed\n"
-        "  (fixes bugs with caveins)\n"
-    ));
+    commands.push_back(
+        PluginCommand(
+            "deramp",
+            "Removes all ramps designated for removal from the map.",
+            df_deramp));
     return CR_OK;
 }
 

From 4cb57d25f1fe89012c0d54ad7aa0dee24cde8aff Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Fri, 22 Jul 2022 17:46:33 -0700
Subject: [PATCH 291/854] update dig-now docs

---
 docs/plugins/dig-now.rst | 42 +++++++++++++++++++++-------------------
 plugins/dig-now.cpp      | 23 ++++++----------------
 plugins/lua/dig-now.lua  | 31 -----------------------------
 3 files changed, 28 insertions(+), 68 deletions(-)

diff --git a/docs/plugins/dig-now.rst b/docs/plugins/dig-now.rst
index b6f4d64f7..4628f10f5 100644
--- a/docs/plugins/dig-now.rst
+++ b/docs/plugins/dig-now.rst
@@ -1,10 +1,15 @@
 dig-now
 =======
 
-Instantly completes non-marker dig designations, modifying tile shapes and
-creating boulders, ores, and gems as if a miner were doing the mining or
-engraving. By default, the entire map is processed and boulder generation
-follows standard game rules, but the behavior is configurable.
+Tags:
+:dfhack-keybind:`dig-now`
+
+:index:`Instantly complete dig designations.
+<dig-now; Instantly complete dig designations.>` This tool will magically
+complete non-marker dig designations, modifying tile shapes and creating
+boulders, ores, and gems as if a miner were doing the mining or engraving. By
+default, the entire map is processed and boulder generation follows standard
+game rules, but the behavior is configurable.
 
 Note that no units will get mining or engraving experience for the dug/engraved
 tiles.
@@ -25,37 +30,34 @@ that coordinate is processed.
 
 Any ``<pos>`` parameters can either be an ``<x>,<y>,<z>`` triple (e.g.
 ``35,12,150``) or the string ``here``, which means the position of the active
-game cursor should be used.
+game cursor should be used. You can use the `position` command to get the
+current cursor position if you need it.
 
 Examples:
 
-``dig-now``
+- ``dig-now``
     Dig designated tiles according to standard game rules.
-
-``dig-now --clean``
-    Dig designated tiles, but don't generate any boulders, ores, or gems.
-
-``dig-now --dump here``
-    Dig tiles and dump all generated boulders, ores, and gems at the tile under
-    the game cursor.
+- ``dig-now --clean``
+    Dig all designated tiles, but don't generate any boulders, ores, or gems.
+- ``dig-now --dump here``
+    Dig tiles and teleport all generated boulders, ores, and gems to the tile
+    under the game cursor.
 
 Options:
 
-:``-c``, ``--clean``:
+- ``-c``, ``--clean``
     Don't generate any boulders, ores, or gems. Equivalent to
     ``--percentages 0,0,0,0``.
-:``-d``, ``--dump <pos>``:
+- ``-d``, ``--dump <pos>``
     Dump any generated items at the specified coordinates. If the tile at those
     coordinates is open space or is a wall, items will be generated on the
     closest walkable tile below.
-:``-e``, ``--everywhere``:
+- ``-e``, ``--everywhere``
     Generate a boulder, ore, or gem for every tile that can produce one.
     Equivalent to ``--percentages 100,100,100,100``.
-:``-h``, ``--help``:
-    Show quick usage help text.
-:``-p``, ``--percentages <layer>,<vein>,<small cluster>,<deep>``:
+- ``-p``, ``--percentages <layer>,<vein>,<small cluster>,<deep>``
     Set item generation percentages for each of the tile categories. The
     ``vein`` category includes both the large oval clusters and the long stringy
     mineral veins. Default is ``25,33,100,100``.
-:``-z``, ``--cur-zlevel``:
+- ``-z``, ``--cur-zlevel``
     Restricts the bounds to the currently visible z-level.
diff --git a/plugins/dig-now.cpp b/plugins/dig-now.cpp
index 78b2b1522..bbcabde65 100644
--- a/plugins/dig-now.cpp
+++ b/plugins/dig-now.cpp
@@ -838,17 +838,6 @@ static bool get_options(color_ostream &out,
     return true;
 }
 
-static void print_help(color_ostream &out) {
-    auto L = Lua::Core::State;
-    Lua::StackUnwinder top(L);
-
-    if (!lua_checkstack(L, 1) ||
-        !Lua::PushModulePublic(out, L, "plugins.dig-now", "print_help") ||
-        !Lua::SafeCall(out, L, 0, 0)) {
-        out.printerr("Failed to load dig-now Lua code\n");
-    }
-}
-
 bool dig_now_impl(color_ostream &out, const dig_now_options &options) {
     if (!Maps::IsValid()) {
         out.printerr("Map is not available!\n");
@@ -880,18 +869,18 @@ command_result dig_now(color_ostream &out, std::vector<std::string> &params) {
 
     dig_now_options options;
     if (!get_options(out, options, params) || options.help)
-    {
-        print_help(out);
-        return options.help ? CR_OK : CR_FAILURE;
-    }
+        return CR_WRONG_USAGE;
 
     return dig_now_impl(out, options) ? CR_OK : CR_FAILURE;
 }
 
 DFhackCExport command_result plugin_init(color_ostream &,
                                          std::vector<PluginCommand> &commands) {
-    commands.push_back(PluginCommand(
-        "dig-now", "Instantly complete dig designations", dig_now, false));
+    commands.push_back(
+        PluginCommand(
+            "dig-now",
+            "Instantly complete dig designations.",
+            dig_now));
     return CR_OK;
 }
 
diff --git a/plugins/lua/dig-now.lua b/plugins/lua/dig-now.lua
index 2d7ae40d7..b3ffeb0bc 100644
--- a/plugins/lua/dig-now.lua
+++ b/plugins/lua/dig-now.lua
@@ -4,37 +4,6 @@ local argparse = require('argparse')
 local guidm = require('gui.dwarfmode')
 local utils = require('utils')
 
-local short_help_text = [=[
-
-dig-now
-=======
-
-Instantly completes dig designations, modifying map tiles and creating boulders,
-ores, and gems as if a miner were doing the mining or engraving. By default, all
-dig designations on the map are completed and boulder generation follows
-standard game rules, but the behavior is configurable.
-
-Usage:
-
-    dig-now [<pos> [<pos>]] [<options>]
-
-Examples:
-
-dig-now
-    Dig all designated tiles according to standard game rules.
-
-dig-now --clean
-    Dig designated tiles, but don't generate any boulders, ores, or gems.
-
-dig-now --dump here
-    Dig tiles and dump all generated boulders, ores, and gems at the tile under
-    the game cursor.
-
-See the online DFHack documentation for details on all options.
-]=]
-
-function print_help() print(short_help_text) end
-
 local function parse_coords(opts, configname, arg)
     local cursor = argparse.coords(arg, configname)
     utils.assign(opts[configname], cursor)

From a7346dd05b3bb653b9707b574f252b995de495b9 Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Fri, 22 Jul 2022 17:51:48 -0700
Subject: [PATCH 292/854] add missing labels

---
 docs/plugins/cleaners.rst    |   3 +
 docs/plugins/cromulate.rst   |   2 +-
 docs/plugins/dig.rst         |  86 ++++++++++++++++++++++++++
 docs/plugins/filltraffic.rst |  13 ++++
 docs/plugins/zone.rst        | 113 +++++++++++++++++++++++++++++++++++
 5 files changed, 216 insertions(+), 1 deletion(-)

diff --git a/docs/plugins/cleaners.rst b/docs/plugins/cleaners.rst
index b290a73a4..9578bb22a 100644
--- a/docs/plugins/cleaners.rst
+++ b/docs/plugins/cleaners.rst
@@ -1,3 +1,6 @@
+.. _clean:
+.. _spotclean:
+
 cleaners
 ========
 
diff --git a/docs/plugins/cromulate.rst b/docs/plugins/cromulate.rst
index b025fe877..6e659989c 100644
--- a/docs/plugins/cromulate.rst
+++ b/docs/plugins/cromulate.rst
@@ -1,7 +1,7 @@
 cromulate
 =========
 
-Tags: `tag/productivity`, `tag/unit`, `tag/adventure`
+Tags: `tag/productivity`, `tag/units`, `tag/adventure`
 :dfhack-keybind:`cromulate`
 
 :index:`Collects all widgets into a frobozz electric cromufiler.
diff --git a/docs/plugins/dig.rst b/docs/plugins/dig.rst
index 2b1e96a18..6026bd88a 100644
--- a/docs/plugins/dig.rst
+++ b/docs/plugins/dig.rst
@@ -1,4 +1,5 @@
 .. _digv:
+.. _digtype:
 
 dig
 ===
@@ -20,3 +21,88 @@ Basic commands:
     specifying the designation priority with ``-p#``, ``-p #``, or ``p=#``,
     where ``#`` is a number from 1 to 7. If a priority is not specified, the
     priority selected in-game is used as the default.
+digcircle
+=========
+A command for easy designation of filled and hollow circles.
+It has several types of options.
+
+Shape:
+
+:hollow:   Set the circle to hollow (default)
+:filled:   Set the circle to filled
+:#:        Diameter in tiles (default = 0, does nothing)
+
+Action:
+
+:set:      Set designation (default)
+:unset:    Unset current designation
+:invert:   Invert designations already present
+
+Designation types:
+
+:dig:      Normal digging designation (default)
+:ramp:     Ramp digging
+:ustair:   Staircase up
+:dstair:   Staircase down
+:xstair:   Staircase up/down
+:chan:     Dig channel
+
+After you have set the options, the command called with no options
+repeats with the last selected parameters.
+
+Examples:
+
+``digcircle filled 3``
+        Dig a filled circle with diameter = 3.
+``digcircle``
+        Do it again.
+digtype
+=======
+For every tile on the map of the same vein type as the selected tile,
+this command designates it to have the same designation as the
+selected tile. If the selected tile has no designation, they will be
+dig designated.
+If an argument is given, the designation of the selected tile is
+ignored, and all appropriate tiles are set to the specified
+designation.
+
+Options:
+
+:dig:
+:channel:
+:ramp:
+:updown: up/down stairs
+:up:     up stairs
+:down:   down stairs
+:clear:  clear designation
+digexp
+======
+This command is for :wiki:`exploratory mining <Exploratory_mining>`.
+
+There are two variables that can be set: pattern and filter.
+
+Patterns:
+
+:diag5:            diagonals separated by 5 tiles
+:diag5r:           diag5 rotated 90 degrees
+:ladder:           A 'ladder' pattern
+:ladderr:          ladder rotated 90 degrees
+:clear:            Just remove all dig designations
+:cross:            A cross, exactly in the middle of the map.
+
+Filters:
+
+:all:              designate whole z-level
+:hidden:           designate only hidden tiles of z-level (default)
+:designated:       Take current designation and apply pattern to it.
+
+After you have a pattern set, you can use ``expdig`` to apply it again.
+
+Examples:
+
+``expdig diag5 hidden``
+  Designate the diagonal 5 patter over all hidden tiles
+``expdig``
+  Apply last used pattern and filter
+``expdig ladder designated``
+  Take current designations and replace them with the ladder pattern
diff --git a/docs/plugins/filltraffic.rst b/docs/plugins/filltraffic.rst
index 6a9c57c9f..1f8768ec3 100644
--- a/docs/plugins/filltraffic.rst
+++ b/docs/plugins/filltraffic.rst
@@ -1,3 +1,5 @@
+.. _alltraffic:
+
 filltraffic
 ===========
 Set traffic designations using flood-fill starting at the cursor.
@@ -15,3 +17,14 @@ Example:
 
 ``filltraffic H``
   When used in a room with doors, it will set traffic to HIGH in just that room.
+alltraffic
+==========
+Set traffic designations for every single tile of the map - useful for resetting
+traffic designations.  See also `filltraffic`, `restrictice`, and `restrictliquids`.
+
+Options:
+
+:H:     High Traffic
+:N:     Normal Traffic
+:L:     Low Traffic
+:R:     Restricted Traffic
diff --git a/docs/plugins/zone.rst b/docs/plugins/zone.rst
index a3112c147..08d561bbc 100644
--- a/docs/plugins/zone.rst
+++ b/docs/plugins/zone.rst
@@ -1,3 +1,6 @@
+.. _autobutcher:
+.. _autonestbox:
+
 zone
 ====
 Helps a bit with managing activity zones (pens, pastures and pits) and cages.
@@ -128,3 +131,113 @@ Examples
 ``zone tocages count 50 own tame male not grazer``
    Stuff up to 50 owned tame male animals who are not grazers into cages built
    on the current default zone.
+autobutcher
+===========
+Assigns lifestock for slaughter once it reaches a specific count. Requires that
+you add the target race(s) to a watch list. Only tame units will be processed.
+
+Units will be ignored if they are:
+
+* Nicknamed (for custom protection; you can use the `rename` ``unit`` tool
+  individually, or `zone` ``nick`` for groups)
+* Caged, if and only if the cage is defined as a room (to protect zoos)
+* Trained for war or hunting
+
+Creatures who will not reproduce (because they're not interested in the
+opposite sex or have been gelded) will be butchered before those who will.
+Older adults and younger children will be butchered first if the population
+is above the target (default 1 male, 5 female kids and adults).  Note that
+you may need to set a target above 1 to have a reliable breeding population
+due to asexuality etc.  See `fix-ster` if this is a problem.
+
+Options:
+
+:example:      Print some usage examples.
+:start:        Start running every X frames (df simulation ticks).
+               Default: X=6000, which would be every 60 seconds at 100fps.
+:stop:         Stop running automatically.
+:sleep <x>:    Changes the timer to sleep X frames between runs.
+:watch R:      Start watching a race. R can be a valid race RAW id (ALPACA,
+               BIRD_TURKEY, etc) or a list of ids seperated by spaces or
+               the keyword 'all' which affects all races on your current
+               watchlist.
+:unwatch R:    Stop watching race(s). The current target settings will be
+               remembered. R can be a list of ids or the keyword 'all'.
+:forget R:     Stop watching race(s) and forget it's/their target settings.
+               R can be a list of ids or the keyword 'all'.
+:autowatch:    Automatically adds all new races (animals you buy from merchants,
+               tame yourself or get from migrants) to the watch list using
+               default target count.
+:noautowatch:  Stop auto-adding new races to the watchlist.
+:list:         Print the current status and watchlist.
+:list_export:  Print the commands needed to set up status and watchlist,
+               which can be used to import them to another save (see notes).
+:target <fk> <mk> <fa> <ma> <R>:
+               Set target count for specified race(s).  The first four arguments
+               are the number of female and male kids, and female and male adults.
+               R can be a list of spceies ids, or the keyword ``all`` or ``new``.
+               ``R = 'all'``: change target count for all races on watchlist
+               and set the new default for the future. ``R = 'new'``: don't touch
+               current settings on the watchlist, only set the new default
+               for future entries.
+:list_export:  Print the commands required to rebuild your current settings.
+
+.. note::
+
+    Settings and watchlist are stored in the savegame, so that you can have
+    different settings for each save. If you want to copy your watchlist to
+    another savegame you must export the commands required to recreate your settings.
+
+    To export, open an external terminal in the DF directory, and run
+    ``dfhack-run autobutcher list_export > filename.txt``.  To import, load your
+    new save and run ``script filename.txt`` in the DFHack terminal.
+
+
+Examples:
+
+You want to keep max 7 kids (4 female, 3 male) and max 3 adults (2 female,
+1 male) of the race alpaca. Once the kids grow up the oldest adults will get
+slaughtered. Excess kids will get slaughtered starting with the youngest
+to allow that the older ones grow into adults. Any unnamed cats will
+be slaughtered as soon as possible. ::
+
+     autobutcher target 4 3 2 1 ALPACA BIRD_TURKEY
+     autobutcher target 0 0 0 0 CAT
+     autobutcher watch ALPACA BIRD_TURKEY CAT
+     autobutcher start
+
+Automatically put all new races onto the watchlist and mark unnamed tame units
+for slaughter as soon as they arrive in your fort. Settings already made
+for specific races will be left untouched. ::
+
+     autobutcher target 0 0 0 0 new
+     autobutcher autowatch
+     autobutcher start
+
+Stop watching the races alpaca and cat, but remember the target count
+settings so that you can use 'unwatch' without the need to enter the
+values again. Note: 'autobutcher unwatch all' works, but only makes sense
+if you want to keep the plugin running with the 'autowatch' feature or manually
+add some new races with 'watch'. If you simply want to stop it completely use
+'autobutcher stop' instead. ::
+
+    autobutcher unwatch ALPACA CAT
+autonestbox
+===========
+Assigns unpastured female egg-layers to nestbox zones. Requires that you create
+pen/pasture zones above nestboxes. If the pen is bigger than 1x1 the nestbox
+must be in the top left corner. Only 1 unit will be assigned per pen, regardless
+of the size. The age of the units is currently not checked, most birds grow up
+quite fast. Egglayers who are also grazers will be ignored, since confining them
+to a 1x1 pasture is not a good idea. Only tame and domesticated own units are
+processed since pasturing half-trained wild egglayers could destroy your neat
+nestbox zones when they revert to wild. When called without options autonestbox
+will instantly run once.
+
+Options:
+
+:start:        Start running every X frames (df simulation ticks).
+               Default: X=6000, which would be every 60 seconds at 100fps.
+:stop:         Stop running automatically.
+:sleep:        Must be followed by number X. Changes the timer to sleep X
+               frames between runs.

From 5dde613a12bbdd9aae1f80979e34b2035748abca Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Fri, 22 Jul 2022 19:06:50 -0700
Subject: [PATCH 293/854] fix formatting errors

---
 docs/plugins/dig.rst         | 3 +++
 docs/plugins/filltraffic.rst | 1 +
 docs/plugins/zone.rst        | 2 ++
 3 files changed, 6 insertions(+)

diff --git a/docs/plugins/dig.rst b/docs/plugins/dig.rst
index 6026bd88a..c4811883b 100644
--- a/docs/plugins/dig.rst
+++ b/docs/plugins/dig.rst
@@ -21,6 +21,7 @@ Basic commands:
     specifying the designation priority with ``-p#``, ``-p #``, or ``p=#``,
     where ``#`` is a number from 1 to 7. If a priority is not specified, the
     priority selected in-game is used as the default.
+
 digcircle
 =========
 A command for easy designation of filled and hollow circles.
@@ -56,6 +57,7 @@ Examples:
         Dig a filled circle with diameter = 3.
 ``digcircle``
         Do it again.
+
 digtype
 =======
 For every tile on the map of the same vein type as the selected tile,
@@ -75,6 +77,7 @@ Options:
 :up:     up stairs
 :down:   down stairs
 :clear:  clear designation
+
 digexp
 ======
 This command is for :wiki:`exploratory mining <Exploratory_mining>`.
diff --git a/docs/plugins/filltraffic.rst b/docs/plugins/filltraffic.rst
index 1f8768ec3..93306e9eb 100644
--- a/docs/plugins/filltraffic.rst
+++ b/docs/plugins/filltraffic.rst
@@ -17,6 +17,7 @@ Example:
 
 ``filltraffic H``
   When used in a room with doors, it will set traffic to HIGH in just that room.
+
 alltraffic
 ==========
 Set traffic designations for every single tile of the map - useful for resetting
diff --git a/docs/plugins/zone.rst b/docs/plugins/zone.rst
index 08d561bbc..be827b47c 100644
--- a/docs/plugins/zone.rst
+++ b/docs/plugins/zone.rst
@@ -131,6 +131,7 @@ Examples
 ``zone tocages count 50 own tame male not grazer``
    Stuff up to 50 owned tame male animals who are not grazers into cages built
    on the current default zone.
+
 autobutcher
 ===========
 Assigns lifestock for slaughter once it reaches a specific count. Requires that
@@ -222,6 +223,7 @@ add some new races with 'watch'. If you simply want to stop it completely use
 'autobutcher stop' instead. ::
 
     autobutcher unwatch ALPACA CAT
+
 autonestbox
 ===========
 Assigns unpastured female egg-layers to nestbox zones. Requires that you create

From cb3e537b383e06dfc00c89e184ead77d58acdc8b Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Fri, 22 Jul 2022 20:57:19 -0700
Subject: [PATCH 294/854] fix help message when trying to run a plugin name

---
 library/Core.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/library/Core.cpp b/library/Core.cpp
index 12675054c..72ddc33aa 100644
--- a/library/Core.cpp
+++ b/library/Core.cpp
@@ -1227,7 +1227,7 @@ command_result Core::runCommand(color_ostream &con, const std::string &first_, v
                         con.printerr("that is not loaded - try \"load %s\" or check stderr.log\n",
                             first.c_str());
                     else if (p->size())
-                        con.printerr("that implements %zi commands - see \"ls %s\" for details\n",
+                        con.printerr("that implements %zi commands - see \"help %s\" for details\n",
                             p->size(), first.c_str());
                     else
                         con.printerr("but does not implement any commands\n");

From 3141ecbec262d826e4699d64aa6702952cc821c4 Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Fri, 22 Jul 2022 21:04:22 -0700
Subject: [PATCH 295/854] remove cromulate. it has outlived its purpose

---
 docs/plugins/cromulate.rst | 36 ------------------------------------
 plugins/CMakeLists.txt     |  1 -
 plugins/cromulate.cpp      | 26 --------------------------
 3 files changed, 63 deletions(-)
 delete mode 100644 docs/plugins/cromulate.rst
 delete mode 100644 plugins/cromulate.cpp

diff --git a/docs/plugins/cromulate.rst b/docs/plugins/cromulate.rst
deleted file mode 100644
index 6e659989c..000000000
--- a/docs/plugins/cromulate.rst
+++ /dev/null
@@ -1,36 +0,0 @@
-cromulate
-=========
-
-Tags: `tag/productivity`, `tag/units`, `tag/adventure`
-:dfhack-keybind:`cromulate`
-
-:index:`Collects all widgets into a frobozz electric cromufiler.
-<cromulate; Collects all widgets into a frobozz electric cromufiler.>` You might
-want to do this if you discover that your widgets have become decromulated. It
-is safe to run this command periodically even if you are unsure if that's the
-case.
-
-Usage::
-
-    cromulate [all|here] [<options>]
-
-When run without parameters, it lists all your widgets. Add the ``all`` keyword
-to collect all widgets into the cromufiler, or the ``here`` keyword to just
-collect those under the cursor.
-
-Options:
-
-- ``-d``, ``--destroy``
-    Destroy the widgets instead of collecting them into the cromufiler.
-- ``-q``, ``--quiet``
-    Don't display any informational output. Errors will still be printed to the
-    console.
-
-Examples:
-
-- ``cromulate``
-    Lists all widgets and their positions
-- ``cromlate all``
-    Gather all widgets into the cromufiler
-- ``cromulate here --destroy``
-    Destroys the widgets under the cursor
diff --git a/plugins/CMakeLists.txt b/plugins/CMakeLists.txt
index b9d63839e..283f74fad 100644
--- a/plugins/CMakeLists.txt
+++ b/plugins/CMakeLists.txt
@@ -105,7 +105,6 @@ if(BUILD_SUPPORTED)
     dfhack_plugin(command-prompt command-prompt.cpp)
     dfhack_plugin(confirm confirm.cpp LINK_LIBRARIES lua)
     dfhack_plugin(createitem createitem.cpp)
-    dfhack_plugin(cromulate cromulate.cpp)
     dfhack_plugin(cursecheck cursecheck.cpp)
     dfhack_plugin(cxxrandom cxxrandom.cpp LINK_LIBRARIES lua)
     dfhack_plugin(deramp deramp.cpp)
diff --git a/plugins/cromulate.cpp b/plugins/cromulate.cpp
deleted file mode 100644
index 7ed9ed115..000000000
--- a/plugins/cromulate.cpp
+++ /dev/null
@@ -1,26 +0,0 @@
-#include "Core.h"
-#include <Console.h>
-#include <Export.h>
-#include <PluginManager.h>
-
-using namespace DFHack;
-using namespace df::enums;
-
-DFHACK_PLUGIN("cromulate");
-
-command_result cromulate (color_ostream &out, std::vector <std::string> & parameters);
-
-DFhackCExport command_result plugin_init (color_ostream &out, std::vector <PluginCommand> &commands) {
-    commands.push_back(PluginCommand("cromulate",
-                                     "in-cpp plugin short desc", //to use one line in the ``[DFHack]# ls`` output
-                                     cromulate));
-    return CR_OK;
-}
-
-DFhackCExport command_result plugin_shutdown (color_ostream &out) {
-    return CR_OK;
-}
-
-command_result cromulate (color_ostream &out, std::vector <std::string> &parameters) {
-    return CR_OK;
-}

From 9b7cc6180de2b082035eeadf95e0afc9b95a81a5 Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Fri, 22 Jul 2022 21:21:38 -0700
Subject: [PATCH 296/854] don't create entries for non-enableable plugins

---
 library/lua/helpdb.lua | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/library/lua/helpdb.lua b/library/lua/helpdb.lua
index c660a37dd..8b35b0d25 100644
--- a/library/lua/helpdb.lua
+++ b/library/lua/helpdb.lua
@@ -273,11 +273,13 @@ local function update_db(old_db, entry_name, text_entry, help_source, kwargs)
         -- already in db (e.g. from a higher-priority script dir); skip
         return
     end
-    entrydb[entry_name] = {
-        entry_types=kwargs.entry_types,
-        short_help=kwargs.short_help,
-        text_entry=text_entry
-    }
+    if not kwargs.text_entry_only then
+        entrydb[entry_name] = {
+            entry_types=kwargs.entry_types,
+            short_help=kwargs.short_help,
+            text_entry=text_entry
+        }
+    end
     if entry_name ~= text_entry then
         return
     end
@@ -329,13 +331,16 @@ local function scan_plugins(old_db)
                       kwargs)
             has_commands = true
         end
-        if not includes_plugin and (has_commands or
-                dfhack.internal.isPluginEnableable(plugin)) then
+        if includes_plugin then goto continue end
+        local is_enableable = dfhack.internal.isPluginEnableable(plugin)
+        if has_commands or is_enableable then
             update_db(old_db, plugin, plugin,
                       has_rendered_help(plugin) and
                             HELP_SOURCES.RENDERED or HELP_SOURCES.STUB,
-                      {entry_types={[ENTRY_TYPES.PLUGIN]=true}})
+                      {entry_types={[ENTRY_TYPES.PLUGIN]=true},
+                       text_entry_only=not is_enableable})
         end
+        ::continue::
     end
 end
 

From 62523bdcb1a2da3083b219ef5d320d5f7f828a00 Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Sat, 23 Jul 2022 15:13:11 -0700
Subject: [PATCH 297/854] update documentation for the documentation

---
 docs/Documentation.rst | 304 ++++++++++++++++++++++++++++++-----------
 1 file changed, 225 insertions(+), 79 deletions(-)

diff --git a/docs/Documentation.rst b/docs/Documentation.rst
index c035a0366..6be4de37f 100644
--- a/docs/Documentation.rst
+++ b/docs/Documentation.rst
@@ -14,11 +14,15 @@ compiled to HTML, such as automatic tables of contents, cross-linking, special
 external links (forum, wiki, etc) and more. The documentation is compiled by a
 Python tool, `Sphinx <https://www.sphinx-doc.org>`_.
 
-The DFHack build process will compile the documentation, but this is disabled
-by default due to the additional Python and Sphinx requirements. You typically
-only need to build the docs if you're changing them, or perhaps
-if you want a local HTML copy; otherwise, you can read an
-`online version hosted by ReadTheDocs <https://dfhack.readthedocs.org>`_.
+The DFHack build process will compile and install the documentation so it can be
+displayed in-game by the `help` and `ls` commands (and any other command or GUI that
+displays help text), but this is disabled by default due to the additional Python and
+Sphinx requirements. If you already have a version of the docs installed (say from a
+downloaded release binary), then you only need to build the docs if you're changing them
+and want to see the changes reflected in your game.
+
+You can also build the docs if you just want a local HTML- or text-rendered copy, though
+you can always read the `online version <https://dfhack.readthedocs.org>`_.
 
 (Note that even if you do want a local copy, it is certainly not necessary to
 compile the documentation in order to read it. Like Markdown, reST documents are
@@ -28,6 +32,63 @@ The main thing you lose in plain text format is hyperlinking.)
 .. contents:: Contents
   :local:
 
+Concepts and general guidance
+=============================
+
+The source ``.rst`` files are compiled to HTML for viewing in a browser and to text
+format for viewing in-game. For in-game help, the help text is read from its installed
+location in ``hack/docs`` under the DF directory for in-game display.
+
+Remember, everything should be documented!  If it's not clear *where* a particular thing
+should be documented, ask on Discord or in the DFHack thread on Bay12 -- as well as
+getting help, you'll be providing valuable feedback that makes it easier for future readers!
+
+Try to keep lines within 80-100 characters, so it's readable in plain text
+in the terminal - Sphinx (our documentation system) will make sure
+paragraphs flow.
+
+Short descriptions
+------------------
+
+Each command that a user can run, as well as every plugin that can be enabled for some
+lasting effect, needs to have a short (~54 character) descriptive string associated with
+it. This description text is:
+
+- used in-game by the `ls` command and DFHack UI screens that list commands
+- used in the generated index entries in the HTML docs
+
+Tags
+----
+
+To make it easier for players to find related commands, all plugins and commands are marked
+with relevant tags. These are used to compile indices and generate cross-links between the
+commands, both in the HTML documents and in-game. See the list of available tags
+`here <categories>` and think about which categories your new tools belongs in.
+
+Links
+-----
+
+If it would be helpful to mention another DFHack command, don't just type the
+name - add a hyperlink!  Specify the link target in backticks, and it will be
+replaced with the corresponding title and linked:  e.g. ```autolabor```
+=> `autolabor`. Scripts and plugins have link targets that match their names
+created for you automatically.
+
+If you want to link to a heading in your own page, you can specifiy it like this::
+
+    `Heading text exactly as written`_
+
+Note that the DFHack documentation is configured so that single backticks (with
+no prefix or suffix) produce links to internal link targets, such as the
+``autolabor`` target shown above. This is different from the reStructuredText
+default behavior of rendering such text in italics (as a reference to a title).
+For alternative link behaviors, see:
+
+- `The reStructuredText documentation on roles <https://docutils.sourceforge.io/docs/ref/rst/roles.html>`__
+- `The reStructuredText documentation on external links <https://docutils.sourceforge.io/docs/ref/rst/restructuredtext.html#hyperlink-targets>`__
+- `The Sphinx documentation on roles <https://www.sphinx-doc.org/en/master/usage/restructuredtext/roles.html>`__
+    - ``:doc:`` is useful for linking to another document outside of DFHack.
+
 .. _docs-standards:
 
 Documentation standards
@@ -38,106 +99,191 @@ there are a few important standards for completeness and consistent style.  Trea
 this section as a guide rather than iron law, match the surrounding text, and you'll
 be fine.
 
-Command documentation
----------------------
+Where do I add the help text?
+-----------------------------
 
-Each command should have a short (~54 character) help string, which is shown
-by the `ls` command.  For scripts, this is a comment on the first line
-(the comment marker and whitespace is stripped).  For plugins it's the second
-argument to ``PluginCommand``.  Please make this brief but descriptive!
+For scripts and plugins that are distributed as part of DFHack, documentation files
+should be added to the :source-scripts:`docs` and :source:`docs/plugins` directories,
+respectively, in a file named after the script or plugin. For example, a script named
+``gui/foobar.lua`` (which provides the ``gui/foobar`` command) should be documented
+in a file named ``docs/gui/foobar.rst`` in the scripts repo. Similarly, a plugin named
+``foobaz`` should be documented in a file named ``docs/plugins/foobaz.rst`` in the dfhack repo.
+For plugins, all commands provided by that plugin should be documented in that same file.
 
-Everything should be documented!  If it's not clear *where* a particular
-thing should be documented, ask on IRC or in the DFHack thread on Bay12 -
-as well as getting help, you'll be providing valuable feedback that
-makes it easier for future readers!
+Short descriptions (the ~54 character short help) are taken from the first "sentence" of
+the help text for scripts and plugins that can be enabled. This means that the help should
+begin with a sentence fragment that begins with a capital letter and ends in a full stop
+(``.``). Please make this brief but descriptive!
 
-Scripts can use a custom autodoc function, based on the Sphinx ``include``
-directive - anything between the tokens is copied into the appropriate scripts
-documentation page.  For Ruby, we follow the built-in docstring convention
-(``=begin`` and ``=end``).  For Lua, the tokens are ``[====[`` and ``]====]``
-- ordinary multi-line strings.  It is highly encouraged to reuse this string
-as the in-console documentation by (e.g.) printing it when a ``-help`` argument
-is given.
+Short descriptions for commands provided by plugins are taken from the ``description``
+parameter passed to the ``PluginCommand`` constructor used when the command is registered
+in the plugin source file.
 
-The docs **must** have a heading which exactly matches the command, underlined
-with ``=====`` to the same length.  For example, a lua file would have:
-
-.. code-block:: lua
+Header format
+-------------
 
-    local helpstr = [====[
+The docs **must** begin with a heading which exactly matches the script or plugin name, underlined
+with ``=====`` to the same length. This should be followed by a ``Tags:`` line with
+comma-separated links to the tag indices, and then a ``:dfhack-keybind:`commandname``` line for
+each command provided by the script or plugin. For scripts, this will just be the script name.
+Plugins that do not provide commands (i.e. they can just be enabled for some persistent effect or
+they just export functionality via a Lua API) don't need any ``:dfhack-keybind:`` lines at all.
+The first line of the text should then be the short description that will be used for the script
+or plugin. For example, documentation for the ``build-now`` script might look like:
 
-    add-thought
-    ===========
-    Adds a thought or emotion to the selected unit.  Can be used by other scripts,
-    or the gui invoked by running ``add-thought gui`` with a unit selected.
+.. code-block:: rst
 
-    ]====]
+    build-now
+    =========
+    Tags: `tag/fort`, `tag/buildings`
+    :dfhack-keybind:`build-now`
 
+    Instantly completes unsuspended building jobs. By default, all constructions
+    and buildings on the map are completed, but the area of effect is configurable.
 
-.. highlight:: rst
+Usage help
+----------
 
-Where the heading for a section is also the name of a command, the spelling
-and case should exactly match the command to enter in the DFHack command line.
+The first section after the header and introductory text should be the usage block. You can
+choose between two formats, based on whatever is cleaner or clearer for your syntax. The first
+option is to show usage formats together, with an explanation following the block::
 
-Try to keep lines within 80-100 characters, so it's readable in plain text
-in the terminal - Sphinx (our documentation system) will make sure
-paragraphs flow.
+    Usage::
 
-Command usage
--------------
+        build-now [<options>]
+        build-now here [<options>]
+        build-now [<pos> [<pos>]] [<options>]
 
-If there aren't many options or examples to show, they can go in a paragraph of
-text.  Use double-backticks to put commands in monospaced font, like this::
+    Where the optional ``<pos>`` pair can be used to specify the coordinate bounds
+    within which ``build-now`` will operate. If they are not specified,
+    ``build-now`` will scan the entire map. If only one ``<pos>`` is specified, only
+    the building at that coordinate is built.
 
-    You can use ``cleanowned scattered x`` to dump tattered or abandoned items.
+    The ``<pos>`` parameters can either be an ``<x>,<y>,<z>`` triple (e.g.
+    ``35,12,150``) or the string ``here``, which means the position of the active
+    game cursor.
 
-If the command takes more than three arguments, format the list as a table
-called Usage.  The table *only* lists arguments, not full commands.
-Input values are specified in angle brackets.  Example::
+The second option is to arrange the usage options in a list, with the full command
+and arguments in monospaced font. Then indent the next line and describe the effect::
 
     Usage:
 
-    :arg1:          A simple argument.
-    :arg2 <input>:  Does something based on the input value.
-    :Very long argument:
-                    Is very specific.
+    ``build-now [<options>]``
+        Scan the entire map and build all unsuspended constructions and buildings.
+    ``build-now here [<options>]``
+        Build the unsuspended construction or building under the cursor.
+    ``build-now [<pos> [<pos>]] [<options>]``
+        Build all unsuspended constructions within the specified coordinate box.
 
-To demonstrate usage - useful mainly when the syntax is complicated, list the
-full command with arguments in monospaced font, then indent the next line and
-describe the effect::
+    The ``<pos>`` parameters are specified as...
 
-    ``resume all``
-            Resumes all suspended constructions.
+Note that in both options, the entire commandline syntax is written, including the command itself.
+Literal text is written as-is (e.g. the word ``here`` in the above example), and text that
+describes the kind of parameter that is being passed (e.g. ``pos`` or ``options``) is enclosed in
+angle brackets (``<`` and ``>``). Optional elements are enclosed in square brackets (``[`` and ``]``).
 
-Links
------
+Examples
+--------
 
-If it would be helpful to mention another DFHack command, don't just type the
-name - add a hyperlink!  Specify the link target in backticks, and it will be
-replaced with the corresponding title and linked:  e.g. ```autolabor```
-=> `autolabor`.  Link targets should be equivalent to the command
-described (without file extension), and placed above the heading of that
-section like this::
+If the only way to run the command is to type the command itself, then this section is not necessary.
+Otherwise, please consider adding a section that shows some real, practical usage examples. For
+many users, this will be the **only** section they will read. It is so important that it is a good
+idea to include the ``Examples`` section **before** you describe any extended options your command
+might take. Write examples for what you expect the popular use cases will be. Also be sure to write
+examples showing specific, practical values being used for any parameter that takes a value.
 
-    .. _autolabor:
+Examples should go in their own subheading with a single dash underline (``--------``). The examples
+themselves should be organized in a list, the same as in option 2 for Usage above. Here is an
+example Examples section::
 
-    autolabor
-    =========
+    Examples
+    --------
 
-Add link targets if you need them, but otherwise plain headings are preferred.
-Scripts have link targets created automatically.
+    ``build-now``
+        Completes all unsuspended construction jobs on the map.
+    ``build-now 37,20,154 here``
+        Builds the unsuspended, unconstructed buildings in the box bounded by the coordinate
+        x=37,y=20,z=154 and the cursor.
 
-Note that the DFHack documentation is configured so that single backticks (with
-no prefix or suffix) produce links to internal link targets, such as the
-``autolabor`` target shown above. This is different from the reStructuredText
-default behavior of rendering such text in italics (as a reference to a title).
-For alternative link behaviors, see:
+Options
+-------
 
-- `The reStructuredText documentation on roles <https://docutils.sourceforge.io/docs/ref/rst/roles.html>`__
-- `The reStructuredText documentation on external links <https://docutils.sourceforge.io/docs/ref/rst/restructuredtext.html#hyperlink-targets>`__
-- `The Sphinx documentation on roles <https://www.sphinx-doc.org/en/master/usage/restructuredtext/roles.html>`__
+The options header should follow the examples, with each option in the same list format as the
+examples::
+
+    Options
+    -------
+
+    ``-h``, ``--help``
+        Show help text.
+    ``-l``, ``--quality <level>``
+        Set the quality of the architecture for built architected builtings.
+    ``-q``, ``--quiet``
+        Suppress informational output (error messages are still printed).
+
+Note that for parameters that have both short and long forms, any values that those options
+take only need to be specified once (e.g. ``<level>``).
+
+External scripts and plugins
+============================
+
+Scripts and plugins distributed separately from DFHack's release packages don't have the
+opportunity to add their documentation to the rendered HTML or text output. However, these
+scripts and plugins can use a different mechanism to at least make their help text available
+in-game.
+
+Note that since help text for external scripts and plugins is not rendered by Sphinx,
+it should be written in plain text. Any reStructuredText markup will not be processed.
+
+For external scripts, the short description comes from a comment on the first line
+(the comment marker and extra whitespace is stripped). For Lua, this would look like::
+
+    -- A short description of my cool script.
+
+and for Ruby scripts it would look like::
+
+    # A short description of my cool script.
+
+The main help text for an external script needs to appear between two markers. For
+Lua, these markers are ``[====[`` and ``]====]``, and for Ruby they are ``=begin`` and
+``=end``. The documentation standards above still apply to external tools, but there is
+no need to include backticks for links or monospaced fonts. Here is a Lua example for an
+entire script header::
+
+    -- Inventory management for adventurers.
+    -- [====[
+    gui/adv-inventory
+    =================
+    Tags: adventure, map
+
+    Allows you to quickly move items between containers. This includes yourself
+    and any followers you have.
+
+    Usage:
+
+        gui/adv-inventory [<options>]
+
+    Examples:
+
+    gui/adv-inventory
+        Opens the GUI with nothing preselected
+    gui/adv-inventory take-all
+        Opens the GUI with all container items already selected and ready to move
+        into the adventurer's inventory.
+
+    Options:
+
+    take-all
+        Starts the GUI with container items pre-selected
+    give-all
+        Starts the GUI with your own items pre-selected
+    ]====]
 
-    - ``:doc:`` is useful for linking to another document
+For external plugins, help text for provided commands can be passed as the ``usage``
+parameter when registering the commands with the ``PluginCommand`` constructor. There
+is currently no way for associating help text with the plugin itself, so any
+information about what the plugin does when enabled should be combined into the command
+help.
 
 Required dependencies
 =====================
@@ -258,8 +404,8 @@ ways to do this:
 * On Windows, if you prefer to use the batch scripts, you can run
   ``generate-msvc-gui.bat`` and set ``BUILD_DOCS`` through the GUI. If you are
   running another file, such as ``generate-msvc-all.bat``, you will need to edit
-  it to add the flag. You can also run ``cmake`` on the command line, similar to
-  other platforms.
+  the batch script to add the flag. You can also run ``cmake`` on the command line,
+  similar to other platforms.
 
 By default, both HTML and text docs are built by CMake. The generated
 documentation is stored in ``docs/html`` and ``docs/text`` (respectively) in the

From c1a694cb1812eaf30ed3e0453d7bc487f1dd8f1a Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Sat, 23 Jul 2022 18:26:40 -0400
Subject: [PATCH 298/854] Improve syntax highlighting in Documentation.rst

---
 docs/Documentation.rst | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/docs/Documentation.rst b/docs/Documentation.rst
index 6be4de37f..50a086cdd 100644
--- a/docs/Documentation.rst
+++ b/docs/Documentation.rst
@@ -94,6 +94,8 @@ For alternative link behaviors, see:
 Documentation standards
 =======================
 
+.. highlight:: rst
+
 Whether you're adding new code or just fixing old documentation (and there's plenty),
 there are a few important standards for completeness and consistent style.  Treat
 this section as a guide rather than iron law, match the surrounding text, and you'll
@@ -129,9 +131,7 @@ each command provided by the script or plugin. For scripts, this will just be th
 Plugins that do not provide commands (i.e. they can just be enabled for some persistent effect or
 they just export functionality via a Lua API) don't need any ``:dfhack-keybind:`` lines at all.
 The first line of the text should then be the short description that will be used for the script
-or plugin. For example, documentation for the ``build-now`` script might look like:
-
-.. code-block:: rst
+or plugin. For example, documentation for the ``build-now`` script might look like::
 
     build-now
     =========
@@ -236,11 +236,15 @@ Note that since help text for external scripts and plugins is not rendered by Sp
 it should be written in plain text. Any reStructuredText markup will not be processed.
 
 For external scripts, the short description comes from a comment on the first line
-(the comment marker and extra whitespace is stripped). For Lua, this would look like::
+(the comment marker and extra whitespace is stripped). For Lua, this would look like:
+
+.. code-block:: lua
 
     -- A short description of my cool script.
 
-and for Ruby scripts it would look like::
+and for Ruby scripts it would look like:
+
+.. code-block:: ruby
 
     # A short description of my cool script.
 

From a94f3c3cca434158ffb1cc1b3e09b53d39afa340 Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Sat, 23 Jul 2022 15:31:56 -0700
Subject: [PATCH 299/854] fix some formatting

---
 docs/Documentation.rst | 69 ++++++++++++++++++++++++------------------
 1 file changed, 39 insertions(+), 30 deletions(-)

diff --git a/docs/Documentation.rst b/docs/Documentation.rst
index 50a086cdd..8f135e2a3 100644
--- a/docs/Documentation.rst
+++ b/docs/Documentation.rst
@@ -5,14 +5,14 @@ DFHack Documentation System
 ###########################
 
 
-DFHack documentation, like the file you are reading now, is created as ``.rst`` files,
-which are in `reStructuredText (reST) <https://www.sphinx-doc.org/rest.html>`_ format.
-This is a documentation format common in the Python community. It is very
+DFHack documentation, like the file you are reading now, is created as a set of
+``.rst`` files in `reStructuredText (reST) <https://www.sphinx-doc.org/rest.html>`_
+format. This is a documentation format common in the Python community. It is very
 similar in concept - and in syntax - to Markdown, as found on GitHub and many other
 places. However it is more advanced than Markdown, with more features available when
 compiled to HTML, such as automatic tables of contents, cross-linking, special
 external links (forum, wiki, etc) and more. The documentation is compiled by a
-Python tool, `Sphinx <https://www.sphinx-doc.org>`_.
+Python tool named `Sphinx <https://www.sphinx-doc.org>`_.
 
 The DFHack build process will compile and install the documentation so it can be
 displayed in-game by the `help` and `ls` commands (and any other command or GUI that
@@ -22,7 +22,7 @@ downloaded release binary), then you only need to build the docs if you're chang
 and want to see the changes reflected in your game.
 
 You can also build the docs if you just want a local HTML- or text-rendered copy, though
-you can always read the `online version <https://dfhack.readthedocs.org>`_.
+you can always read the `online version <https://dfhack.readthedocs.org>`_ too.
 
 (Note that even if you do want a local copy, it is certainly not necessary to
 compile the documentation in order to read it. Like Markdown, reST documents are
@@ -37,11 +37,13 @@ Concepts and general guidance
 
 The source ``.rst`` files are compiled to HTML for viewing in a browser and to text
 format for viewing in-game. For in-game help, the help text is read from its installed
-location in ``hack/docs`` under the DF directory for in-game display.
+location in ``hack/docs`` under the DF directory.
 
-Remember, everything should be documented!  If it's not clear *where* a particular thing
-should be documented, ask on Discord or in the DFHack thread on Bay12 -- as well as
-getting help, you'll be providing valuable feedback that makes it easier for future readers!
+When writing documentation, remember that everything should be documented!  If it's not
+clear *where* a particular thing should be documented, ask on Discord or in the DFHack
+thread on Bay12 -- you'll not only be getting help, you'll also be providing valuable
+feedback that makes it easier for future contributers to find documentation on how to
+write the documentation!
 
 Try to keep lines within 80-100 characters, so it's readable in plain text
 in the terminal - Sphinx (our documentation system) will make sure
@@ -105,7 +107,7 @@ Where do I add the help text?
 -----------------------------
 
 For scripts and plugins that are distributed as part of DFHack, documentation files
-should be added to the :source-scripts:`docs` and :source:`docs/plugins` directories,
+should be added to the :source-scripts:`scripts/docs <docs>` and :source:`docs/plugins` directories,
 respectively, in a file named after the script or plugin. For example, a script named
 ``gui/foobar.lua`` (which provides the ``gui/foobar`` command) should be documented
 in a file named ``docs/gui/foobar.rst`` in the scripts repo. Similarly, a plugin named
@@ -138,8 +140,9 @@ or plugin. For example, documentation for the ``build-now`` script might look li
     Tags: `tag/fort`, `tag/buildings`
     :dfhack-keybind:`build-now`
 
-    Instantly completes unsuspended building jobs. By default, all constructions
-    and buildings on the map are completed, but the area of effect is configurable.
+    Instantly completes unsuspended building jobs. By default, all
+    constructions and buildings on the map are completed, but the area
+    of effect is configurable.
 
 Usage help
 ----------
@@ -154,14 +157,15 @@ option is to show usage formats together, with an explanation following the bloc
         build-now here [<options>]
         build-now [<pos> [<pos>]] [<options>]
 
-    Where the optional ``<pos>`` pair can be used to specify the coordinate bounds
-    within which ``build-now`` will operate. If they are not specified,
-    ``build-now`` will scan the entire map. If only one ``<pos>`` is specified, only
-    the building at that coordinate is built.
+    Where the optional ``<pos>`` pair can be used to specify the
+    coordinate bounds within which ``build-now`` will operate. If they
+    are not specified, ``build-now`` will scan the entire map. If only
+    one ``<pos>`` is specified, only the building at that coordinate
+    is built.
 
-    The ``<pos>`` parameters can either be an ``<x>,<y>,<z>`` triple (e.g.
-    ``35,12,150``) or the string ``here``, which means the position of the active
-    game cursor.
+    The ``<pos>`` parameters can either be an ``<x>,<y>,<z>`` triple
+    (e.g. ``35,12,150``) or the string ``here``, which means the
+    position of the active game cursor.
 
 The second option is to arrange the usage options in a list, with the full command
 and arguments in monospaced font. Then indent the next line and describe the effect::
@@ -169,11 +173,14 @@ and arguments in monospaced font. Then indent the next line and describe the eff
     Usage:
 
     ``build-now [<options>]``
-        Scan the entire map and build all unsuspended constructions and buildings.
+        Scan the entire map and build all unsuspended constructions
+        and buildings.
     ``build-now here [<options>]``
-        Build the unsuspended construction or building under the cursor.
+        Build the unsuspended construction or building under the
+        cursor.
     ``build-now [<pos> [<pos>]] [<options>]``
-        Build all unsuspended constructions within the specified coordinate box.
+        Build all unsuspended constructions within the specified
+        coordinate box.
 
     The ``<pos>`` parameters are specified as...
 
@@ -202,8 +209,8 @@ example Examples section::
     ``build-now``
         Completes all unsuspended construction jobs on the map.
     ``build-now 37,20,154 here``
-        Builds the unsuspended, unconstructed buildings in the box bounded by the coordinate
-        x=37,y=20,z=154 and the cursor.
+        Builds the unsuspended, unconstructed buildings in the box
+        bounded by the coordinate x=37,y=20,z=154 and the cursor.
 
 Options
 -------
@@ -217,9 +224,11 @@ examples::
     ``-h``, ``--help``
         Show help text.
     ``-l``, ``--quality <level>``
-        Set the quality of the architecture for built architected builtings.
+        Set the quality of the architecture for built architected
+        builtings.
     ``-q``, ``--quiet``
-        Suppress informational output (error messages are still printed).
+        Suppress informational output (error messages are still
+        printed).
 
 Note that for parameters that have both short and long forms, any values that those options
 take only need to be specified once (e.g. ``<level>``).
@@ -260,8 +269,8 @@ entire script header::
     =================
     Tags: adventure, map
 
-    Allows you to quickly move items between containers. This includes yourself
-    and any followers you have.
+    Allows you to quickly move items between containers. This includes
+    yourself and any followers you have.
 
     Usage:
 
@@ -272,8 +281,8 @@ entire script header::
     gui/adv-inventory
         Opens the GUI with nothing preselected
     gui/adv-inventory take-all
-        Opens the GUI with all container items already selected and ready to move
-        into the adventurer's inventory.
+        Opens the GUI with all container items already selected and
+        ready to move into the adventurer's inventory.
 
     Options:
 

From e4273589e1df7710f866dddfd0b80fce665db63e Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Sat, 23 Jul 2022 15:38:35 -0700
Subject: [PATCH 300/854] one fewer char per line so no horiz scrolling

---
 docs/Documentation.rst | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/docs/Documentation.rst b/docs/Documentation.rst
index 8f135e2a3..170a6fd4e 100644
--- a/docs/Documentation.rst
+++ b/docs/Documentation.rst
@@ -141,8 +141,8 @@ or plugin. For example, documentation for the ``build-now`` script might look li
     :dfhack-keybind:`build-now`
 
     Instantly completes unsuspended building jobs. By default, all
-    constructions and buildings on the map are completed, but the area
-    of effect is configurable.
+    constructions and buildings on the map are completed, but the
+    area of effect is configurable.
 
 Usage help
 ----------
@@ -158,10 +158,10 @@ option is to show usage formats together, with an explanation following the bloc
         build-now [<pos> [<pos>]] [<options>]
 
     Where the optional ``<pos>`` pair can be used to specify the
-    coordinate bounds within which ``build-now`` will operate. If they
-    are not specified, ``build-now`` will scan the entire map. If only
-    one ``<pos>`` is specified, only the building at that coordinate
-    is built.
+    coordinate bounds within which ``build-now`` will operate. If
+    they are not specified, ``build-now`` will scan the entire map.
+    If only one ``<pos>`` is specified, only the building at that
+    coordinate is built.
 
     The ``<pos>`` parameters can either be an ``<x>,<y>,<z>`` triple
     (e.g. ``35,12,150``) or the string ``here``, which means the
@@ -269,8 +269,8 @@ entire script header::
     =================
     Tags: adventure, map
 
-    Allows you to quickly move items between containers. This includes
-    yourself and any followers you have.
+    Allows you to quickly move items between containers. This
+    includes yourself and any followers you have.
 
     Usage:
 

From 947889873d379f49e138a1740c3bda32eaeb22f4 Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Sat, 23 Jul 2022 16:03:40 -0700
Subject: [PATCH 301/854] update all docs I've done so far to new standards

---
 docs/Documentation.rst           |  2 +-
 docs/builtins/alias.rst          |  9 +++---
 docs/builtins/cls.rst            |  1 -
 docs/builtins/devel/dump-rpc.rst |  1 -
 docs/builtins/die.rst            |  1 -
 docs/builtins/disable.rst        |  1 -
 docs/builtins/enable.rst         |  5 ++-
 docs/builtins/fpause.rst         |  1 -
 docs/builtins/help.rst           |  1 -
 docs/builtins/hide.rst           |  1 -
 docs/builtins/keybinding.rst     | 15 +++++----
 docs/builtins/kill-lua.rst       |  1 -
 docs/builtins/load.rst           |  1 -
 docs/builtins/ls.rst             | 22 ++++++-------
 docs/builtins/plug.rst           |  5 ++-
 docs/builtins/reload.rst         |  1 -
 docs/builtins/sc-script.rst      | 13 ++++----
 docs/builtins/script.rst         |  7 ++---
 docs/builtins/show.rst           |  1 -
 docs/builtins/tags.rst           |  1 -
 docs/builtins/type.rst           |  1 -
 docs/builtins/unload.rst         |  1 -
 docs/plugins/3dveins.rst         |  1 -
 docs/plugins/add-spatter.rst     |  1 -
 docs/plugins/autochop.rst        |  1 -
 docs/plugins/autoclothing.rst    |  5 ++-
 docs/plugins/autodump.rst        | 17 +++++-----
 docs/plugins/autofarm.rst        | 15 +++++----
 docs/plugins/autogems.rst        |  5 ++-
 docs/plugins/autohauler.rst      | 23 +++++++-------
 docs/plugins/autolabor.rst       | 41 ++++++++++++------------
 docs/plugins/automaterial.rst    |  1 -
 docs/plugins/automelt.rst        |  1 -
 docs/plugins/autotrade.rst       |  1 -
 docs/plugins/blueprint.rst       | 53 ++++++++++++++++----------------
 docs/plugins/building-hacks.rst  |  1 -
 docs/plugins/buildingplan.rst    |  9 +++---
 docs/plugins/burrows.rst         | 23 +++++++-------
 docs/plugins/changeitem.rst      | 33 ++++++++++----------
 docs/plugins/changelayer.rst     | 45 +++++++++++++--------------
 docs/plugins/changevein.rst      |  5 ++-
 docs/plugins/cleanconst.rst      |  1 -
 docs/plugins/cleaners.rst        | 23 +++++++-------
 docs/plugins/cleanowned.rst      |  9 +++---
 docs/plugins/command-prompt.rst  |  1 -
 docs/plugins/confirm.rst         |  5 ++-
 docs/plugins/createitem.rst      | 16 +++++-----
 docs/plugins/cursecheck.rst      | 37 +++++++++++-----------
 48 files changed, 211 insertions(+), 254 deletions(-)

diff --git a/docs/Documentation.rst b/docs/Documentation.rst
index 170a6fd4e..8908272ca 100644
--- a/docs/Documentation.rst
+++ b/docs/Documentation.rst
@@ -267,7 +267,7 @@ entire script header::
     -- [====[
     gui/adv-inventory
     =================
-    Tags: adventure, map
+    Tags: adventure, items
 
     Allows you to quickly move items between containers. This
     includes yourself and any followers you have.
diff --git a/docs/builtins/alias.rst b/docs/builtins/alias.rst
index 234f8ae4a..96f088798 100644
--- a/docs/builtins/alias.rst
+++ b/docs/builtins/alias.rst
@@ -1,6 +1,5 @@
 alias
 =====
-
 Tags: `tag/system`
 :dfhack-keybind:`alias`
 
@@ -12,14 +11,14 @@ or script.
 
 Usage:
 
-- ``alias list``
+``alias list``
     Lists all configured aliases
-- ``alias add <name> <command> [arguments...]``
+``alias add <name> <command> [arguments...]``
     Adds an alias
-- ``alias replace <name> <command> [arguments...]``
+``alias replace <name> <command> [arguments...]``
     Replaces an existing alias with a new command, or adds the alias if it does
     not already exist
-- ``alias delete <name>``
+``alias delete <name>``
     Removes the specified alias
 
 Aliases can be given additional arguments when created and invoked, which will
diff --git a/docs/builtins/cls.rst b/docs/builtins/cls.rst
index 2f5387c7f..a0478c8df 100644
--- a/docs/builtins/cls.rst
+++ b/docs/builtins/cls.rst
@@ -1,6 +1,5 @@
 cls
 ===
-
 Tags: `tag/system`
 :dfhack-keybind:`cls`
 
diff --git a/docs/builtins/devel/dump-rpc.rst b/docs/builtins/devel/dump-rpc.rst
index 2f798c79e..65d4dae57 100644
--- a/docs/builtins/devel/dump-rpc.rst
+++ b/docs/builtins/devel/dump-rpc.rst
@@ -1,6 +1,5 @@
 devel/dump-rpc
 ==============
-
 Tags: `tag/system`
 :dfhack-keybind:`devel/dump-rpc`
 
diff --git a/docs/builtins/die.rst b/docs/builtins/die.rst
index df53c94bd..54a134433 100644
--- a/docs/builtins/die.rst
+++ b/docs/builtins/die.rst
@@ -1,6 +1,5 @@
 die
 ===
-
 Tags: `tag/system`
 :dfhack-keybind:`die`
 
diff --git a/docs/builtins/disable.rst b/docs/builtins/disable.rst
index d17706486..567e9dbb1 100644
--- a/docs/builtins/disable.rst
+++ b/docs/builtins/disable.rst
@@ -1,6 +1,5 @@
 disable
 =======
-
 Tags: `tag/system`
 :dfhack-keybind:`disable`
 
diff --git a/docs/builtins/enable.rst b/docs/builtins/enable.rst
index 1a714f602..b99dd194a 100644
--- a/docs/builtins/enable.rst
+++ b/docs/builtins/enable.rst
@@ -1,6 +1,5 @@
 enable
 ======
-
 Tags: `tag/system`
 :dfhack-keybind:`enable`
 
@@ -25,7 +24,7 @@ Usage::
 Examples
 --------
 
-- ``enable manipulator``
+``enable manipulator``
     Enable the ``manipulator`` plugin.
-- ``enable manipulator search``
+``enable manipulator search``
     Enable multiple plugins at once.
diff --git a/docs/builtins/fpause.rst b/docs/builtins/fpause.rst
index f40f6d55c..c43cedfab 100644
--- a/docs/builtins/fpause.rst
+++ b/docs/builtins/fpause.rst
@@ -1,6 +1,5 @@
 fpause
 ======
-
 Tags: `tag/system`
 :dfhack-keybind:`fpause`
 
diff --git a/docs/builtins/help.rst b/docs/builtins/help.rst
index 290d62e4c..957a84466 100644
--- a/docs/builtins/help.rst
+++ b/docs/builtins/help.rst
@@ -1,6 +1,5 @@
 help
 ====
-
 Tags: `tag/system`
 :dfhack-keybind:`help`
 
diff --git a/docs/builtins/hide.rst b/docs/builtins/hide.rst
index e4f91abaa..de144b637 100644
--- a/docs/builtins/hide.rst
+++ b/docs/builtins/hide.rst
@@ -1,6 +1,5 @@
 hide
 ====
-
 Tags: `tag/system`
 :dfhack-keybind:`hide`
 
diff --git a/docs/builtins/keybinding.rst b/docs/builtins/keybinding.rst
index 2ad9e1542..ad759b14c 100644
--- a/docs/builtins/keybinding.rst
+++ b/docs/builtins/keybinding.rst
@@ -1,6 +1,5 @@
 keybinding
 ==========
-
 Tags: `tag/system`
 :dfhack-keybind:`keybinding`
 
@@ -14,15 +13,15 @@ Hotkeys can be any combinations of Ctrl/Alt/Shift with A-Z, 0-9, F1-F12, or
 
 Usage:
 
-- ``keybinding``
+``keybinding``
     Show some useful information, including the current game context.
-- ``keybinding list <key>``
+``keybinding list <key>``
     List bindings active for the key combination.
-- ``keybinding clear <key> [<key>...]``
+``keybinding clear <key> [<key>...]``
     Remove bindings for the specified keys.
-- ``keybinding add <key> "cmdline" ["cmdline"...]``
+``keybinding add <key> "cmdline" ["cmdline"...]``
     Add bindings for the specified key.
-- ``keybinding set <key> "cmdline" ["cmdline"...]``
+``keybinding set <key> "cmdline" ["cmdline"...]``
     Clear, and then add bindings for the specified key.
 
 The ``<key>`` parameter above has the following **case-sensitive** syntax::
@@ -53,8 +52,8 @@ Interactive commands like `liquids` cannot be used as hotkeys.
 Examples
 --------
 
-- ``keybinding add Alt-F1 hotkeys``
+``keybinding add Alt-F1 hotkeys``
     Bind Alt-F1 to run the `hotkeys` command on any screen at any time.
-- ``keybinding add Alt-F@dwarfmode gui/quickfort``
+``keybinding add Alt-F@dwarfmode gui/quickfort``
     Bind Alt-F to run `gui/quickfort`, but only when on a screen that shows the
     main map.
diff --git a/docs/builtins/kill-lua.rst b/docs/builtins/kill-lua.rst
index 4b93b8734..222795db3 100644
--- a/docs/builtins/kill-lua.rst
+++ b/docs/builtins/kill-lua.rst
@@ -1,6 +1,5 @@
 kill-lua
 ========
-
 Tags: `tag/system`
 :dfhack-keybind:`kill-lua`
 
diff --git a/docs/builtins/load.rst b/docs/builtins/load.rst
index 8e51847dd..b7e3db8f3 100644
--- a/docs/builtins/load.rst
+++ b/docs/builtins/load.rst
@@ -1,6 +1,5 @@
 load
 ====
-
 Tags: `tag/system`
 :dfhack-keybind:`load`
 
diff --git a/docs/builtins/ls.rst b/docs/builtins/ls.rst
index e68b740c7..3ae3fb3e1 100644
--- a/docs/builtins/ls.rst
+++ b/docs/builtins/ls.rst
@@ -1,6 +1,5 @@
 ls
 ==
-
 Tags: `tag/system`
 :dfhack-keybind:`ls`
 
@@ -11,23 +10,16 @@ command name. Can also be invoked as ``dir``.
 
 Usage:
 
-- ``ls [<options>]``
+``ls [<options>]``
     Lists all available commands and the tags associated with them.
-- ``ls <tag> [<options>]``
+``ls <tag> [<options>]``
     Shows only commands that have the given tag. Use the `tags` command to see
     the list of available tags.
-- ``ls <string> [<options>]``
+``ls <string> [<options>]``
     Shows commands that include the given string. E.g. ``ls quick`` will show
     all the commands with "quick" in their names. If the string is also the
     name of a tag, then it will be interpreted as a tag name.
 
-You can also pass some optional parameters to change how ``ls`` behaves:
-
-- ``--notags``
-    Don't print out the tags associated with each command.
-- ``--dev``
-    Include commands intended for developers and modders.
-
 Examples
 --------
 
@@ -36,3 +28,11 @@ Examples
 - ``ls --dev trigger``
     Lists all commands, including developer and modding commands, that match the
     substring "trigger"
+
+Options
+-------
+
+``--notags``
+    Don't print out the tags associated with each command.
+``--dev``
+    Include commands intended for developers and modders.
diff --git a/docs/builtins/plug.rst b/docs/builtins/plug.rst
index 47efe66b3..26699d400 100644
--- a/docs/builtins/plug.rst
+++ b/docs/builtins/plug.rst
@@ -1,6 +1,5 @@
 plug
 ====
-
 Tags: `tag/system`
 :dfhack-keybind:`plug`
 
@@ -9,8 +8,8 @@ Tags: `tag/system`
 
 Usage:
 
-- ``plug``
+``plug``
     Lists available plugins and whether they are enabled.
-- ``plug <plugin> [<plugin> ...]``
+``plug <plugin> [<plugin> ...]``
     Shows the commands implemented by the named plugins and whether the plugins
     are enabled.
diff --git a/docs/builtins/reload.rst b/docs/builtins/reload.rst
index cde113ac8..4417b5185 100644
--- a/docs/builtins/reload.rst
+++ b/docs/builtins/reload.rst
@@ -1,6 +1,5 @@
 reload
 ======
-
 Tags: `tag/system`
 :dfhack-keybind:`reload`
 
diff --git a/docs/builtins/sc-script.rst b/docs/builtins/sc-script.rst
index bcedb610e..e19af0bf9 100644
--- a/docs/builtins/sc-script.rst
+++ b/docs/builtins/sc-script.rst
@@ -1,6 +1,5 @@
 sc-script
 =========
-
 Tags: `tag/system`
 :dfhack-keybind:`sc-script`
 
@@ -11,16 +10,16 @@ dynamically.
 
 Usage:
 
-- ``sc-script [help]``
+``sc-script [help]``
     Show the list of valid event names.
-- ``sc-script list [<event>]``
+``sc-script list [<event>]``
     List the currently registered files for all events or the specified event.
-- ``sc-script add|remove <event> <file> [<file> ...]``
+``sc-script add|remove <event> <file> [<file> ...]``
     Register or unregister a file to be run for the specified event.
 
-Examples
---------
+Example
+-------
 
-- ``sc-script add SC_MAP_LOADED spawn_extra_monsters.init``
+``sc-script add SC_MAP_LOADED spawn_extra_monsters.init``
     Registers the ``spawn_extra_monsters.init`` file to be run whenever a new
     map is loaded.
diff --git a/docs/builtins/script.rst b/docs/builtins/script.rst
index ef1aab64a..f15e86bec 100644
--- a/docs/builtins/script.rst
+++ b/docs/builtins/script.rst
@@ -1,6 +1,5 @@
 script
 ======
-
 Tags: `tag/system`
 :dfhack-keybind:`script`
 
@@ -16,9 +15,9 @@ Usage::
 
     script <filename>
 
-Examples
---------
+Example
+-------
 
-- ``script startup.txt``
+``script startup.txt``
     Executes the commands in ``startup.txt``, which exists in your DF game
     directory.
diff --git a/docs/builtins/show.rst b/docs/builtins/show.rst
index b22d4bab9..a173231d7 100644
--- a/docs/builtins/show.rst
+++ b/docs/builtins/show.rst
@@ -1,6 +1,5 @@
 show
 ====
-
 Tags: `tag/system`
 :dfhack-keybind:`show`
 
diff --git a/docs/builtins/tags.rst b/docs/builtins/tags.rst
index b601a73a1..33ac36fe2 100644
--- a/docs/builtins/tags.rst
+++ b/docs/builtins/tags.rst
@@ -1,6 +1,5 @@
 tags
 ====
-
 Tags: `tag/system`
 :dfhack-keybind:`tags`
 
diff --git a/docs/builtins/type.rst b/docs/builtins/type.rst
index 755548da9..7c446bc4e 100644
--- a/docs/builtins/type.rst
+++ b/docs/builtins/type.rst
@@ -1,6 +1,5 @@
 type
 ====
-
 Tags: `tag/system`
 :dfhack-keybind:`type`
 
diff --git a/docs/builtins/unload.rst b/docs/builtins/unload.rst
index 1fc8c311e..ec385489f 100644
--- a/docs/builtins/unload.rst
+++ b/docs/builtins/unload.rst
@@ -1,6 +1,5 @@
 unload
 ======
-
 Tags: `tag/system`
 :dfhack-keybind:`unload`
 
diff --git a/docs/plugins/3dveins.rst b/docs/plugins/3dveins.rst
index 3c1276b46..9fe83a4b5 100644
--- a/docs/plugins/3dveins.rst
+++ b/docs/plugins/3dveins.rst
@@ -1,6 +1,5 @@
 3dveins
 =======
-
 Tags:
 :dfhack-keybind:`3dveins`
 
diff --git a/docs/plugins/add-spatter.rst b/docs/plugins/add-spatter.rst
index 38a9f91f0..6e5a8ddb7 100644
--- a/docs/plugins/add-spatter.rst
+++ b/docs/plugins/add-spatter.rst
@@ -1,6 +1,5 @@
 add-spatter
 ===========
-
 Tags:
 
 :index:`Make tagged reactions produce contaminants.
diff --git a/docs/plugins/autochop.rst b/docs/plugins/autochop.rst
index 3a2284aef..6893644db 100644
--- a/docs/plugins/autochop.rst
+++ b/docs/plugins/autochop.rst
@@ -1,6 +1,5 @@
 autochop
 ========
-
 Tags:
 
 :index:`Auto-harvest trees when low on stockpiled logs.
diff --git a/docs/plugins/autoclothing.rst b/docs/plugins/autoclothing.rst
index df937c338..bbfe14cc9 100644
--- a/docs/plugins/autoclothing.rst
+++ b/docs/plugins/autoclothing.rst
@@ -1,6 +1,5 @@
 autoclothing
 ============
-
 Tags:
 :dfhack-keybind:`autoclothing`
 
@@ -22,7 +21,7 @@ material and item.
 Examples
 --------
 
-* ``autoclothing cloth "short skirt" 10``:
+``autoclothing cloth "short skirt" 10``
     Sets the desired number of cloth short skirts available per citizen to 10.
-* ``autoclothing cloth dress``:
+``autoclothing cloth dress``
     Displays the currently set number of cloth dresses chosen per citizen.
diff --git a/docs/plugins/autodump.rst b/docs/plugins/autodump.rst
index a47878c34..b42ed9d85 100644
--- a/docs/plugins/autodump.rst
+++ b/docs/plugins/autodump.rst
@@ -1,6 +1,5 @@
 autodump
 ========
-
 Tags:
 :dfhack-keybind:`autodump`
 :dfhack-keybind:`autodump-destroy-here`
@@ -37,28 +36,28 @@ before the game is resumed, cancels destruction of the item.
 Options
 -------
 
-- ``destroy``
+``destroy``
     Destroy instead of dumping. Doesn't require a cursor. If ``autodump`` is
     called again with this option before the game is resumed, it cancels
     pending destroy actions.
-- ``destroy-here``
+``destroy-here``
     :index:`Destroy items marked for dumping under the cursor.
     <autodump-destroy-here; Destroy items marked for dumping under the cursor.>`
-- ``visible``
+``visible``
     Only process items that are not hidden.
-- ``hidden``
+``hidden``
     Only process hidden items.
-- ``forbidden``
+``forbidden``
     Only process forbidden items (default: only unforbidden).
 
 Examples
 --------
 
-- ``autodump``
+``autodump``
     :index:`Teleports items marked for dumping to the cursor position.
     <autodump; Teleports items marked for dumping to the cursor position.>`
-- ``autodump destroy``
+``autodump destroy``
     Destroys all unforbidden items marked for dumping
-- ``autodump-destroy-item``
+``autodump-destroy-item``
     :index:`Destroys the selected item.
     <autodump-destroy-item; Destroys the selected item.>`
diff --git a/docs/plugins/autofarm.rst b/docs/plugins/autofarm.rst
index 0294b574b..9a2169d65 100644
--- a/docs/plugins/autofarm.rst
+++ b/docs/plugins/autofarm.rst
@@ -1,6 +1,5 @@
 autofarm
 ========
-
 Tags:
 :dfhack-keybind:`autofarm`
 
@@ -12,15 +11,15 @@ threshold for each crop type is configurable.
 
 Usage:
 
-- ``enable autofarm``
+``enable autofarm``
     Enable the plugin and start managing crop assignment.
-- ``autofarm runonce``
+``autofarm runonce``
     Updates all farm plots once, without enabling the plugin.
-- ``autofarm status``
+``autofarm status``
     Prints status information, including any defined thresholds.
-- ``autofarm default <number>``
+``autofarm default <number>``
     Sets the default threshold.
-- ``autofarm threshold <number> <type> [<type> ...]``
+``autofarm threshold <number> <type> [<type> ...]``
     Sets thresholds of individual plant types.
 
 You can find the identifiers for the crop types in your world by running the
@@ -31,7 +30,7 @@ following command::
 Examples
 --------
 
-- ``autofarm default 30``
+``autofarm default 30``
     Set the default threshold to 30.
-- ``autofarm threshold 150 MUSHROOM_HELMET_PLUMP GRASS_TAIL_PIG``
+``autofarm threshold 150 MUSHROOM_HELMET_PLUMP GRASS_TAIL_PIG``
     Set the threshold for Plump Helmets and Pig Tails to 150
diff --git a/docs/plugins/autogems.rst b/docs/plugins/autogems.rst
index bdfd51864..72b850754 100644
--- a/docs/plugins/autogems.rst
+++ b/docs/plugins/autogems.rst
@@ -1,6 +1,5 @@
 autogems
 ========
-
 Tags:
 :dfhack-keybind:`autogems-reload`
 
@@ -10,9 +9,9 @@ orders for cutting them at a Jeweler's Workshop.
 
 Usage:
 
-- ``enable autogems``
+``enable autogems``
     Enables the plugin
-- ``autogems-reload``
+``autogems-reload``
     :index:`Reloads the autogems configuration file.
     <autogems-reload; Reloads the autogems configuration file.>` You might need
     to do this if you have manually modified the contents while the game is
diff --git a/docs/plugins/autohauler.rst b/docs/plugins/autohauler.rst
index 1dce8a692..82561fa2a 100644
--- a/docs/plugins/autohauler.rst
+++ b/docs/plugins/autohauler.rst
@@ -1,6 +1,5 @@
 autohauler
 ==========
-
 Tags:
 :dfhack-keybind:`autohauler`
 
@@ -24,33 +23,33 @@ can be changed by the user.
 
 Usage:
 
-- ``enable autohauler``
+``enable autohauler``
     Start managing hauling labors. This is normally all you need to do.
     Autohauler works well on default settings.
-- ``autohauler status``
+``autohauler status``
     Show autohauler status and status of fort dwarves.
-- ``autohauler <labor> haulers``
+``autohauler <labor> haulers``
     Set whether a particular labor should be assigned to haulers.
-- ``autohauler <labor> allow|forbid``
+``autohauler <labor> allow|forbid``
     Set whether a particular labor should mark a dwarf as exempt from hauling.
     By default, only the ``ALCHEMIST`` labor is set to ``forbid``.
-- ``autohauler reset-all|<labor> reset``
+``autohauler reset-all|<labor> reset``
     Reset a particular labor (or all labors) to their default
     haulers/allow/forbid state.
-- ``autohauler list``
+``autohauler list``
     Show the active configuration for all labors.
-- ``autohauler frameskip <number>``
+``autohauler frameskip <number>``
     Set the number of frames between runs of autohauler.
-- ``autohauler debug``
+``autohauler debug``
     In the next cycle, output the state of every dwarf.
 
 Examples
 --------
 
-- ``autohauler HAUL_STONE haulers``
+``autohauler HAUL_STONE haulers``
     Set stone hauling as a hauling labor (this is already the default).
-- ``autohauler RECOVER_WOUNDED allow``
+``autohauler RECOVER_WOUNDED allow``
     Allow the "Recover wounded" labor to be manually assigned by the player. By
     default it is automatically given to haulers.
-- ``autohauler MINE forbid``
+``autohauler MINE forbid``
     Don't assign hauling labors to dwarves with the Mining labor enabled.
diff --git a/docs/plugins/autolabor.rst b/docs/plugins/autolabor.rst
index 7696efe71..ca249ee19 100644
--- a/docs/plugins/autolabor.rst
+++ b/docs/plugins/autolabor.rst
@@ -1,6 +1,5 @@
 autolabor
 =========
-
 Tags:
 :dfhack-keybind:`autolabor`
 
@@ -54,36 +53,36 @@ dwarfs that meet any of these conditions:
 
 We stop assigning dwarves when we reach the maximum allowed.
 
+Examples
+--------
+
+``autolabor MINE 5``
+    Keep at least 5 dwarves with mining enabled.
+``autolabor CUT_GEM 1 1``
+    Keep exactly 1 dwarf with gemcutting enabled.
+``autolabor COOK 1 1 3``
+    Keep 1 dwarf with cooking enabled, selected only from the top 3.
+``autolabor FEED_WATER_CIVILIANS haulers``
+    Have haulers feed and water wounded dwarves.
+``autolabor CUTWOOD disable``
+    Turn off autolabor for wood cutting.
+
 Advanced usage
 --------------
 
-- ``autolabor <labor> <minimum> [<maximum>] [<talent pool>]``
+``autolabor <labor> <minimum> [<maximum>] [<talent pool>]``
     Set range of dwarves assigned to a labor, optionally specifying the size of
     the pool of most skilled dwarves that will ever be considered for this
     labor.
-- ``autolabor <labor> haulers``
+``autolabor <labor> haulers``
     Set a labor to be handled by hauler dwarves.
-- ``autolabor <labor> disable``
+``autolabor <labor> disable``
     Turn off autolabor for a specific labor.
-- ``autolabor reset-all|<labor> reset``
+``autolabor reset-all|<labor> reset``
     Return a labor (or all labors) to the default handling.
-- ``autolabor list``
+``autolabor list``
     List current status of all labors.
-- ``autolabor status``
+``autolabor status``
     Show basic status information.
 
 See `autolabor-artisans` for a differently-tuned setup.
-
-Examples
---------
-
-- ``autolabor MINE 5``
-    Keep at least 5 dwarves with mining enabled.
-- ``autolabor CUT_GEM 1 1``
-    Keep exactly 1 dwarf with gemcutting enabled.
-- ``autolabor COOK 1 1 3``
-    Keep 1 dwarf with cooking enabled, selected only from the top 3.
-- ``autolabor FEED_WATER_CIVILIANS haulers``
-    Have haulers feed and water wounded dwarves.
-- ``autolabor CUTWOOD disable``
-    Turn off autolabor for wood cutting.
diff --git a/docs/plugins/automaterial.rst b/docs/plugins/automaterial.rst
index 7f8355b49..3b9a68b7a 100644
--- a/docs/plugins/automaterial.rst
+++ b/docs/plugins/automaterial.rst
@@ -1,6 +1,5 @@
 automaterial
 ============
-
 Tags:
 
 :index:`Sorts building materials by recent usage.
diff --git a/docs/plugins/automelt.rst b/docs/plugins/automelt.rst
index b51a431c0..8fe995d23 100644
--- a/docs/plugins/automelt.rst
+++ b/docs/plugins/automelt.rst
@@ -1,6 +1,5 @@
 automelt
 ========
-
 Tags:
 
 :index:`Quickly designate items to be melted.
diff --git a/docs/plugins/autotrade.rst b/docs/plugins/autotrade.rst
index ed2d65bc5..68aa2d50d 100644
--- a/docs/plugins/autotrade.rst
+++ b/docs/plugins/autotrade.rst
@@ -1,6 +1,5 @@
 autotrade
 =========
-
 Tags:
 
 :index:`Quickly designate items to be traded.
diff --git a/docs/plugins/blueprint.rst b/docs/plugins/blueprint.rst
index 3825de7b2..6a0adfe58 100644
--- a/docs/plugins/blueprint.rst
+++ b/docs/plugins/blueprint.rst
@@ -1,6 +1,5 @@
 blueprint
 =========
-
 Tags:
 :dfhack-keybind:`blueprint`
 
@@ -23,14 +22,14 @@ Usage::
 Examples
 --------
 
-- ``blueprint gui``
+``blueprint gui``
     Runs `gui/blueprint`, the interactive frontend, where all configuration for
     a ``blueprint`` command can be set visually and interactively.
-- ``blueprint 30 40 bedrooms``
+``blueprint 30 40 bedrooms``
     Generates blueprints for an area 30 tiles wide by 40 tiles tall, starting
     from the active cursor on the current z-level. Blueprints are written to
     ``bedrooms.csv`` in the ``blueprints`` directory.
-- ``blueprint 30 40 bedrooms dig --cursor 108,100,150``
+``blueprint 30 40 bedrooms dig --cursor 108,100,150``
     Generates only the ``#dig`` blueprint in the ``bedrooms.csv`` file, and
     the start of the blueprint area is set to a specific value instead of using
     the in-game cursor position.
@@ -38,15 +37,15 @@ Examples
 Positional parameters
 ---------------------
 
-- ``width``
+``width``
     Width of the area (in tiles) to translate.
-- ``height``
+``height``
     Height of the area (in tiles) to translate.
-- ``depth``
+``depth``
     Number of z-levels to translate. Positive numbers go *up* from the cursor
     and negative numbers go *down*. Defaults to 1 if not specified, indicating
     that the blueprint should only include the current z-level.
-- ``name``
+``name``
     Base name for blueprint files created in the ``blueprints`` directory. If no
     name is specified, "blueprint" is used by default. The string must contain
     some characters other than numbers so the name won't be confused with the
@@ -59,17 +58,17 @@ If you want to generate blueprints only for specific phases, add their names to
 the commandline, anywhere after the blueprint base name. You can list multiple
 phases; just separate them with a space.
 
-- ``dig``
+``dig``
     Generate quickfort ``#dig`` blueprints for digging natural stone.
-- ``carve``
+``carve``
     Generate quickfort ``#dig`` blueprints for smoothing and carving.
-- ``build``
+``build``
     Generate quickfort ``#build`` blueprints for constructions and buildings.
-- ``place``
+``place``
     Generate quickfort ``#place`` blueprints for placing stockpiles.
-- ``zone``
+``zone``
     Generate quickfort ``#zone`` blueprints for designating zones.
-- ``query``
+``query``
     Generate quickfort ``#query`` blueprints for configuring rooms.
 
 If no phases are specified, phases are autodetected. For example, a ``#place``
@@ -78,20 +77,20 @@ blueprint will be created only if there are stockpiles in the blueprint area.
 Options
 -------
 
-- ``-c``, ``--cursor <x>,<y>,<z>``
+``-c``, ``--cursor <x>,<y>,<z>``
     Use the specified map coordinates instead of the current cursor position for
     the upper left corner of the blueprint range. If this option is specified,
     then an active game map cursor is not necessary.
-- ``-e``, ``--engrave``
+``-e``, ``--engrave``
     Record engravings in the ``carve`` phase. If this option is not specified,
     engravings are ignored.
-- ``-f``, ``--format <format>``
-    Select the output format of the generated files. See the ``Output formats``
+``-f``, ``--format <format>``
+    Select the output format of the generated files. See the `Output formats`_
     section below for options. If not specified, the output format defaults to
     "minimal", which will produce a small, fast ``.csv`` file.
-- ``-h``, ``--help``
+``-h``, ``--help``
     Show command help text.
-- ``-s``, ``--playback-start <x>,<y>,<comment>``
+``-s``, ``--playback-start <x>,<y>,<comment>``
     Specify the column and row offsets (relative to the upper-left corner of the
     blueprint, which is ``1,1``) where the player should put the cursor when the
     blueprint is played back with `quickfort`, in
@@ -100,9 +99,9 @@ Options
     to surround the parameter string in double quotes:
     ``"-s10,10,central stairs"`` or ``--playback-start "10,10,central stairs"``
     or ``"--playback-start=10,10,central stairs"``.
-- ``-t``, ``--splitby <strategy>``
-    Split blueprints into multiple files. See the ``Splitting output into
-    multiple files`` section below for details. If not specified, defaults to
+``-t``, ``--splitby <strategy>``
+    Split blueprints into multiple files. See the `Splitting output into
+    multiple files`_ section below for details. If not specified, defaults to
     "none", which will create a standard quickfort
     `multi-blueprint <quickfort-packaging>` file.
 
@@ -111,10 +110,10 @@ Output formats
 
 Here are the values that can be passed to the ``--format`` flag:
 
-- ``minimal``
+``minimal``
     Creates ``.csv`` files with minimal file size that are fast to read and
     write. This is the default.
-- ``pretty``
+``pretty``
     Makes the blueprints in the ``.csv`` files easier to read and edit with a
     text editor by adding extra spacing and alignment markers.
 
@@ -123,8 +122,8 @@ Splitting output into multiple files
 
 The ``--splitby`` flag can take any of the following values:
 
-- ``none``
+``none``
     Writes all blueprints into a single file. This is the standard format for
     quickfort fortress blueprint bundles and is the default.
-- ``phase``
+``phase``
     Creates a separate file for each phase.
diff --git a/docs/plugins/building-hacks.rst b/docs/plugins/building-hacks.rst
index abd6ac4b4..bdae83392 100644
--- a/docs/plugins/building-hacks.rst
+++ b/docs/plugins/building-hacks.rst
@@ -1,6 +1,5 @@
 building-hacks
 ==============
-
 Tags:
 
 :index:`Allows mods to create and manage powered workshops.
diff --git a/docs/plugins/buildingplan.rst b/docs/plugins/buildingplan.rst
index ac73acd49..6aba86209 100644
--- a/docs/plugins/buildingplan.rst
+++ b/docs/plugins/buildingplan.rst
@@ -1,6 +1,5 @@
 buildingplan
 ============
-
 Tags:
 :dfhack-keybind:`buildingplan`
 
@@ -36,12 +35,12 @@ The buildingplan plugin has global settings that can be set from the UI
 :kbd:`b`:kbd:`a`:kbd:`G`). These settings can also be set via the
 ``buildingplan set`` command. The available settings are:
 
-- ``all_enabled`` (default: false)
+``all_enabled`` (default: false)
     Enable planning mode for all building types.
-- ``blocks``, ``boulders``, ``logs``, ``bars`` (defaults: true, true, true, false)
+``blocks``, ``boulders``, ``logs``, ``bars`` (defaults: true, true, true, false)
     Allow blocks, boulders, logs, or bars to be matched for generic "building
     material" items.
-- ``quickfort_mode`` (default: false)
+``quickfort_mode`` (default: false)
     Enable compatibility mode for the legacy Python Quickfort (this setting is
     not required for DFHack `quickfort`)
 
@@ -51,7 +50,7 @@ save.
 
 If you normally embark with some blocks on hand for early workshops, you might
 want to add this line to your ``dfhack-config/init/onMapLoad.init`` file to
-always configure buildingplan to just use blocks for buildlings and
+always configure buildingplan to just use blocks for buildings and
 constructions::
 
     on-new-fortress buildingplan set boulders false; buildingplan set logs false
diff --git a/docs/plugins/burrows.rst b/docs/plugins/burrows.rst
index 6ab26caa2..733f784d0 100644
--- a/docs/plugins/burrows.rst
+++ b/docs/plugins/burrows.rst
@@ -1,6 +1,5 @@
 burrows
 =======
-
 Tags:
 :dfhack-keybind:`burrow`
 
@@ -16,33 +15,33 @@ You can also use the ``burrow`` command to
 
 Usage:
 
-- ``enable burrows``
+``enable burrows``
     Enable the plugin for the auto-grow feature (see
     ``burrow enable auto-grow`` below)
-- ``burrow enable auto-grow``
+``burrow enable auto-grow``
     When a wall inside a burrow with a name ending in '+' is dug out, the burrow
     will be extended to newly-revealed adjacent walls. This final '+' may be
     omitted in burrow name args of other ``burrows`` commands. Note that digging
     1-wide corridors with the miner inside the burrow is SLOW. Be sure to also
     run ``enable burrows`` for this feature to work.
-- ``burrow disable auto-grow``
+``burrow disable auto-grow``
     Disables auto-grow processing.
-- ``burrow clear-unit <burrow> [<burrow> ...]``
+``burrow clear-unit <burrow> [<burrow> ...]``
     Remove all units from the named burrows.
-- ``burrow clear-tiles <burrow> [<burrow> ...]``
+``burrow clear-tiles <burrow> [<burrow> ...]``
     Remove all tiles from the named burrows.
-- ``burrow set-units target-burrow <burrow> [<burrow> ...]``
+``burrow set-units target-burrow <burrow> [<burrow> ...]``
     Clear all units from the target burrow, then add units from the named source
     burrows.
-- ``burrow add-units target-burrow <burrow> [<burrow> ...]``
+``burrow add-units target-burrow <burrow> [<burrow> ...]``
     Add units from the source burrows to the target.
-- ``burrow remove-units target-burrow <burrow> [<burrow> ...]``
+``burrow remove-units target-burrow <burrow> [<burrow> ...]``
     Remove units in source burrows from the target.
-- ``burrow set-tiles target-burrow <burrow> [<burrow> ...]``
+``burrow set-tiles target-burrow <burrow> [<burrow> ...]``
     Clear target burrow tiles and adds tiles from the names source burrows.
-- ``burrow add-tiles target-burrow <burrow> [<burrow> ...]``
+``burrow add-tiles target-burrow <burrow> [<burrow> ...]``
     Add tiles from the source burrows to the target.
-- ``burrow remove-tiles target-burrow <burrow> [<burrow> ...]``
+``burrow remove-tiles target-burrow <burrow> [<burrow> ...]``
     Remove tiles in source burrows from the target.
 
 In place of a source burrow, you can use one of the following keywords:
diff --git a/docs/plugins/changeitem.rst b/docs/plugins/changeitem.rst
index 5dd537a60..93a10cbfa 100644
--- a/docs/plugins/changeitem.rst
+++ b/docs/plugins/changeitem.rst
@@ -1,8 +1,7 @@
 changeitem
 ==========
-
 Tags:
-:dfhack-keybind:
+:dfhack-keybind:`changeitem`
 
 :index:`Change item material and base quality.
 <changeitem; Change item material and base quality.>` By default, a change is
@@ -14,31 +13,31 @@ refuse to touch.
 
 Usage:
 
-- ``changeitem info``
+``changeitem info``
    Show details about the selected item. Does not change the item. You can use
    this command to discover RAW ids for existing items.
-- ``changeitem [<options>]``
+``changeitem [<options>]``
    Change the item selected in the ``k`` list or inside a container/inventory.
-- ``changeitem here [<options>]``
+``changeitem here [<options>]``
    Change all items at the cursor position. Requires in-game cursor.
 
+Examples
+--------
+
+``changeitem here m INORGANIC:GRANITE``
+   Change material of all stone items under the cursor to granite.
+``changeitem q 5``
+   Change currently selected item to masterpiece quality.
+
 Options
 -------
 
-- ``m``, ``material <RAW id>``
+``m``, ``material <RAW id>``
    Change material. Must be followed by valid material RAW id.
-- ``s``, ``subtype <RAW id>``
+``s``, ``subtype <RAW id>``
    Change subtype. Must be followed by a valid subtype RAW id."
-- ``q``, ``quality <quality>``
+``q``, ``quality <quality>``
    Change base quality. Must be followed by number (0-5) with 0 being no quality
    and 5 being masterpiece quality.
-- ``force``
+``force``
    Ignore subtypes and force the change to the new material.
-
-Examples
---------
-
-``changeitem here m INORGANIC:GRANITE``
-   Change material of all stone items under the cursor to granite.
-``changeitem q 5``
-   Change currently selected item to masterpiece quality.
diff --git a/docs/plugins/changelayer.rst b/docs/plugins/changelayer.rst
index 76d631cdf..5298cf955 100644
--- a/docs/plugins/changelayer.rst
+++ b/docs/plugins/changelayer.rst
@@ -1,8 +1,7 @@
 changelayer
 ===========
-
 Tags:
-:dfhack-keybind:
+:dfhack-keybind:`changelayer`
 
 :index:`Change the material of an entire geology layer.
 <changelayer; Change the material of an entire geology layer.>` Note that one
@@ -26,27 +25,6 @@ When run without options, ``changelayer`` will:
 You can use the `probe` command on various tiles around your map to find valid
 material RAW ids and to get an idea how layers and biomes are distributed.
 
-Options
--------
-
-- ``all_biomes``
-   Change the corresponding geology layer for all biomes on your map. Be aware
-   that the same geology layer can AND WILL be on different z-levels for
-   different biomes.
-- ``all_layers``
-   Change all geology layers on your map (only for the selected biome unless
-   ``all_biomes`` is also specified). Candy mountain, anyone? Will make your map
-   quite boring, but tidy.
-- ``force``
-   Allow changing stone to soil and vice versa. **THIS CAN HAVE WEIRD EFFECTS,
-   USE WITH CARE AND SAVE FIRST**. Note that soil will not be magically replaced
-   with stone. You will, however, get a stone floor after digging, so it will
-   allow the floor to be engraved. Similarly, stone will not be magically
-   replaced with soil, but you will get a soil floor after digging, so it could
-   be helpful for creating farm plots on maps with no soil.
-- ``verbose``
-   Output details about what is being changed.
-
 Examples
 --------
 
@@ -71,3 +49,24 @@ Examples
       weird stuff (flashing tiles, tiles changed all over place etc). Try
       reverting the changes manually or even better use an older savegame. You
       did save your game, right?
+
+Options
+-------
+
+``all_biomes``
+   Change the corresponding geology layer for all biomes on your map. Be aware
+   that the same geology layer can AND WILL be on different z-levels for
+   different biomes.
+``all_layers``
+   Change all geology layers on your map (only for the selected biome unless
+   ``all_biomes`` is also specified). Candy mountain, anyone? Will make your map
+   quite boring, but tidy.
+``force``
+   Allow changing stone to soil and vice versa. **THIS CAN HAVE WEIRD EFFECTS,
+   USE WITH CARE AND SAVE FIRST**. Note that soil will not be magically replaced
+   with stone. You will, however, get a stone floor after digging, so it will
+   allow the floor to be engraved. Similarly, stone will not be magically
+   replaced with soil, but you will get a soil floor after digging, so it could
+   be helpful for creating farm plots on maps with no soil.
+``verbose``
+   Output details about what is being changed.
diff --git a/docs/plugins/changevein.rst b/docs/plugins/changevein.rst
index 7de94a3f0..e23c3f063 100644
--- a/docs/plugins/changevein.rst
+++ b/docs/plugins/changevein.rst
@@ -1,8 +1,7 @@
 changevein
 ==========
-
 Tags:
-:dfhack-keybind:
+:dfhack-keybind:`changevein`
 
 :index:`Change the material of a mineral inclusion.
 <changevein; Change the material of a mineral inclusion.>` You can change it to
@@ -20,5 +19,5 @@ Usage::
 Example
 -------
 
-- ``changevein NATIVE_PLATINUM``
+``changevein NATIVE_PLATINUM``
     Convert vein at cursor position into platinum ore.
diff --git a/docs/plugins/cleanconst.rst b/docs/plugins/cleanconst.rst
index 286069b63..37416c551 100644
--- a/docs/plugins/cleanconst.rst
+++ b/docs/plugins/cleanconst.rst
@@ -1,6 +1,5 @@
 cleanconst
 ==========
-
 Tags:
 :dfhack-keybind:`cleanconst`
 
diff --git a/docs/plugins/cleaners.rst b/docs/plugins/cleaners.rst
index 9578bb22a..305bf0db6 100644
--- a/docs/plugins/cleaners.rst
+++ b/docs/plugins/cleaners.rst
@@ -3,7 +3,6 @@
 
 cleaners
 ========
-
 Tags:
 :dfhack-keybind:`clean`
 :dfhack-keybind:`spotclean`
@@ -28,22 +27,22 @@ includes hostiles, and that cleaning items removes poisons from weapons.
 if you just want to clean a specific tile but don't want the `clean` command to
 remove all the glorious blood from your entranceway.
 
+Examples
+--------
+
+``clean all``
+    Clean everything that can be cleaned (except mud and snow).
+``clean all mud item snow``
+    Removes all spatter, including mud, leaves, and snow from map tiles.
+
 Options
 -------
 
 When cleaning the map, you can specify extra options for extra cleaning:
 
-- ``mud``
+``mud``
     Also remove mud.
-- ``item``
+``item``
     Also remove item spatter, like fallen leaves and flowers.
-- ``snow``
+``snow``
     Also remove snow coverings.
-
-Examples
---------
-
-- ``clean all``
-    Clean everything that can be cleaned (except mud and snow).
-- ``clean all mud item snow``
-    Removes all spatter, including mud, leaves, and snow from map tiles.
diff --git a/docs/plugins/cleanowned.rst b/docs/plugins/cleanowned.rst
index e827989c9..c90fe0569 100644
--- a/docs/plugins/cleanowned.rst
+++ b/docs/plugins/cleanowned.rst
@@ -1,6 +1,5 @@
 cleanowned
 ==========
-
 Tags:
 :dfhack-keybind:`cleanowned`
 
@@ -21,11 +20,11 @@ anything.
 
 You can confiscate additional types of items by adding them to the commandline:
 
-- ``scattered``
+``scattered``
     Confiscate/dump all items scattered on the floor.
-- ``x``
+``x``
     Confiscate/dump items with wear level 'x' (lightly worn) and more.
-- ``X``
+``X``
     Confiscate/dump items with wear level 'X' (heavily worn) and more.
 
 Or you can confiscate all owned items by specifying ``all``.
@@ -33,6 +32,6 @@ Or you can confiscate all owned items by specifying ``all``.
 Example
 -------
 
-- ``cleanowned scattered X``
+``cleanowned scattered X``
     Confiscate and dump rotten and dropped food, garbage on the floors, and any
     worn items with 'X' damage and above.
diff --git a/docs/plugins/command-prompt.rst b/docs/plugins/command-prompt.rst
index 6e3d2a829..3b46e1b33 100644
--- a/docs/plugins/command-prompt.rst
+++ b/docs/plugins/command-prompt.rst
@@ -1,6 +1,5 @@
 command-prompt
 ==============
-
 Tags:
 :dfhack-keybind:`command-prompt`
 
diff --git a/docs/plugins/confirm.rst b/docs/plugins/confirm.rst
index 25cc04956..aceb1e6d6 100644
--- a/docs/plugins/confirm.rst
+++ b/docs/plugins/confirm.rst
@@ -1,6 +1,5 @@
 confirm
 =======
-
 Tags:
 :dfhack-keybind:`confirm`
 
@@ -11,9 +10,9 @@ case you hit the key accidentally.
 
 Usage:
 
-- ``enable confirm``, ``confirm enable all``
+``enable confirm``, ``confirm enable all``
     Enable all confirmation options. Replace with ``disable`` to disable all.
-- ``confirm enable option1 [option2...]``
+``confirm enable option1 [option2...]``
     Enable (or ``disable``) specific confirmation dialogs.
 
 When run without parameters, ``confirm`` will report which confirmation dialogs
diff --git a/docs/plugins/createitem.rst b/docs/plugins/createitem.rst
index 13ecc2e58..b49a85be4 100644
--- a/docs/plugins/createitem.rst
+++ b/docs/plugins/createitem.rst
@@ -1,6 +1,5 @@
 createitem
 ==========
-
 Tags:
 :dfhack-keybind:`createitem`
 
@@ -23,14 +22,14 @@ Corpses, body parts, and prepared meals cannot be created using this tool.
 
 Usage:
 
-- ``createitem <item> <material> [<count>]``
+``createitem <item> <material> [<count>]``
     Create <count> copies (default is 1) of the specified item made out of the
     specified material.
-- ``createitem inspect``
+``createitem inspect``
     Obtain the item and material tokens of an existing item. Its output can be
     used directly as arguments to ``createitem`` to create new matching items
     (as long as the item type is supported).
-- ``createitem floor|item|building``
+``createitem floor|item|building``
     Subsequently created items will be placed on the floor beneath the selected
     unit's, inside the selected item, or as part of the selected building.
 
@@ -39,14 +38,15 @@ Usage:
     ``createitem building`` is good for loading traps, but if you use it with
     workshops, you will have to deconstruct the workshop to access the item.
 
-Examples:
+Examples
+--------
 
-- ``createitem GLOVES:ITEM_GLOVES_GAUNTLETS INORGANIC:STEEL 2``
+``createitem GLOVES:ITEM_GLOVES_GAUNTLETS INORGANIC:STEEL 2``
     Create 2 pairs of steel gauntlets (that is, 2 left gauntlets and 2 right
     gauntlets).
-- ``createitem WOOD PLANT_MAT:TOWER_CAP:WOOD 100``
+``createitem WOOD PLANT_MAT:TOWER_CAP:WOOD 100``
     Create 100 tower-cap logs.
-- ``createitem PLANT_GROWTH BILBERRY:FRUIT``
+``createitem PLANT_GROWTH BILBERRY:FRUIT``
     Create a single bilberry.
 
 For more examples, :wiki:`the wiki <Utility:DFHack/createitem>`.
diff --git a/docs/plugins/cursecheck.rst b/docs/plugins/cursecheck.rst
index 79da6d621..17cdacf26 100644
--- a/docs/plugins/cursecheck.rst
+++ b/docs/plugins/cursecheck.rst
@@ -1,6 +1,5 @@
 cursecheck
 ==========
-
 Tags:
 :dfhack-keybind:`cursecheck`
 
@@ -22,23 +21,8 @@ Usage::
 
    cursecheck [<options>]
 
-Options:
-
-- ``detail``
-   Print full name, date of birth, date of curse, and some status info (some
-   vampires might use fake identities in-game, though).
-- ``nick``
-   Set the type of curse as nickname (does not always show up in-game; some
-   vamps don't like nicknames).
-- ``ids``
-   Print the creature and race IDs.
-- ``all``
-   Include dead and passive cursed creatures (this can result in quite a long
-   list after having !!FUN!! with necromancers).
-- ``verbose``
-   Print all curse tags (if you really want to know it all).
-
-Examples:
+Examples
+--------
 
 - ``cursecheck``
    Display a count of cursed creatures on the map (or under the cursor).
@@ -54,3 +38,20 @@ Examples:
 
     If you see any living/active creatures with a cursetype of "unknown", then
     it is most likely a new type of curse introduced by a mod.
+
+Options
+-------
+
+``detail``
+   Print full name, date of birth, date of curse, and some status info (some
+   vampires might use fake identities in-game, though).
+``nick``
+   Set the type of curse as nickname (does not always show up in-game; some
+   vamps don't like nicknames).
+``ids``
+   Print the creature and race IDs.
+``all``
+   Include dead and passive cursed creatures (this can result in quite a long
+   list after having !!FUN!! with necromancers).
+``verbose``
+   Print all curse tags (if you really want to know it all).

From 3c92d4f1956d67cd7b07d62e80aa19c77b9289eb Mon Sep 17 00:00:00 2001
From: Myk <myk002@yahoo.com>
Date: Sat, 23 Jul 2022 16:35:40 -0700
Subject: [PATCH 302/854] Fix typo

---
 library/lua/helpdb.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/library/lua/helpdb.lua b/library/lua/helpdb.lua
index 8b35b0d25..5e0f49920 100644
--- a/library/lua/helpdb.lua
+++ b/library/lua/helpdb.lua
@@ -636,7 +636,7 @@ end
 function is_builtin(command)
     ensure_db()
     return entrydb[command] and
-            get_db_property(entry_name, 'entry_types')[ENTRY_TYPES.BUILTIN]
+            get_db_property(command, 'entry_types')[ENTRY_TYPES.BUILTIN]
 end
 
 ---------------------------------------------------------------------------

From 2ed93418d2b7400162aa9ab6e6720bfd05af692a Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Sat, 23 Jul 2022 21:51:28 -0700
Subject: [PATCH 303/854] separate base command cnts from user command cnts

---
 data/CMakeLists.txt                                            | 3 +++
 .../command_counts.json => data/base_command_counts.json       | 0
 2 files changed, 3 insertions(+)
 rename dfhack-config/command_counts.json => data/base_command_counts.json (100%)

diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt
index ea88d4473..412ffa347 100644
--- a/data/CMakeLists.txt
+++ b/data/CMakeLists.txt
@@ -1,6 +1,9 @@
 install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/init/
         DESTINATION "${DFHACK_DATA_DESTINATION}/init")
 
+install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/base_command_counts.json
+        DESTINATION "${DFHACK_DATA_DESTINATION}/data/base_command_counts.json")
+
 install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/quickfort/
         DESTINATION "${DFHACK_DATA_DESTINATION}/data/quickfort")
 
diff --git a/dfhack-config/command_counts.json b/data/base_command_counts.json
similarity index 100%
rename from dfhack-config/command_counts.json
rename to data/base_command_counts.json

From 5f56d792352c0ee3ca2c1656cd96231c8e46a804 Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Sat, 23 Jul 2022 21:55:49 -0700
Subject: [PATCH 304/854] move dfhack.history to dfhack-config/dfhack.history

---
 docs/plugins/debug.rst   | 22 ++++++++---------
 docs/plugins/deramp.rst  |  1 -
 docs/plugins/dig-now.rst | 23 +++++++++---------
 docs/plugins/dig.rst     | 52 ++++++++++++++++++++++++++--------------
 library/Core.cpp         |  6 +++--
 5 files changed, 61 insertions(+), 43 deletions(-)

diff --git a/docs/plugins/debug.rst b/docs/plugins/debug.rst
index 331e675ab..2b3b20359 100644
--- a/docs/plugins/debug.rst
+++ b/docs/plugins/debug.rst
@@ -1,6 +1,5 @@
 debug
 =====
-
 Tags:
 :dfhack-keybind:`debugfilter`
 
@@ -37,36 +36,37 @@ printing level selection.
 
 Usage:
 
-- ``debugfilter category [<plugin regex>] [<category regex>]``
+``debugfilter category [<plugin regex>] [<category regex>]``
     List available debug plugin and category names. If filters aren't givenm
     then all plugins/categories are matched. This command is a good way to test
     regex parameters before you pass them to ``set``.
-- ``debugfilter filter [<id>]``
+``debugfilter filter [<id>]``
     List active and passive debug print level changes. The optional ``id``
     parameter is the id listed as first column in the filter list. If ``id`` is
     given, then the command shows extended information for the given filter
     only.
-- ``debugfilter set [<level>] [<plugin regex>] [<category regex>]``
+``debugfilter set [<level>] [<plugin regex>] [<category regex>]``
     Create a new debug filter to set category verbosity levels. This filter
     will not be saved when the DF process exists or the plugin is unloaded.
-- ``debugfilter set persistent [<level>] [<plugin regex>] [<category regex>]``
+``debugfilter set persistent [<level>] [<plugin regex>] [<category regex>]``
     Store the filter in the configuration file to until ``unset`` is used to
     remove it.
-- ``debugfilter unset <id> [<id> ...]``
+``debugfilter unset <id> [<id> ...]``
     Delete a space separated list of filters.
-- ``debugfilter disable <id> [<id> ...]``
+``debugfilter disable <id> [<id> ...]``
     Disable a space separated list of filters but keep it in the filter list.
-- ``debugfilter enable <id> [<id> ...]``
+``debugfilter enable <id> [<id> ...]``
     Enable a space sperate list of filters.
-- ``debugfilter header [enable] | [disable] [<element> ...]``
+``debugfilter header [enable] | [disable] [<element> ...]``
     Control which header metadata is shown along with each log message. Run it
     without parameters to see the list of configurable elements. Include an
     ``enable`` or ``disable``  keyword to change whether specific elements are
     shown.
 
-Examples:
+Example
+-------
 
-- ``debugfilter set Warning core script``
+``debugfilter set Warning core script``
     Hide script execution log messages (e.g. "Loading script:
     dfhack-config/dfhack.init"), which are normally output at Info verbosity
     in the "core" plugin with the "script" category.
diff --git a/docs/plugins/deramp.rst b/docs/plugins/deramp.rst
index 7489e506e..7f4a8ce24 100644
--- a/docs/plugins/deramp.rst
+++ b/docs/plugins/deramp.rst
@@ -1,6 +1,5 @@
 deramp
 ======
-
 Tags:
 :dfhack-keybind:`deramp`
 
diff --git a/docs/plugins/dig-now.rst b/docs/plugins/dig-now.rst
index 4628f10f5..cdb21c01a 100644
--- a/docs/plugins/dig-now.rst
+++ b/docs/plugins/dig-now.rst
@@ -1,6 +1,5 @@
 dig-now
 =======
-
 Tags:
 :dfhack-keybind:`dig-now`
 
@@ -33,31 +32,33 @@ Any ``<pos>`` parameters can either be an ``<x>,<y>,<z>`` triple (e.g.
 game cursor should be used. You can use the `position` command to get the
 current cursor position if you need it.
 
-Examples:
+Examples
+--------
 
-- ``dig-now``
+``dig-now``
     Dig designated tiles according to standard game rules.
-- ``dig-now --clean``
+``dig-now --clean``
     Dig all designated tiles, but don't generate any boulders, ores, or gems.
-- ``dig-now --dump here``
+``dig-now --dump here``
     Dig tiles and teleport all generated boulders, ores, and gems to the tile
     under the game cursor.
 
-Options:
+Options
+-------
 
-- ``-c``, ``--clean``
+``-c``, ``--clean``
     Don't generate any boulders, ores, or gems. Equivalent to
     ``--percentages 0,0,0,0``.
-- ``-d``, ``--dump <pos>``
+``-d``, ``--dump <pos>``
     Dump any generated items at the specified coordinates. If the tile at those
     coordinates is open space or is a wall, items will be generated on the
     closest walkable tile below.
-- ``-e``, ``--everywhere``
+``-e``, ``--everywhere``
     Generate a boulder, ore, or gem for every tile that can produce one.
     Equivalent to ``--percentages 100,100,100,100``.
-- ``-p``, ``--percentages <layer>,<vein>,<small cluster>,<deep>``
+``-p``, ``--percentages <layer>,<vein>,<small cluster>,<deep>``
     Set item generation percentages for each of the tile categories. The
     ``vein`` category includes both the large oval clusters and the long stringy
     mineral veins. Default is ``25,33,100,100``.
-- ``-z``, ``--cur-zlevel``
+``-z``, ``--cur-zlevel``
     Restricts the bounds to the currently visible z-level.
diff --git a/docs/plugins/dig.rst b/docs/plugins/dig.rst
index c4811883b..edb9b8007 100644
--- a/docs/plugins/dig.rst
+++ b/docs/plugins/dig.rst
@@ -3,17 +3,39 @@
 
 dig
 ===
-This plugin makes many automated or complicated dig patterns easy.
-
-Basic commands:
-
-:digv:      Designate all of the selected vein for digging.
-:digvx:     Also cross z-levels, digging stairs as needed.  Alias for ``digv x``.
-:digl:      Like ``digv``, for layer stone.  Also supports an ``undo`` option
-            to remove designations, for if you accidentally set 50 levels at once.
-:diglx:     Also cross z-levels, digging stairs as needed.  Alias for ``digl x``.
-
+Tags:
 :dfhack-keybind:`digv`
+:dfhack-keybind:`digvx`
+:dfhack-keybind:`digl`
+:dfhack-keybind:`diglx`
+:dfhack-keybind:`digcircle`
+:dfhack-keybind:`digtype`
+:dfhack-keybind:`digexp`
+
+Make complicated dig patterns easy.
+
+Usage:
+
+``digv [x] [-p<number>]``
+    Designate all of the selected vein for digging.
+``digvx [-p<number>]``
+    Also cross z-levels, digging stairs as needed.  Alias for ``digv x``.
+``digl [x] [undo] [-p<number>]``
+    Like ``digv``, for layer stone. If ``undo`` is specified, removes the
+    layer designation instead (for if you accidentally set 50 levels at once).
+``diglx [-p<number>]``
+    Also cross z-levels, digging stairs as needed. Alias for ``digl x``.
+``digcircle [<diameter>] [<solidity>] [<action>] [<designation>] [-p<number>]``
+    Designate circles. The diameter is the number of tiles across the center of
+    the circle that you want to dig. See the `digcircle`_ section below for an
+    explanation of the options.
+``digtype [<designation>]
+For every tile on the map of the same vein type as the selected tile,
+this command designates it to have the same designation as the
+selected tile. If the selected tile has no designation, they will be
+dig designated.
+    
+``digexp [<pattern>] [<filter>]
 
 .. note::
 
@@ -24,15 +46,9 @@ Basic commands:
 
 digcircle
 =========
-A command for easy designation of filled and hollow circles.
-It has several types of options.
-
-Shape:
-
-:hollow:   Set the circle to hollow (default)
-:filled:   Set the circle to filled
-:#:        Diameter in tiles (default = 0, does nothing)
 
+    Designate filled or hollow circles. If neither ``hollow`` nor ``filled``
+    is specified, the default is ``hollow``. The diameter is the number of tiles
 Action:
 
 :set:      Set designation (default)
diff --git a/library/Core.cpp b/library/Core.cpp
index 72ddc33aa..a926391d9 100644
--- a/library/Core.cpp
+++ b/library/Core.cpp
@@ -1311,12 +1311,14 @@ void fInitthread(void * iodata)
 // A thread function... for the interactive console.
 void fIOthread(void * iodata)
 {
+    static const char * HISTORY_FILE = "dfhack-config/dfhack.history";
+    
     IODATA * iod = ((IODATA*) iodata);
     Core * core = iod->core;
     PluginManager * plug_mgr = ((IODATA*) iodata)->plug_mgr;
 
     CommandHistory main_history;
-    main_history.load("dfhack.history");
+    main_history.load(HISTORY_FILE);
 
     Console & con = core->getConsole();
     if (plug_mgr == 0)
@@ -1357,7 +1359,7 @@ void fIOthread(void * iodata)
         {
             // a proper, non-empty command was entered
             main_history.add(command);
-            main_history.save("dfhack.history");
+            main_history.save(HISTORY_FILE);
         }
 
         auto rv = core->runCommand(con, command);

From f9d4781cbcb40c70badf78e57d7147e550238b8a Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Sat, 23 Jul 2022 22:12:34 -0700
Subject: [PATCH 305/854] use dfhack-config/lua.history instead of lua.history

---
 library/LuaTools.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/library/LuaTools.cpp b/library/LuaTools.cpp
index cef46c053..fea90b394 100644
--- a/library/LuaTools.cpp
+++ b/library/LuaTools.cpp
@@ -1145,7 +1145,7 @@ bool DFHack::Lua::InterpreterLoop(color_ostream &out, lua_State *state,
         return false;
 
     if (!hfile)
-        hfile = "lua.history";
+        hfile = "dfhack-config/lua.history";
     if (!prompt)
         prompt = "lua";
 

From d1f690baa51afb0cdb20707f68055dffb88b68ca Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Sat, 23 Jul 2022 22:12:58 -0700
Subject: [PATCH 306/854] move liquids.history to dfhack-config/liquids.history

---
 plugins/liquids.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/plugins/liquids.cpp b/plugins/liquids.cpp
index 5dd64812f..76c098c8a 100644
--- a/plugins/liquids.cpp
+++ b/plugins/liquids.cpp
@@ -55,6 +55,7 @@ using namespace df::enums;
 DFHACK_PLUGIN("liquids");
 REQUIRE_GLOBAL(world);
 
+static const char * HISTORY_FILE = "dfhack-config/liquids.history";
 CommandHistory liquids_hist;
 
 command_result df_liquids (color_ostream &out, vector <string> & parameters);
@@ -62,7 +63,7 @@ command_result df_liquids_here (color_ostream &out, vector <string> & parameters
 
 DFhackCExport command_result plugin_init ( color_ostream &out, std::vector <PluginCommand> &commands)
 {
-    liquids_hist.load("liquids.history");
+    liquids_hist.load(HISTORY_FILE);
     commands.push_back(PluginCommand(
         "liquids", "Place magma, water or obsidian.",
         df_liquids, true,
@@ -80,7 +81,7 @@ DFhackCExport command_result plugin_init ( color_ostream &out, std::vector <Plug
 
 DFhackCExport command_result plugin_shutdown ( color_ostream &out )
 {
-    liquids_hist.save("liquids.history");
+    liquids_hist.save(HISTORY_FILE);
     return CR_OK;
 }
 

From 932f1c2189d9bbc4865d2226a434fd0875131a79 Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Sat, 23 Jul 2022 22:13:19 -0700
Subject: [PATCH 307/854] move tiletypes.history to
 dfhack-config/tiletypes.history

---
 plugins/tiletypes.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/plugins/tiletypes.cpp b/plugins/tiletypes.cpp
index 7f39ddd4e..b8bbc8d04 100644
--- a/plugins/tiletypes.cpp
+++ b/plugins/tiletypes.cpp
@@ -74,7 +74,7 @@ static const struct_field_info tiletypes_options_fields[] = {
 };
 struct_identity tiletypes_options::_identity(sizeof(tiletypes_options), &df::allocator_fn<tiletypes_options>, NULL, "tiletypes_options", NULL, tiletypes_options_fields);
 
-
+static const char * HISTORY_FILE = "dfhack-config/tiletypes.history";
 CommandHistory tiletypes_hist;
 
 command_result df_tiletypes (color_ostream &out, vector <string> & parameters);
@@ -84,7 +84,7 @@ command_result df_tiletypes_here_point (color_ostream &out, vector <string> & pa
 
 DFhackCExport command_result plugin_init ( color_ostream &out, std::vector <PluginCommand> &commands)
 {
-    tiletypes_hist.load("tiletypes.history");
+    tiletypes_hist.load(HISTORY_FILE);
     commands.push_back(PluginCommand("tiletypes", "Paint map tiles freely, similar to liquids.", df_tiletypes, true));
     commands.push_back(PluginCommand("tiletypes-command", "Run tiletypes commands (seperated by ' ; ')", df_tiletypes_command));
     commands.push_back(PluginCommand("tiletypes-here", "Repeat tiletypes command at cursor (with brush)", df_tiletypes_here));
@@ -94,7 +94,7 @@ DFhackCExport command_result plugin_init ( color_ostream &out, std::vector <Plug
 
 DFhackCExport command_result plugin_shutdown ( color_ostream &out )
 {
-    tiletypes_hist.save("tiletypes.history");
+    tiletypes_hist.save(HISTORY_FILE);
     return CR_OK;
 }
 

From 9dd62f2291c27be9b84dc655a656659dfbb54aa4 Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Sat, 23 Jul 2022 22:40:33 -0700
Subject: [PATCH 308/854] update docs for dig

---
 docs/plugins/dig.rst | 177 +++++++++++++++++++++++++------------------
 1 file changed, 103 insertions(+), 74 deletions(-)

diff --git a/docs/plugins/dig.rst b/docs/plugins/dig.rst
index edb9b8007..941172ef7 100644
--- a/docs/plugins/dig.rst
+++ b/docs/plugins/dig.rst
@@ -27,101 +27,130 @@ Usage:
     Also cross z-levels, digging stairs as needed. Alias for ``digl x``.
 ``digcircle [<diameter>] [<solidity>] [<action>] [<designation>] [-p<number>]``
     Designate circles. The diameter is the number of tiles across the center of
-    the circle that you want to dig. See the `digcircle`_ section below for an
-    explanation of the options.
-``digtype [<designation>]
-For every tile on the map of the same vein type as the selected tile,
-this command designates it to have the same designation as the
-selected tile. If the selected tile has no designation, they will be
-dig designated.
-    
-``digexp [<pattern>] [<filter>]
-
-.. note::
-
-    All commands implemented by the `dig` plugin (listed by ``ls dig``) support
-    specifying the designation priority with ``-p#``, ``-p #``, or ``p=#``,
-    where ``#`` is a number from 1 to 7. If a priority is not specified, the
-    priority selected in-game is used as the default.
+    the circle that you want to dig. See the `digcircle`_ section below for
+    options.
+``digtype [<designation>] [-p<number>]``
+    Designate all vein tiles of the selected type. See the `digtype`_ section
+    below for options.
+``digexp [<pattern>] [<filter>] [-p<number>]``
+    Designate dig patterns for exploratory mining. See the `digexp`_ section
+    below for options
+
+All commands support specifying the priority of the dig designations with
+``-p<number>``, where the number is from 1 to 7. If a priority is not specified,
+the priority selected in-game is used as the default.
+
+Examples
+--------
+
+``digcircle filled 3``
+    Dig a filled circle with a diameter of 3 tiles.
+``digcircle``
+    Do it again (previous parameters are reused).
+``expdig diag5 hidden``
+    Designate the diagonal 5 pattern over all hidden tiles on the current
+    z-level.
+``expdig ladder designated``
+    Take existing designations on the current z-level and replace them with the
+    ladder pattern.
+``expdig``
+    Do it again (previous parameters are reused).
 
 digcircle
-=========
+---------
 
-    Designate filled or hollow circles. If neither ``hollow`` nor ``filled``
-    is specified, the default is ``hollow``. The diameter is the number of tiles
-Action:
+The ``digcircle`` command can accept up to one option of each type below.
 
-:set:      Set designation (default)
-:unset:    Unset current designation
-:invert:   Invert designations already present
+Solidity options:
 
-Designation types:
+``hollow``
+    Designates hollow circles (default).
+``filled``
+    Designates filled circles.
 
-:dig:      Normal digging designation (default)
-:ramp:     Ramp digging
-:ustair:   Staircase up
-:dstair:   Staircase down
-:xstair:   Staircase up/down
-:chan:     Dig channel
+Action options:
 
-After you have set the options, the command called with no options
-repeats with the last selected parameters.
+``set``
+    Set designation (default).
+``unset``
+    Unset current designation.
+``invert``
+    Invert designations already present.
 
-Examples:
+Designation options:
 
-``digcircle filled 3``
-        Dig a filled circle with diameter = 3.
-``digcircle``
-        Do it again.
+``dig``
+    Normal digging designation (default).
+``ramp``
+    Dig ramps.
+``ustair``
+    Dig up staircases.
+``dstair``
+    Dig down staircases.
+``xstair``
+    Dig up/down staircases.
+``chan``
+    Dig channels.
+
+After you have set the options, the command called with no options repeats with
+the last selected parameters.
 
 digtype
-=======
-For every tile on the map of the same vein type as the selected tile,
-this command designates it to have the same designation as the
-selected tile. If the selected tile has no designation, they will be
-dig designated.
-If an argument is given, the designation of the selected tile is
-ignored, and all appropriate tiles are set to the specified
-designation.
-
-Options:
-
-:dig:
-:channel:
-:ramp:
-:updown: up/down stairs
-:up:     up stairs
-:down:   down stairs
-:clear:  clear designation
+-------
+
+For every tile on the map of the same vein type as the selected tile, this
+command designates it to have the same designation as the selected tile. If the
+selected tile has no designation, they will be dig designated.
+
+If an argument is given, the designation of the selected tile is ignored, and
+all appropriate tiles are set to the specified designation.
+
+Designation options:
+
+``dig``
+    Normal digging designation.
+``channel``
+    Dig channels.
+``ramp``
+    Dig ramps.
+``updown``
+    Dig up/down staircases.
+``up``
+    Dig up staircases.
+``down``
+    Dig down staircases.
+``clear``
+    Clear any designations.
 
 digexp
-======
+------
+
 This command is for :wiki:`exploratory mining <Exploratory_mining>`.
 
 There are two variables that can be set: pattern and filter.
 
 Patterns:
 
-:diag5:            diagonals separated by 5 tiles
-:diag5r:           diag5 rotated 90 degrees
-:ladder:           A 'ladder' pattern
-:ladderr:          ladder rotated 90 degrees
-:clear:            Just remove all dig designations
-:cross:            A cross, exactly in the middle of the map.
+``diag5``
+    Diagonals separated by 5 tiles.
+``diag5r``
+    The diag5 pattern rotated 90 degrees.
+``ladder``
+    A 'ladder' pattern.
+``ladderr``
+    The ladder pattern rotated 90 degrees.
+``cross``
+    A cross, exactly in the middle of the map.
+``clear``
+    Just remove all dig designations.
 
 Filters:
 
-:all:              designate whole z-level
-:hidden:           designate only hidden tiles of z-level (default)
-:designated:       Take current designation and apply pattern to it.
+``hidden``
+    Designate only hidden tiles of z-level (default)
+``all``
+    Designate the whole z-level.
+``designated``
+    Take current designation and apply the selected pattern to it.
 
 After you have a pattern set, you can use ``expdig`` to apply it again.
-
-Examples:
-
-``expdig diag5 hidden``
-  Designate the diagonal 5 patter over all hidden tiles
-``expdig``
-  Apply last used pattern and filter
-``expdig ladder designated``
-  Take current designations and replace them with the ladder pattern

From a567665ab29446e00676b0757752eaeb53b93374 Mon Sep 17 00:00:00 2001
From: "pre-commit-ci[bot]"
 <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Date: Sun, 24 Jul 2022 05:41:40 +0000
Subject: [PATCH 309/854] [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci
---
 library/Core.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/library/Core.cpp b/library/Core.cpp
index a926391d9..facd02823 100644
--- a/library/Core.cpp
+++ b/library/Core.cpp
@@ -1312,7 +1312,7 @@ void fInitthread(void * iodata)
 void fIOthread(void * iodata)
 {
     static const char * HISTORY_FILE = "dfhack-config/dfhack.history";
-    
+
     IODATA * iod = ((IODATA*) iodata);
     Core * core = iod->core;
     PluginManager * plug_mgr = ((IODATA*) iodata)->plug_mgr;

From ca06d1d9c55531ece4aa8527ac2e101706e4c719 Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Sun, 24 Jul 2022 16:08:35 -0700
Subject: [PATCH 310/854] update docs for dig (again)

---
 docs/plugins/dig.rst | 37 ++++++++++++++---------
 plugins/dig.cpp      | 70 ++++++++++++++++++--------------------------
 2 files changed, 51 insertions(+), 56 deletions(-)

diff --git a/docs/plugins/dig.rst b/docs/plugins/dig.rst
index 941172ef7..8fbf1a910 100644
--- a/docs/plugins/dig.rst
+++ b/docs/plugins/dig.rst
@@ -17,24 +17,33 @@ Make complicated dig patterns easy.
 Usage:
 
 ``digv [x] [-p<number>]``
-    Designate all of the selected vein for digging.
+    :index:`Designate all of the selected vein for digging.
+    <digv; Designate all of the selected vein for digging.>`
 ``digvx [-p<number>]``
-    Also cross z-levels, digging stairs as needed.  Alias for ``digv x``.
+    :index:`Dig a vein across z-levels, digging stairs as needed.
+    <digvx; Dig a vein across z-levels, digging stairs as needed.>`
+    This is an alias for ``digv x``.
 ``digl [x] [undo] [-p<number>]``
-    Like ``digv``, for layer stone. If ``undo`` is specified, removes the
-    layer designation instead (for if you accidentally set 50 levels at once).
+    :index:`Dig all of the selected layer stone.
+    <digl; Dig all of the selected layer stone.>` If ``undo`` is specified,
+    removes the designation instead (for if you accidentally set 50 levels at
+    once).
 ``diglx [-p<number>]``
-    Also cross z-levels, digging stairs as needed. Alias for ``digl x``.
+    :index:`Dig layer stone across z-levels, digging stairs as needed.
+    <diglx; Dig layer stone across z-levels, digging stairs as needed.>` This
+    is an alias for ``digl x``.
 ``digcircle [<diameter>] [<solidity>] [<action>] [<designation>] [-p<number>]``
-    Designate circles. The diameter is the number of tiles across the center of
-    the circle that you want to dig. See the `digcircle`_ section below for
-    options.
+    :index:`Designate circles. <digcircles; Designate circles.>` The diameter
+    is the number of tiles across the center of the circle that you want to dig.
+    See the `digcircle`_ section below for options.
 ``digtype [<designation>] [-p<number>]``
-    Designate all vein tiles of the selected type. See the `digtype`_ section
-    below for options.
+    :index:`Designate all vein tiles of the selected type.
+    <digtype; Designate all vein tiles of the selected type.>` See the `digtype`_
+    section below for options.
 ``digexp [<pattern>] [<filter>] [-p<number>]``
-    Designate dig patterns for exploratory mining. See the `digexp`_ section
-    below for options
+    :index:`Designate dig patterns for exploratory mining.
+    <digexp; Designate dig patterns for exploratory mining.>` See the `digexp`_
+    section below for options
 
 All commands support specifying the priority of the dig designations with
 ``-p<number>``, where the number is from 1 to 7. If a priority is not specified,
@@ -43,8 +52,8 @@ the priority selected in-game is used as the default.
 Examples
 --------
 
-``digcircle filled 3``
-    Dig a filled circle with a diameter of 3 tiles.
+``digcircle filled 3 -p2``
+    Dig a filled circle with a diameter of 3 tiles at dig priority 2.
 ``digcircle``
     Do it again (previous parameters are reused).
 ``expdig diag5 hidden``
diff --git a/plugins/dig.cpp b/plugins/dig.cpp
index 6c33f206a..ddc2cd97e 100644
--- a/plugins/dig.cpp
+++ b/plugins/dig.cpp
@@ -28,7 +28,6 @@ command_result digv (color_ostream &out, vector <string> & parameters);
 command_result digvx (color_ostream &out, vector <string> & parameters);
 command_result digl (color_ostream &out, vector <string> & parameters);
 command_result diglx (color_ostream &out, vector <string> & parameters);
-command_result digauto (color_ostream &out, vector <string> & parameters);
 command_result digexp (color_ostream &out, vector <string> & parameters);
 command_result digcircle (color_ostream &out, vector <string> & parameters);
 command_result digtype (color_ostream &out, vector <string> & parameters);
@@ -40,44 +39,37 @@ REQUIRE_GLOBAL(world);
 DFhackCExport command_result plugin_init ( color_ostream &out, std::vector <PluginCommand> &commands)
 {
     commands.push_back(PluginCommand(
-        "digv","Dig a whole vein.",digv,Gui::cursor_hotkey,
-        "  Designates a whole vein under the cursor for digging.\n"
-        "Options:\n"
-        "  x - follow veins through z-levels with stairs.\n"
-        ));
+        "digv",
+        "Dig a whole vein.",
+        digv,
+        Gui::cursor_hotkey));
     commands.push_back(PluginCommand(
-        "digvx","Dig a whole vein, following through z-levels.",digvx,Gui::cursor_hotkey,
-        "  Designates a whole vein under the cursor for digging.\n"
-        "  Also follows the vein between z-levels with stairs, like 'digv x' would.\n"
-        ));
+        "digvx",
+        "Dig a whole vein, following through z-levels.",
+        digvx,
+        Gui::cursor_hotkey));
    commands.push_back(PluginCommand(
-        "digl","Dig layerstone.",digl,Gui::cursor_hotkey,
-        "  Designates layerstone under the cursor for digging.\n"
-        "  Veins will not be touched.\n"
-        "Options:\n"
-        "  x    - follow layer through z-levels with stairs.\n"
-        "  undo - clear designation (can be used together with 'x').\n"
-        ));
+        "digl",
+        "Dig layerstone.",
+        digl,
+        Gui::cursor_hotkey));
     commands.push_back(PluginCommand(
-        "diglx","Dig layerstone, following through z-levels.",diglx,Gui::cursor_hotkey,
-        "  Designates layerstone under the cursor for digging.\n"
-        "  Also follows the stone between z-levels with stairs, like 'digl x' would.\n"
-        ));
-    commands.push_back(PluginCommand("digexp","Select or designate an exploratory pattern.",digexp));
-    commands.push_back(PluginCommand("digcircle","Dig designate a circle (filled or hollow)",digcircle));
-    //commands.push_back(PluginCommand("digauto","Mark a tile for continuous digging.",autodig));
-    commands.push_back(PluginCommand("digtype", "Dig all veins of a given type.", digtype,Gui::cursor_hotkey,
-        "For every tile on the map of the same vein type as the selected tile, this command designates it to have the same designation as the selected tile. If the selected tile has no designation, they will be dig designated.\n"
-        "If an argument is given, the designation of the selected tile is ignored, and all appropriate tiles are set to the specified designation.\n"
-        "Options:\n"
-        "  dig\n"
-        "  channel\n"
-        "  ramp\n"
-        "  updown - up/down stairs\n"
-        "  up     - up stairs\n"
-        "  down   - down stairs\n"
-        "  clear  - clear designation\n"
-        ));
+        "diglx",
+        "Dig layerstone, following through z-levels.",
+        diglx,
+        Gui::cursor_hotkey));
+    commands.push_back(PluginCommand(
+        "digexp",
+        "Select or designate an exploratory pattern.",
+        digexp));
+    commands.push_back(PluginCommand(
+        "digcircle",
+        "Dig designate a circle (filled or hollow)",
+        digcircle));
+    commands.push_back(PluginCommand(
+        "digtype",
+        "Dig all veins of a given type.",
+        digtype,Gui::cursor_hotkey));
     return CR_OK;
 }
 
@@ -1420,12 +1412,6 @@ command_result digl (color_ostream &out, vector <string> & parameters)
     return CR_OK;
 }
 
-
-command_result digauto (color_ostream &out, vector <string> & parameters)
-{
-    return CR_NOT_IMPLEMENTED;
-}
-
 command_result digtype (color_ostream &out, vector <string> & parameters)
 {
     //mostly copy-pasted from digv

From 60b599865c664fe065d875f20874b55b111d7a11 Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Sun, 24 Jul 2022 17:01:50 -0700
Subject: [PATCH 311/854] update docs for digFlood

---
 docs/plugins/digFlood.rst | 46 ++++++++++++++++++++++++++++-----------
 plugins/digFlood.cpp      | 23 +++-----------------
 2 files changed, 36 insertions(+), 33 deletions(-)

diff --git a/docs/plugins/digFlood.rst b/docs/plugins/digFlood.rst
index dd957feb2..cb8018145 100644
--- a/docs/plugins/digFlood.rst
+++ b/docs/plugins/digFlood.rst
@@ -1,18 +1,38 @@
 digFlood
 ========
-Automatically digs out specified veins as they are discovered. It runs once
-every time a dwarf finishes a dig job. It will only dig out appropriate tiles
-that are adjacent to the finished dig job. To add a vein type, use ``digFlood 1 [type]``.
-This will also enable the plugin. To remove a vein type, use ``digFlood 0 [type] 1``
-to disable, then remove, then re-enable.
+Tags:
+:dfhack-keybind:`digFlood`
+
+:index:`Digs out veins as they are discovered.
+<digFlood; Digs out veins as they are discovered.>` It will only dig out
+appropriate tiles that are adjacent to a just-finished dig job, so if you want
+to autodig a vein that has already been discovered, you may need to manually
+designate one tile of the tile for digging to get started.
 
 Usage:
 
-:help digflood:     detailed help message
-:digFlood 0:        disable the plugin
-:digFlood 1:        enable the plugin
-:digFlood 0 MICROCLINE COAL_BITUMINOUS 1:
-                    disable plugin, remove microcline and bituminous coal from monitoring, then re-enable the plugin
-:digFlood CLEAR:    remove all inorganics from monitoring
-:digFlood digAll1:  ignore the monitor list and dig any vein
-:digFlood digAll0:  disable digAll mode
+``enable digflood``
+    Enable the plugin.
+``digflood 1 <vein type> [<vein type> ...]``
+    Start monitoring for the specified vein types.
+``digFlood 0 <vein type> [<vein type> ...] 1``
+    Stop monitoring for the specified vein types. Note the required ``1`` at the
+    end.
+``digFlood CLEAR``
+    Remove all inorganics from monitoring.
+``digFlood digAll1``
+    Ignore the monitor list and dig any vein.
+``digFlood digAll0``
+    Disable digAll mode.
+
+You can get the list of valid vein types with this command::
+
+    lua "for i,mat in ipairs(df.global.world.raws.inorganics) do if mat.material.flags.IS_STONE and not mat.material.flags.NO_STONE_STOCKPILE then print(i, mat.id) end end"
+
+Examples
+--------
+
+``digFlood 1 MICROCLINE COAL_BITUMINOUS``
+    Automatically dig microcline and bituminous coal veins.
+``digFlood 0 MICROCLINE 1``
+    Stop automatically digging microcline.
diff --git a/plugins/digFlood.cpp b/plugins/digFlood.cpp
index 459a12c11..7370d3fe5 100644
--- a/plugins/digFlood.cpp
+++ b/plugins/digFlood.cpp
@@ -51,26 +51,9 @@ DFhackCExport command_result plugin_enable(color_ostream& out, bool enable) {
 DFhackCExport command_result plugin_init ( color_ostream &out, std::vector <PluginCommand> &commands)
 {
     commands.push_back(PluginCommand(
-        "digFlood", "Automatically dig out veins as you discover them.",
-        digFlood, false,
-        "Example:\n"
-        "  digFlood 0\n"
-        "    disable plugin\n"
-        "  digFlood 1\n"
-        "    enable plugin\n"
-        "  digFlood 0 MICROCLINE COAL_BITUMINOUS 1\n"
-        "    disable plugin and remove microcline and bituminous coal from being monitored, then re-enable plugin\n"
-        "  digFlood 1 MICROCLINE 0 COAL_BITUMINOUS 1\n"
-        "    do monitor microcline, don't monitor COAL_BITUMINOUS, then enable plugin\n"
-        "  digFlood CLEAR\n"
-        "    remove all inorganics from monitoring\n"
-        "  digFlood digAll1\n"
-        "    enable digAll mode: dig any vein, regardless of the monitor list\n"
-        "  digFlood digAll0\n"
-        "    disable digAll mode\n"
-        "\n"
-        "Note that while order matters, multiple commands can be sequenced in one line. It is recommended to alter your save-specific regionX/raw/onLoad.init or global onLoadWorld.init file so that you won't have to type in every mineral type you want to dig every time you start the game. Material names are case sensitive.\n"
-    ));
+        "digFlood",
+        "Automatically dig out veins as you discover them.",
+        digFlood));
     return CR_OK;
 }
 

From b2ca3cb19439aaaed531b48f4b21943a54fff174 Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Sun, 24 Jul 2022 20:12:04 -0700
Subject: [PATCH 312/854] update docs for diggingInvaders

---
 docs/plugins/diggingInvaders.rst            | 83 ++++++++++++++-------
 plugins/diggingInvaders/diggingInvaders.cpp | 25 +------
 2 files changed, 60 insertions(+), 48 deletions(-)

diff --git a/docs/plugins/diggingInvaders.rst b/docs/plugins/diggingInvaders.rst
index 09a22c07a..9bca23163 100644
--- a/docs/plugins/diggingInvaders.rst
+++ b/docs/plugins/diggingInvaders.rst
@@ -1,28 +1,59 @@
 diggingInvaders
 ===============
-Makes invaders dig or destroy constructions to get to your dwarves.
-
-To enable/disable the pluging, use: ``diggingInvaders (1|enable)|(0|disable)``
-
-Basic usage:
-
-:add GOBLIN:        registers the race GOBLIN as a digging invader. Case-sensitive.
-:remove GOBLIN:     unregisters the race GOBLIN as a digging invader. Case-sensitive.
-:now:               makes invaders try to dig now, if plugin is enabled
-:clear:             clears all digging invader races
-:edgesPerTick n:    makes the pathfinding algorithm work on at most n edges per tick.
-                    Set to 0 or lower to make it unlimited.
-
-You can also use ``diggingInvaders setCost (race) (action) n`` to set the
-pathing cost of particular action, or ``setDelay`` to set how long it takes.
-Costs and delays are per-tile, and the table shows default values.
-
-============================== ======= ====== =================================
-Action                         Cost    Delay  Notes
-============================== ======= ====== =================================
-``walk``                       1       0      base cost in the path algorithm
-``destroyBuilding``            2       1,000  delay adds to the job_completion_timer of destroy building jobs that are assigned to invaders
-``dig``                        10,000  1,000  digging soil or natural stone
-``destroyRoughConstruction``   1,000   1,000  constructions made from boulders
-``destroySmoothConstruction``  100     100    constructions made from blocks or bars
-============================== ======= ====== =================================
+Tags:
+:dfhack-keybind:`diggingInvaders`
+
+:index:`Invaders dig and destroy to get to your dwarves.
+<diggingInvaders; Invaders dig and destroy to get to your dwarves.>`
+
+Usage:
+
+``enable diggingInvaders``
+    Enable the plugin.
+``diggingInvaders add <race>``
+    Register the specified race as a digging invader.
+``diggingInvaders remove <race>``
+    Unregisters the specified race as a digging invader.
+``diggingInvaders now``
+    Makes invaders try to dig now (if the plugin is enabled).
+``diggingInvaders clear``
+    Clears the registry of digging invader races.
+``diggingInvaders edgesPerTick <n>``
+    Makes the pathfinding algorithm work on at most n edges per tick. Set to 0
+    or lower to make it unlimited.
+``diggingInvaders setCost <race> <action> <n>``
+    Set the pathing cost per tile for a particular action. This determines what
+    invaders consider to be the shortest path to their target.
+``diggingInvaders setDelay <race> <action> <n>``
+    Set the time cost (in ticks) for performing a particular action. This
+    determines how long it takes for invaders to get to their target.
+
+Note that the race is case-sensitive. You can get a list of races for your world
+with this command::
+
+    devel/query --table df.global.world.raws.creatures.all --search creature_id --maxdepth 1 --maxlength 5000
+
+but in general, the race is what you'd expect, just capitalized (e.g. ``GOBLIN``
+or ``ELF``).
+
+Actions:
+``walk``
+    Default cost: 1, default delay: 0. This is the base cost for the pathing
+    algorithm.
+``destroyBuilding``
+    Default cost: 2, default delay: 1,000,
+``dig``
+    Default cost: 10,000, default delay: 1,000. This is for digging soil or
+    natural stone.
+``destroyRoughConstruction``
+    Default cost: 1,000, default delay: 1,000. This is for destroying
+    constructions made from boulders.
+``destroySmoothConstruction``
+    Default cost: 100, default delay: 100. This is for destroying constructions
+    made from blocks or bars.
+
+Example
+-------
+
+``diggingInvaders add GOBLIN``
+    Registers members of the GOBLIN race as a digging invader.
diff --git a/plugins/diggingInvaders/diggingInvaders.cpp b/plugins/diggingInvaders/diggingInvaders.cpp
index 573c85320..457a00e50 100644
--- a/plugins/diggingInvaders/diggingInvaders.cpp
+++ b/plugins/diggingInvaders/diggingInvaders.cpp
@@ -120,28 +120,9 @@ static int32_t jobDelayDefault[] = {
 DFhackCExport command_result plugin_init (color_ostream &out, std::vector <PluginCommand> &commands)
 {
     commands.push_back(PluginCommand(
-        "diggingInvaders", "Makes invaders dig to your dwarves.",
-        diggingInvadersCommand, false, /* true means that the command can't be used from non-interactive user interface */
-        "  diggingInvaders 0\n    disables the plugin\n"
-        "  diggingInvaders 1\n    enables the plugin\n"
-        "  diggingInvaders enable\n    enables the plugin\n"
-        "  diggingInvaders disable\n    disables the plugin\n"
-        "  diggingInvaders add GOBLIN\n    registers the race GOBLIN as a digging invader. Case-sensitive.\n"
-        "  diggingInvaders remove GOBLIN\n    unregisters the race GOBLIN as a digging invader. Case-sensitive.\n"
-        "  diggingInvaders setCost GOBLIN walk n\n    sets the walk cost in the path algorithm for the race GOBLIN\n"
-        "  diggingInvaders setCost GOBLIN destroyBuilding n\n"
-        "  diggingInvaders setCost GOBLIN dig n\n"
-        "  diggingInvaders setCost GOBLIN destroyRoughConstruction n\n  rough constructions are made from boulders\n"
-        "  diggingInvaders setCost GOBLIN destroySmoothConstruction n\n  smooth constructions are made from blocks or bars instead of boulders\n"
-        "  diggingInvaders setDelay GOBLIN destroyBuilding n\n    adds to the job_completion_timer of destroy building jobs that are assigned to invaders\n"
-        "  diggingInvaders setDelay GOBLIN dig n\n"
-        "  diggingInvaders setDelay GOBLIN destroyRoughConstruction n\n"
-        "  diggingInvaders setDelay GOBLIN destroySmoothConstruction n\n"
-        "  diggingInvaders now\n    makes invaders try to dig now, if plugin is enabled\n"
-        "  diggingInvaders clear\n    clears all digging invader races\n"
-        "  diggingInvaders edgesPerTick n\n    makes the pathfinding algorithm work on at most n edges per tick. Set to 0 or lower to make it unlimited."
-//        "  diggingInvaders\n    Makes invaders try to dig now.\n"
-    ));
+        "diggingInvaders",
+        "Makes invaders dig to your dwarves.",
+        diggingInvadersCommand));
 
     //*df::global::debug_showambush = true;
     return CR_OK;

From d624e9167304c65f6daf096856f9de11af51b895 Mon Sep 17 00:00:00 2001
From: Myk <myk002@yahoo.com>
Date: Sun, 24 Jul 2022 20:59:24 -0700
Subject: [PATCH 313/854] Fix missing newline

---
 docs/plugins/diggingInvaders.rst | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/plugins/diggingInvaders.rst b/docs/plugins/diggingInvaders.rst
index 9bca23163..d2fada0d4 100644
--- a/docs/plugins/diggingInvaders.rst
+++ b/docs/plugins/diggingInvaders.rst
@@ -37,6 +37,7 @@ but in general, the race is what you'd expect, just capitalized (e.g. ``GOBLIN``
 or ``ELF``).
 
 Actions:
+
 ``walk``
     Default cost: 1, default delay: 0. This is the base cost for the pathing
     algorithm.

From ac11cde2130b587a586ea8ee8566d45f384a41a3 Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Sun, 24 Jul 2022 23:08:44 -0700
Subject: [PATCH 314/854] update docs for dwarfmonitor

---
 docs/plugins/dwarfmonitor.rst | 65 +++++++++++++++++++++--------------
 plugins/dwarfmonitor.cpp      | 17 ++-------
 2 files changed, 42 insertions(+), 40 deletions(-)

diff --git a/docs/plugins/dwarfmonitor.rst b/docs/plugins/dwarfmonitor.rst
index cbe3e8bdc..295377c2d 100644
--- a/docs/plugins/dwarfmonitor.rst
+++ b/docs/plugins/dwarfmonitor.rst
@@ -1,35 +1,48 @@
 dwarfmonitor
 ============
-Records dwarf activity to measure fort efficiency.
-
-Options:
-
-:enable <mode>:     Start monitoring ``mode``. ``mode`` can be "work", "misery",
-                    "weather", or "all".  This will enable all corresponding widgets,
-                    if applicable.
-:disable <mode>:    Stop monitoring ``mode``, and disable corresponding widgets, if applicable.
-:stats:             Show statistics summary
-:prefs:             Show dwarf preferences summary
-:reload:            Reload configuration file (``dfhack-config/dwarfmonitor.json``)
-
+Tags:
 :dfhack-keybind:`dwarfmonitor`
 
-Widget configuration:
-
-The following types of widgets (defined in :file:`hack/lua/plugins/dwarfmonitor.lua`)
-can be displayed on the main fortress mode screen:
-
-:date:      Show the in-game date
-:misery:    Show overall happiness levels of all dwarves
-:weather:   Show current weather (rain/snow)
-:cursor:    Show the current mouse cursor position
+:index:`Measure fort happiness and efficiency.
+<dwarfmonitor; Measure fort happiness and efficiency.>` Also show heads-up
+display widgets with live fort statistics.
+
+Usage:
+
+``dwarfmonitor enable <mode>``
+    Start tracking a specific facet of fortress life. The ``mode`` can be
+    "work", "misery", "date", "weather", or "all".  This will show the
+    corresponding on-screen widgets, if applicable.
+``dwarfmonitor disable <mode>``
+    Stop monitoring ``mode`` and disable corresponding widgets.
+``dwarfmonitor stats``
+    Show statistics summary.
+``dwarfmonitor prefs``
+    Show summary of dwarf preferences.
+``dwarfmonitor reload``
+    Reload the widget configuration file (``dfhack-config/dwarfmonitor.json``).
+
+Widget configuration
+--------------------
+
+The following types of widgets (defined in
+:file:`hack/lua/plugins/dwarfmonitor.lua`) can be displayed on the main fortress
+mode screen:
+
+``misery``
+    Show overall happiness levels of all dwarves.
+``date``
+    Show the in-game date.
+``weather``
+    Show current weather (e.g. rain/snow).
+``cursor``
+    Show the current mouse cursor position.
 
 The file :file:`dfhack-config/dwarfmonitor.json` can be edited to control the
-positions and settings of all widgets displayed. This file should contain a
-JSON object with the key ``widgets`` containing an array of objects - see the
-included file in the ``dfhack-config`` folder for an example:
+positions and settings of all widgets. This file should contain a JSON object
+with the key ``widgets`` containing an array of objects:
 
-.. code-block:: lua
+.. code-block:: json
 
     {
         "widgets": [
@@ -45,7 +58,7 @@ included file in the ``dfhack-config`` folder for an example:
 X and Y coordinates begin at zero (in the upper left corner of the screen).
 Negative coordinates will be treated as distances from the lower right corner,
 beginning at 1 - e.g. an x coordinate of 0 is the leftmost column, while an x
-coordinate of 1 is the rightmost column.
+coordinate of -1 is the rightmost column.
 
 By default, the x and y coordinates given correspond to the leftmost tile of
 the widget. Including an ``anchor`` option set to ``right`` will cause the
diff --git a/plugins/dwarfmonitor.cpp b/plugins/dwarfmonitor.cpp
index 84e9b9abe..493796fc6 100644
--- a/plugins/dwarfmonitor.cpp
+++ b/plugins/dwarfmonitor.cpp
@@ -2075,20 +2075,9 @@ DFhackCExport command_result plugin_init(color_ostream &out, std::vector <Plugin
 
     commands.push_back(
         PluginCommand(
-        "dwarfmonitor", "Records dwarf activity to measure fort efficiency",
-        dwarfmonitor_cmd, false,
-        "dwarfmonitor enable <mode>\n"
-        "  Start monitoring <mode>\n"
-        "    <mode> can be \"work\", \"misery\", \"weather\", or \"all\"\n"
-        "dwarfmonitor disable <mode>\n"
-        "    <mode> as above\n\n"
-        "dwarfmonitor stats\n"
-        "  Show statistics summary\n"
-        "dwarfmonitor prefs\n"
-        "  Show dwarf preferences summary\n\n"
-        "dwarfmonitor reload\n"
-        "  Reload configuration file (dfhack-config/dwarfmonitor.json)\n"
-        ));
+            "dwarfmonitor",
+            "Records dwarf activity to measure fort efficiency",
+            dwarfmonitor_cmd));
 
     dm_lua::state=Lua::Core::State;
     if (dm_lua::state == NULL)

From 91e3f6767c303267a43ebec02c361f8df53ab359 Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Sun, 24 Jul 2022 23:10:25 -0700
Subject: [PATCH 315/854] update dwarfmonitor short description

---
 plugins/dwarfmonitor.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/dwarfmonitor.cpp b/plugins/dwarfmonitor.cpp
index 493796fc6..1a453e0d5 100644
--- a/plugins/dwarfmonitor.cpp
+++ b/plugins/dwarfmonitor.cpp
@@ -2076,7 +2076,7 @@ DFhackCExport command_result plugin_init(color_ostream &out, std::vector <Plugin
     commands.push_back(
         PluginCommand(
             "dwarfmonitor",
-            "Records dwarf activity to measure fort efficiency",
+            "Measure fort happiness and efficiency.",
             dwarfmonitor_cmd));
 
     dm_lua::state=Lua::Core::State;

From 595fb221b8e6b36615a104af2918c27d22dc412c Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Sun, 24 Jul 2022 23:24:35 -0700
Subject: [PATCH 316/854] code block is not valid json

---
 docs/plugins/dwarfmonitor.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/plugins/dwarfmonitor.rst b/docs/plugins/dwarfmonitor.rst
index 295377c2d..6c1472c7d 100644
--- a/docs/plugins/dwarfmonitor.rst
+++ b/docs/plugins/dwarfmonitor.rst
@@ -42,7 +42,7 @@ The file :file:`dfhack-config/dwarfmonitor.json` can be edited to control the
 positions and settings of all widgets. This file should contain a JSON object
 with the key ``widgets`` containing an array of objects:
 
-.. code-block:: json
+.. code-block:: lua
 
     {
         "widgets": [

From 32e2ac21031fb3d7769c5b53b30f99505e70f0e5 Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Sun, 24 Jul 2022 23:24:52 -0700
Subject: [PATCH 317/854] update docs for dwarfvet

---
 docs/plugins/dwarfvet.rst | 30 +++++++++++++++++-------------
 plugins/dwarfvet.cpp      | 10 ++--------
 2 files changed, 19 insertions(+), 21 deletions(-)

diff --git a/docs/plugins/dwarfvet.rst b/docs/plugins/dwarfvet.rst
index 1ceb1bc2f..6a1c5a60f 100644
--- a/docs/plugins/dwarfvet.rst
+++ b/docs/plugins/dwarfvet.rst
@@ -1,19 +1,23 @@
 dwarfvet
 ========
-Enables Animal Caretaker functionality
+Tags:
+:dfhack-keybind:`dwarfvet`
 
-Always annoyed your dragons become useless after a minor injury? Well, with
-dwarfvet, your animals become first rate members of your fort. It can also
-be used to train medical skills.
+:index:`Allows animals to be treated at animal hospitals.
+<dwarfvet; Allows animals to be treated at animal hospitals.>`
 
-Animals need to be treated in an animal hospital, which is simply a hospital
-that is also an animal training zone. The console will print out a list on game
-load, and whenever one is added or removed. Dwarfs must have the Animal Caretaker
-labor to treat animals. Normal medical skills are used (and no experience is given
-to the Animal Caretaker skill).
+Annoyed your dragons become useless after a minor injury? Well, with dwarfvet,
+injured animals will be treated at an animal hospital, which is simply a hospital
+that is also an animal training zone. Dwarfs with the Animal Caretaker labor
+enabled will come to the hospital to treat animals. Normal medical skills are
+used (and trained), but no experience is given to the Animal Caretaker skill
+itself.
 
-Options:
+Usage:
 
-:enable:        Enables Animal Caretakers to treat and manage animals
-:disable:       Turns off the plguin
-:report:        Reports all zones that the game considers animal hospitals
+``enable dwarfvet``
+    Enables the plugin.
+``dwarfvet report``
+    Reports all zones that the game considers animal hospitals.
+``dwarfvet report-usage``
+    Reports on animals currently being treated.
diff --git a/plugins/dwarfvet.cpp b/plugins/dwarfvet.cpp
index 30308bc57..356fda238 100644
--- a/plugins/dwarfvet.cpp
+++ b/plugins/dwarfvet.cpp
@@ -370,14 +370,8 @@ DFhackCExport command_result plugin_init ( color_ostream &out, std::vector <Plug
 {
     commands.push_back(PluginCommand(
         "dwarfvet",
-        "Allows animals to be cared for in animal hospitals (activity zones that are animal training + hospital combined).",
-        dwarfvet,
-        false, //allow non-interactive use
-        "dwarfvet enable\n"
-        " enables animals to use animal hospitals (requires dwarf with Animal Caretaker labor enabled)\n"
-        "dwarfvet report\n"
-        " displays all zones dwarfvet considers animal hospitals and their current location on the map\n"
-    ));
+        "Allows animals to be treated at animal hospitals",
+        dwarfvet));
     return CR_OK;
 }
 

From d94fef36ff388457c29561bc1db07affb8d304df Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Sun, 24 Jul 2022 23:39:13 -0700
Subject: [PATCH 318/854] update docs for embark-assistant

---
 docs/plugins/embark-assistant.rst             | 25 ++++++++++++++-----
 plugins/embark-assistant/embark-assistant.cpp | 14 +++--------
 2 files changed, 22 insertions(+), 17 deletions(-)

diff --git a/docs/plugins/embark-assistant.rst b/docs/plugins/embark-assistant.rst
index 4500a919e..88f59efab 100644
--- a/docs/plugins/embark-assistant.rst
+++ b/docs/plugins/embark-assistant.rst
@@ -1,9 +1,22 @@
 embark-assistant
 ================
+Tags:
+:dfhack-keybind:`embark-assistant`
 
-This plugin provides embark site selection help. It has to be run with the
-``embark-assistant`` command while the pre-embark screen is displayed and shows
-extended (and correct(?)) resource information for the embark rectangle as well
-as normally undisplayed sites in the current embark region. It also has a site
-selection tool with more options than DF's vanilla search tool. For detailed
-help invoke the in game info screen.
+:index:`Embark site selection support.
+<embark-assistant; Embark site selection support.>` Run this command while the
+pre-embark screen is displayed to show extended (and correct(?)) resource
+information for the embark rectangle as well as normally undisplayed sites in
+the current embark region. You will also have access to a site selection tool
+with far more options than DF's vanilla search tool.
+
+If you enable the plugin, you'll also be able to invoke ``embark-assistant``
+with the :kdb:`A` key on the pre-embark screen.
+
+Usage::
+
+    enable embark-assistant
+    embark-assistant
+
+Note the site selection tool requires a display height of at least 46 lines to
+display properly.
diff --git a/plugins/embark-assistant/embark-assistant.cpp b/plugins/embark-assistant/embark-assistant.cpp
index 61a1b4f83..b7afe494b 100644
--- a/plugins/embark-assistant/embark-assistant.cpp
+++ b/plugins/embark-assistant/embark-assistant.cpp
@@ -178,17 +178,9 @@ IMPLEMENT_VMETHOD_INTERPOSE(start_site_hook, feed);
 DFhackCExport command_result plugin_init (color_ostream &out, std::vector <PluginCommand> &commands)
 {
     commands.push_back(PluginCommand(
-        "embark-assistant", "Embark site selection support.",
-        embark_assistant, false, /* false means that the command can be used from non-interactive user interface */
-        // Extended help string. Used by CR_WRONG_USAGE and the help command:
-        "  This command starts the embark-assist plugin that provides embark site\n"
-        "  selection help. It has to be called while the pre-embark screen is\n"
-        "  displayed and shows extended (and correct(?)) resource information for\n"
-        "  the embark rectangle as well as normally undisplayed sites in the\n"
-        "  current embark region. It also has a site selection tool with more\n"
-        "  options than DF's vanilla search tool. For detailed help invoke the\n"
-        "  in game info screen. Prefers 46 lines to display properly.\n"
-    ));
+        "embark-assistant",
+        "Embark site selection support.",
+        embark_assistant));
     return CR_OK;
 }
 

From 02cc085a437e07e7b1e5ea379657879baa9592d6 Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Sun, 24 Jul 2022 23:59:04 -0700
Subject: [PATCH 319/854] update docs for embark-tools

---
 docs/plugins/embark-assistant.rst |  2 +-
 docs/plugins/embark-tools.rst     | 36 ++++++++++++++++++++++++-------
 plugins/embark-tools.cpp          | 14 ++----------
 3 files changed, 31 insertions(+), 21 deletions(-)

diff --git a/docs/plugins/embark-assistant.rst b/docs/plugins/embark-assistant.rst
index 88f59efab..3a6081655 100644
--- a/docs/plugins/embark-assistant.rst
+++ b/docs/plugins/embark-assistant.rst
@@ -11,7 +11,7 @@ the current embark region. You will also have access to a site selection tool
 with far more options than DF's vanilla search tool.
 
 If you enable the plugin, you'll also be able to invoke ``embark-assistant``
-with the :kdb:`A` key on the pre-embark screen.
+with the :kbd:`A` key on the pre-embark screen.
 
 Usage::
 
diff --git a/docs/plugins/embark-tools.rst b/docs/plugins/embark-tools.rst
index fcab18fc7..987b76df6 100644
--- a/docs/plugins/embark-tools.rst
+++ b/docs/plugins/embark-tools.rst
@@ -1,12 +1,32 @@
 embark-tools
 ============
-A collection of embark-related tools. Usage and available tools::
+Tags:
+:dfhack-keybind:`embark-tools`
 
-    embark-tools enable/disable tool [tool]...
+:index:`Extend the embark screen functionality.
+<embark-tools; Extend the embark screen functionality.>`
 
-:anywhere:      Allows embarking anywhere (including sites, mountain-only biomes,
-                and oceans). Use with caution.
-:mouse:         Implements mouse controls (currently in the local embark region only)
-:sand:          Displays an indicator when sand is present in the currently-selected
-                area, similar to the default clay/stone indicators.
-:sticky:        Maintains the selected local area while navigating the world map
+Usage::
+
+    enable embark-tools
+    embark-tools enable|disable all
+    embark-tools enable|disable <tool> [<tool> ...]
+
+Avaliable tools are:
+
+``anywhere``
+    Allows embarking anywhere (including sites, mountain-only biomes, and
+    oceans). Use with caution.
+``mouse``
+    Implements mouse controls (currently in the local embark region only).
+``sand``
+    Displays an indicator when sand is present in the currently-selected area,
+    similar to the default clay/stone indicators.
+``sticky``
+    Maintains the selected local area while navigating the world map.
+
+Example
+-------
+
+``embark-tools enable all``
+    Enable all embark screen extensions.
diff --git a/plugins/embark-tools.cpp b/plugins/embark-tools.cpp
index b87295020..924def798 100644
--- a/plugins/embark-tools.cpp
+++ b/plugins/embark-tools.cpp
@@ -752,20 +752,10 @@ DFhackCExport command_result plugin_init (color_ostream &out, std::vector <Plugi
     add_tool(new MouseControl);
     add_tool(new SandIndicator);
     add_tool(new StablePosition);
-    std::string help = "";
-    help += "embark-tools (enable/disable) tool [tool...]\n"
-            "Tools:\n";
-    FOR_ITER_TOOLS(iter)
-    {
-        help += ("  " + iter->second->getId() + ": " + iter->second->getDesc() + "\n");
-    }
     commands.push_back(PluginCommand(
         "embark-tools",
-        "A collection of embark tools",
-        embark_tools_cmd,
-        false,
-        help.c_str()
-    ));
+        "Extend the embark screen functionality.",
+        embark_tools_cmd));
     return CR_OK;
 }
 

From 98ad22ddddc69ce06353414270237a62f240fb5b Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Mon, 25 Jul 2022 06:08:59 -0700
Subject: [PATCH 320/854] align remaining plugin docs to plugin names

---
 ...essreader.rst => RemoteFortressReader.rst} |  0
 docs/plugins/filltraffic.rst                  | 12 +++++
 docs/plugins/fix-job-postings.rst             |  5 --
 docs/plugins/job-duplicate.rst                |  6 ---
 docs/plugins/job-material.rst                 | 15 ------
 docs/plugins/job.rst                          | 15 ------
 docs/plugins/jobutils.rst                     | 40 +++++++++++++++
 docs/plugins/liquids-here.rst                 |  6 ---
 docs/plugins/liquids.rst                      |  9 ++++
 docs/plugins/nopause.rst                      |  4 --
 docs/plugins/{plant.rst => plants.rst}        |  2 +
 docs/plugins/prospect.rst                     | 51 -------------------
 docs/plugins/prospector.rst                   |  2 +
 docs/plugins/rb.rst                           |  4 --
 docs/plugins/restrictice.rst                  |  4 --
 docs/plugins/restrictliquids.rst              |  4 --
 docs/plugins/reveal.rst                       |  7 +++
 docs/plugins/revflood.rst                     | 23 ---------
 docs/plugins/revforget.rst                    | 23 ---------
 docs/plugins/revtoggle.rst                    | 23 ---------
 docs/plugins/ruby.rst                         |  2 +
 docs/plugins/sort-items.rst                   | 17 -------
 docs/plugins/{sort-units.rst => sort.rst}     | 16 ++++++
 docs/plugins/tiletypes-command.rst            | 10 ----
 docs/plugins/tiletypes-here-point.rst         |  6 ---
 docs/plugins/tiletypes-here.rst               | 14 -----
 docs/plugins/tiletypes.rst                    | 36 +++++++++++++
 docs/plugins/unreveal.rst                     | 23 ---------
 docs/plugins/workflow.rst                     |  6 +++
 29 files changed, 132 insertions(+), 253 deletions(-)
 rename docs/plugins/{remotefortressreader.rst => RemoteFortressReader.rst} (100%)
 delete mode 100644 docs/plugins/fix-job-postings.rst
 delete mode 100644 docs/plugins/job-duplicate.rst
 delete mode 100644 docs/plugins/job-material.rst
 delete mode 100644 docs/plugins/job.rst
 create mode 100644 docs/plugins/jobutils.rst
 delete mode 100644 docs/plugins/liquids-here.rst
 delete mode 100644 docs/plugins/nopause.rst
 rename docs/plugins/{plant.rst => plants.rst} (97%)
 delete mode 100644 docs/plugins/prospect.rst
 delete mode 100644 docs/plugins/rb.rst
 delete mode 100644 docs/plugins/restrictice.rst
 delete mode 100644 docs/plugins/restrictliquids.rst
 delete mode 100644 docs/plugins/revflood.rst
 delete mode 100644 docs/plugins/revforget.rst
 delete mode 100644 docs/plugins/revtoggle.rst
 delete mode 100644 docs/plugins/sort-items.rst
 rename docs/plugins/{sort-units.rst => sort.rst} (52%)
 delete mode 100644 docs/plugins/tiletypes-command.rst
 delete mode 100644 docs/plugins/tiletypes-here-point.rst
 delete mode 100644 docs/plugins/tiletypes-here.rst
 delete mode 100644 docs/plugins/unreveal.rst

diff --git a/docs/plugins/remotefortressreader.rst b/docs/plugins/RemoteFortressReader.rst
similarity index 100%
rename from docs/plugins/remotefortressreader.rst
rename to docs/plugins/RemoteFortressReader.rst
diff --git a/docs/plugins/filltraffic.rst b/docs/plugins/filltraffic.rst
index 93306e9eb..d3e952204 100644
--- a/docs/plugins/filltraffic.rst
+++ b/docs/plugins/filltraffic.rst
@@ -1,4 +1,6 @@
 .. _alltraffic:
+.. _restrictice:
+.. _restrictliquids:
 
 filltraffic
 ===========
@@ -29,3 +31,13 @@ Options:
 :N:     Normal Traffic
 :L:     Low Traffic
 :R:     Restricted Traffic
+
+restrictice
+===========
+Restrict traffic on all tiles on top of visible ice.
+See also `alltraffic`, `filltraffic`, and `restrictliquids`.
+
+restrictliquids
+===============
+Restrict traffic on all visible tiles with liquid.
+See also `alltraffic`, `filltraffic`, and `restrictice`.
diff --git a/docs/plugins/fix-job-postings.rst b/docs/plugins/fix-job-postings.rst
deleted file mode 100644
index 198dcd61d..000000000
--- a/docs/plugins/fix-job-postings.rst
+++ /dev/null
@@ -1,5 +0,0 @@
-fix-job-postings
-----------------
-This command fixes crashes caused by previous versions of workflow, mostly in
-DFHack 0.40.24-r4, and should be run automatically when loading a world (but can
-also be run manually if desired).
diff --git a/docs/plugins/job-duplicate.rst b/docs/plugins/job-duplicate.rst
deleted file mode 100644
index a18d73df3..000000000
--- a/docs/plugins/job-duplicate.rst
+++ /dev/null
@@ -1,6 +0,0 @@
-job-duplicate
-=============
-In :kbd:`q` mode, when a job is highlighted within a workshop or furnace
-building, calling ``job-duplicate`` instantly duplicates the job.
-
-:dfhack-keybind:`job-duplicate`
diff --git a/docs/plugins/job-material.rst b/docs/plugins/job-material.rst
deleted file mode 100644
index f1b37fc1d..000000000
--- a/docs/plugins/job-material.rst
+++ /dev/null
@@ -1,15 +0,0 @@
-job-material
-============
-Alter the material of the selected job.  Similar to ``job item-material ...``
-
-Invoked as::
-
-    job-material <inorganic-token>
-
-:dfhack-keybind:`job-material`
-
-* In :kbd:`q` mode, when a job is highlighted within a workshop or furnace,
-  changes the material of the job. Only inorganic materials can be used
-  in this mode.
-* In :kbd:`b` mode, during selection of building components positions the cursor
-  over the first available choice with the matching material.
diff --git a/docs/plugins/job.rst b/docs/plugins/job.rst
deleted file mode 100644
index 26f163864..000000000
--- a/docs/plugins/job.rst
+++ /dev/null
@@ -1,15 +0,0 @@
-job
-===
-Command for general job query and manipulation.
-
-Options:
-
-*no extra options*
-    Print details of the current job. The job can be selected
-    in a workshop, or the unit/jobs screen.
-**list**
-    Print details of all jobs in the selected workshop.
-**item-material <item-idx> <material[:subtoken]>**
-    Replace the exact material id in the job item.
-**item-type <item-idx> <type[:subtype]>**
-    Replace the exact item type id in the job item.
diff --git a/docs/plugins/jobutils.rst b/docs/plugins/jobutils.rst
new file mode 100644
index 000000000..230c69f4c
--- /dev/null
+++ b/docs/plugins/jobutils.rst
@@ -0,0 +1,40 @@
+.. _job:
+
+job
+===
+Command for general job query and manipulation.
+
+Options:
+
+*no extra options*
+    Print details of the current job. The job can be selected
+    in a workshop, or the unit/jobs screen.
+**list**
+    Print details of all jobs in the selected workshop.
+**item-material <item-idx> <material[:subtoken]>**
+    Replace the exact material id in the job item.
+**item-type <item-idx> <type[:subtype]>**
+    Replace the exact item type id in the job item.
+
+job-duplicate
+=============
+In :kbd:`q` mode, when a job is highlighted within a workshop or furnace
+building, calling ``job-duplicate`` instantly duplicates the job.
+
+:dfhack-keybind:`job-duplicate`
+
+job-material
+============
+Alter the material of the selected job.  Similar to ``job item-material ...``
+
+Invoked as::
+
+    job-material <inorganic-token>
+
+:dfhack-keybind:`job-material`
+
+* In :kbd:`q` mode, when a job is highlighted within a workshop or furnace,
+  changes the material of the job. Only inorganic materials can be used
+  in this mode.
+* In :kbd:`b` mode, during selection of building components positions the cursor
+  over the first available choice with the matching material.
diff --git a/docs/plugins/liquids-here.rst b/docs/plugins/liquids-here.rst
deleted file mode 100644
index d838170a2..000000000
--- a/docs/plugins/liquids-here.rst
+++ /dev/null
@@ -1,6 +0,0 @@
-liquids-here
-------------
-Run the liquid spawner with the current/last settings made in liquids (if no
-settings in liquids were made it paints a point of 7/7 magma by default).
-
-Intended to be used as keybinding. Requires an active in-game cursor.
diff --git a/docs/plugins/liquids.rst b/docs/plugins/liquids.rst
index d55962ad5..75e41da5b 100644
--- a/docs/plugins/liquids.rst
+++ b/docs/plugins/liquids.rst
@@ -1,3 +1,5 @@
+.. _liquids-here:
+
 liquids
 =======
 Allows adding magma, water and obsidian to the game. It replaces the normal
@@ -63,3 +65,10 @@ Brush size and shape:
 :block:         DF map block with cursor in it (regular spaced 16x16x1 blocks)
 :column:        Column from cursor, up through free space
 :flood:         Flood-fill water tiles from cursor (only makes sense with wclean)
+
+liquids-here
+------------
+Run the liquid spawner with the current/last settings made in liquids (if no
+settings in liquids were made it paints a point of 7/7 magma by default).
+
+Intended to be used as keybinding. Requires an active in-game cursor.
diff --git a/docs/plugins/nopause.rst b/docs/plugins/nopause.rst
deleted file mode 100644
index c30543187..000000000
--- a/docs/plugins/nopause.rst
+++ /dev/null
@@ -1,4 +0,0 @@
-nopause
-=======
-Disables pausing (both manual and automatic) with the exception of pause forced
-by `reveal` ``hell``. This is nice for digging under rivers.
diff --git a/docs/plugins/plant.rst b/docs/plugins/plants.rst
similarity index 97%
rename from docs/plugins/plant.rst
rename to docs/plugins/plants.rst
index b621b890d..0111b0770 100644
--- a/docs/plugins/plant.rst
+++ b/docs/plugins/plants.rst
@@ -1,3 +1,5 @@
+.. _plant:
+
 plant
 =====
 A tool for creating shrubs, growing, or getting rid of them.
diff --git a/docs/plugins/prospect.rst b/docs/plugins/prospect.rst
deleted file mode 100644
index a8979f1cc..000000000
--- a/docs/plugins/prospect.rst
+++ /dev/null
@@ -1,51 +0,0 @@
-prospect
-========
-
-**Usage:**
-
-    ``prospect [all|hell] [<options>]``
-
-Shows a summary of resources that exist on the map. By default, only the visible
-part of the map is scanned. Include the ``all`` keyword if you want ``prospect``
-to scan the whole map as if it were revealed. Use ``hell`` instead of ``all`` if
-you also want to see the Z range of HFS tubes in the 'features' report section.
-
-**Options:**
-
-:``-h``, ``--help``:
-    Shows this help text.
-:``-s``, ``--show <sections>``:
-    Shows only the named comma-separated list of report sections. Report section
-    names are: summary, liquids, layers, features, ores, gems, veins, shrubs,
-    and trees. If run during pre-embark, only the layers, ores, gems, and veins
-    report sections are available.
-:``-v``, ``--values``:
-    Includes material value in the output. Most useful for the 'gems' report
-    section.
-
-**Examples:**
-
-``prospect all``
-    Shows the entire report for the entire map.
-
-``prospect hell --show layers,ores,veins``
-    Shows only the layers, ores, and other vein stone report sections, and
-    includes information on HFS tubes when a fort is loaded.
-
-``prospect all -sores``
-    Show only information about ores for the pre-embark or fortress map report.
-
-**Pre-embark estimate:**
-
-If prospect is called during the embark selection screen, it displays an
-estimate of layer stone availability. If the ``all`` keyword is specified, it
-also estimates ores, gems, and vein material. The estimate covers all tiles of
-the embark rectangle.
-
-.. note::
-
-    The results of pre-embark prospect are an *estimate*, and can at best be
-    expected to be somewhere within +/- 30% of the true amount; sometimes it
-    does a lot worse. Especially, it is not clear how to precisely compute how
-    many soil layers there will be in a given embark tile, so it can report a
-    whole extra layer, or omit one that is actually present.
diff --git a/docs/plugins/prospector.rst b/docs/plugins/prospector.rst
index a8979f1cc..03dd193f8 100644
--- a/docs/plugins/prospector.rst
+++ b/docs/plugins/prospector.rst
@@ -1,3 +1,5 @@
+.. _prospect:
+
 prospect
 ========
 
diff --git a/docs/plugins/rb.rst b/docs/plugins/rb.rst
deleted file mode 100644
index 359d6149b..000000000
--- a/docs/plugins/rb.rst
+++ /dev/null
@@ -1,4 +0,0 @@
-ruby
-====
-Ruby language plugin, which evaluates the following arguments as a ruby string.
-Best used as ``:rb [string]``, for the special parsing mode.  Alias ``rb_eval``.
diff --git a/docs/plugins/restrictice.rst b/docs/plugins/restrictice.rst
deleted file mode 100644
index 558fb5679..000000000
--- a/docs/plugins/restrictice.rst
+++ /dev/null
@@ -1,4 +0,0 @@
-restrictice
-===========
-Restrict traffic on all tiles on top of visible ice.
-See also `alltraffic`, `filltraffic`, and `restrictliquids`.
diff --git a/docs/plugins/restrictliquids.rst b/docs/plugins/restrictliquids.rst
deleted file mode 100644
index 4f6cd9550..000000000
--- a/docs/plugins/restrictliquids.rst
+++ /dev/null
@@ -1,4 +0,0 @@
-restrictliquids
-===============
-Restrict traffic on all visible tiles with liquid.
-See also `alltraffic`, `filltraffic`, and `restrictice`.
diff --git a/docs/plugins/reveal.rst b/docs/plugins/reveal.rst
index da7be8277..42f490aa4 100644
--- a/docs/plugins/reveal.rst
+++ b/docs/plugins/reveal.rst
@@ -1,3 +1,5 @@
+.. _revflood:
+
 reveal
 ======
 This reveals the map. By default, HFS will remain hidden so that the demons
@@ -21,3 +23,8 @@ Usage and related commands:
 :revforget:     Discard info about what was visible before revealing the map.
                 Only useful where (e.g.) you abandoned with the fort revealed
                 and no longer want the data.
+
+nopause
+=======
+Disables pausing (both manual and automatic) with the exception of pause forced
+by `reveal` ``hell``. This is nice for digging under rivers.
diff --git a/docs/plugins/revflood.rst b/docs/plugins/revflood.rst
deleted file mode 100644
index da7be8277..000000000
--- a/docs/plugins/revflood.rst
+++ /dev/null
@@ -1,23 +0,0 @@
-reveal
-======
-This reveals the map. By default, HFS will remain hidden so that the demons
-don't spawn. You can use ``reveal hell`` to reveal everything. With hell revealed,
-you won't be able to unpause until you hide the map again. If you really want
-to unpause with hell revealed, use ``reveal demons``.
-
-Reveal also works in adventure mode, but any of its effects are negated once
-you move. When you use it this way, you don't need to run ``unreveal``.
-
-Usage and related commands:
-
-:reveal:        Reveal the whole map, except for HFS to avoid demons spawning
-:reveal hell:   Also show hell, but requires ``unreveal`` before unpausing
-:reveal demon:  Reveals everything and allows unpausing - good luck!
-:unreveal:      Reverts the effects of ``reveal``
-:revtoggle:     Switches between ``reveal`` and ``unreveal``
-:revflood:      Hide everything, then reveal tiles with a path to the cursor.
-                Note that tiles behind constructed walls are also revealed as a
-                workaround for :bug:`1871`.
-:revforget:     Discard info about what was visible before revealing the map.
-                Only useful where (e.g.) you abandoned with the fort revealed
-                and no longer want the data.
diff --git a/docs/plugins/revforget.rst b/docs/plugins/revforget.rst
deleted file mode 100644
index da7be8277..000000000
--- a/docs/plugins/revforget.rst
+++ /dev/null
@@ -1,23 +0,0 @@
-reveal
-======
-This reveals the map. By default, HFS will remain hidden so that the demons
-don't spawn. You can use ``reveal hell`` to reveal everything. With hell revealed,
-you won't be able to unpause until you hide the map again. If you really want
-to unpause with hell revealed, use ``reveal demons``.
-
-Reveal also works in adventure mode, but any of its effects are negated once
-you move. When you use it this way, you don't need to run ``unreveal``.
-
-Usage and related commands:
-
-:reveal:        Reveal the whole map, except for HFS to avoid demons spawning
-:reveal hell:   Also show hell, but requires ``unreveal`` before unpausing
-:reveal demon:  Reveals everything and allows unpausing - good luck!
-:unreveal:      Reverts the effects of ``reveal``
-:revtoggle:     Switches between ``reveal`` and ``unreveal``
-:revflood:      Hide everything, then reveal tiles with a path to the cursor.
-                Note that tiles behind constructed walls are also revealed as a
-                workaround for :bug:`1871`.
-:revforget:     Discard info about what was visible before revealing the map.
-                Only useful where (e.g.) you abandoned with the fort revealed
-                and no longer want the data.
diff --git a/docs/plugins/revtoggle.rst b/docs/plugins/revtoggle.rst
deleted file mode 100644
index da7be8277..000000000
--- a/docs/plugins/revtoggle.rst
+++ /dev/null
@@ -1,23 +0,0 @@
-reveal
-======
-This reveals the map. By default, HFS will remain hidden so that the demons
-don't spawn. You can use ``reveal hell`` to reveal everything. With hell revealed,
-you won't be able to unpause until you hide the map again. If you really want
-to unpause with hell revealed, use ``reveal demons``.
-
-Reveal also works in adventure mode, but any of its effects are negated once
-you move. When you use it this way, you don't need to run ``unreveal``.
-
-Usage and related commands:
-
-:reveal:        Reveal the whole map, except for HFS to avoid demons spawning
-:reveal hell:   Also show hell, but requires ``unreveal`` before unpausing
-:reveal demon:  Reveals everything and allows unpausing - good luck!
-:unreveal:      Reverts the effects of ``reveal``
-:revtoggle:     Switches between ``reveal`` and ``unreveal``
-:revflood:      Hide everything, then reveal tiles with a path to the cursor.
-                Note that tiles behind constructed walls are also revealed as a
-                workaround for :bug:`1871`.
-:revforget:     Discard info about what was visible before revealing the map.
-                Only useful where (e.g.) you abandoned with the fort revealed
-                and no longer want the data.
diff --git a/docs/plugins/ruby.rst b/docs/plugins/ruby.rst
index 359d6149b..bdd5521a4 100644
--- a/docs/plugins/ruby.rst
+++ b/docs/plugins/ruby.rst
@@ -1,3 +1,5 @@
+.. _rb:
+
 ruby
 ====
 Ruby language plugin, which evaluates the following arguments as a ruby string.
diff --git a/docs/plugins/sort-items.rst b/docs/plugins/sort-items.rst
deleted file mode 100644
index d18f33c4e..000000000
--- a/docs/plugins/sort-items.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-.. _sort:
-
-sort-items
-==========
-Sort the visible item list::
-
-    sort-items order [order...]
-
-Sort the item list using the given sequence of comparisons.
-The ``<`` prefix for an order makes undefined values sort first.
-The ``>`` prefix reverses the sort order for defined values.
-
-Item order examples::
-
-    description material wear type quality
-
-The orderings are defined in ``hack/lua/plugins/sort/*.lua``
diff --git a/docs/plugins/sort-units.rst b/docs/plugins/sort.rst
similarity index 52%
rename from docs/plugins/sort-units.rst
rename to docs/plugins/sort.rst
index 1a88381ce..cc86b3ddd 100644
--- a/docs/plugins/sort-units.rst
+++ b/docs/plugins/sort.rst
@@ -1,3 +1,19 @@
+sort-items
+==========
+Sort the visible item list::
+
+    sort-items order [order...]
+
+Sort the item list using the given sequence of comparisons.
+The ``<`` prefix for an order makes undefined values sort first.
+The ``>`` prefix reverses the sort order for defined values.
+
+Item order examples::
+
+    description material wear type quality
+
+The orderings are defined in ``hack/lua/plugins/sort/*.lua``
+
 sort-units
 ==========
 Sort the visible unit list::
diff --git a/docs/plugins/tiletypes-command.rst b/docs/plugins/tiletypes-command.rst
deleted file mode 100644
index 0f75c633e..000000000
--- a/docs/plugins/tiletypes-command.rst
+++ /dev/null
@@ -1,10 +0,0 @@
-tiletypes-command
------------------
-Runs tiletypes commands, separated by ``;``. This makes it possible to change
-tiletypes modes from a hotkey or via dfhack-run.
-
-Example::
-
-    tiletypes-command p any ; p s wall ; p sp normal
-
-This resets the paint filter to unsmoothed walls.
diff --git a/docs/plugins/tiletypes-here-point.rst b/docs/plugins/tiletypes-here-point.rst
deleted file mode 100644
index 8951bdff8..000000000
--- a/docs/plugins/tiletypes-here-point.rst
+++ /dev/null
@@ -1,6 +0,0 @@
-tiletypes-here-point
---------------------
-Apply the current tiletypes options at the in-game cursor position to a single
-tile. Can be used from a hotkey.
-
-This command supports the same options as `tiletypes-here` above.
diff --git a/docs/plugins/tiletypes-here.rst b/docs/plugins/tiletypes-here.rst
deleted file mode 100644
index fe9ceefd9..000000000
--- a/docs/plugins/tiletypes-here.rst
+++ /dev/null
@@ -1,14 +0,0 @@
-tiletypes-here
---------------
-Apply the current tiletypes options at the in-game cursor position, including
-the brush. Can be used from a hotkey.
-
-Options:
-
-:``-c``, ``--cursor <x>,<y>,<z>``:
-    Use the specified map coordinates instead of the current cursor position. If
-    this option is specified, then an active game map cursor is not necessary.
-:``-h``, ``--help``:
-    Show command help text.
-:``-q``, ``--quiet``:
-    Suppress non-error status output.
diff --git a/docs/plugins/tiletypes.rst b/docs/plugins/tiletypes.rst
index 41f780521..74af00240 100644
--- a/docs/plugins/tiletypes.rst
+++ b/docs/plugins/tiletypes.rst
@@ -1,3 +1,6 @@
+.. _tiletypes-here:
+.. _tiletypes-here-point:
+
 tiletypes
 =========
 Can be used for painting map tiles and is an interactive command, much like
@@ -80,3 +83,36 @@ The range starts at the position of the cursor and goes to the east, south and
 up.
 
 For more details, use ``tiletypes help``.
+
+tiletypes-command
+-----------------
+Runs tiletypes commands, separated by ``;``. This makes it possible to change
+tiletypes modes from a hotkey or via dfhack-run.
+
+Example::
+
+    tiletypes-command p any ; p s wall ; p sp normal
+
+This resets the paint filter to unsmoothed walls.
+
+tiletypes-here-point
+--------------------
+Apply the current tiletypes options at the in-game cursor position to a single
+tile. Can be used from a hotkey.
+
+This command supports the same options as `tiletypes-here` above.
+
+tiletypes-here
+--------------
+Apply the current tiletypes options at the in-game cursor position, including
+the brush. Can be used from a hotkey.
+
+Options:
+
+:``-c``, ``--cursor <x>,<y>,<z>``:
+    Use the specified map coordinates instead of the current cursor position. If
+    this option is specified, then an active game map cursor is not necessary.
+:``-h``, ``--help``:
+    Show command help text.
+:``-q``, ``--quiet``:
+    Suppress non-error status output.
diff --git a/docs/plugins/unreveal.rst b/docs/plugins/unreveal.rst
deleted file mode 100644
index da7be8277..000000000
--- a/docs/plugins/unreveal.rst
+++ /dev/null
@@ -1,23 +0,0 @@
-reveal
-======
-This reveals the map. By default, HFS will remain hidden so that the demons
-don't spawn. You can use ``reveal hell`` to reveal everything. With hell revealed,
-you won't be able to unpause until you hide the map again. If you really want
-to unpause with hell revealed, use ``reveal demons``.
-
-Reveal also works in adventure mode, but any of its effects are negated once
-you move. When you use it this way, you don't need to run ``unreveal``.
-
-Usage and related commands:
-
-:reveal:        Reveal the whole map, except for HFS to avoid demons spawning
-:reveal hell:   Also show hell, but requires ``unreveal`` before unpausing
-:reveal demon:  Reveals everything and allows unpausing - good luck!
-:unreveal:      Reverts the effects of ``reveal``
-:revtoggle:     Switches between ``reveal`` and ``unreveal``
-:revflood:      Hide everything, then reveal tiles with a path to the cursor.
-                Note that tiles behind constructed walls are also revealed as a
-                workaround for :bug:`1871`.
-:revforget:     Discard info about what was visible before revealing the map.
-                Only useful where (e.g.) you abandoned with the fort revealed
-                and no longer want the data.
diff --git a/docs/plugins/workflow.rst b/docs/plugins/workflow.rst
index 17db57e69..f6b8c4475 100644
--- a/docs/plugins/workflow.rst
+++ b/docs/plugins/workflow.rst
@@ -111,3 +111,9 @@ Make sure there are always 80-100 units of dimple dye::
 Maintain 10-100 locally-made crafts of exceptional quality::
 
     workflow count CRAFTS///LOCAL,EXCEPTIONAL 100 90
+
+fix-job-postings
+----------------
+This command fixes crashes caused by previous versions of workflow, mostly in
+DFHack 0.40.24-r4, and should be run automatically when loading a world (but can
+also be run manually if desired).

From 4132dbdbbb771189025c39bfb36f899741068112 Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Mon, 25 Jul 2022 06:51:40 -0700
Subject: [PATCH 321/854] remove docs for no-command, un-enableable plugin

it's already documented in lua-api
---
 docs/plugins/building-hacks.rst | 13 -------------
 1 file changed, 13 deletions(-)
 delete mode 100644 docs/plugins/building-hacks.rst

diff --git a/docs/plugins/building-hacks.rst b/docs/plugins/building-hacks.rst
deleted file mode 100644
index bdae83392..000000000
--- a/docs/plugins/building-hacks.rst
+++ /dev/null
@@ -1,13 +0,0 @@
-building-hacks
-==============
-Tags:
-
-:index:`Allows mods to create and manage powered workshops.
-<building-hacks; Allows mods to create and manage powered workshops.>`
-
-Usage::
-
-    enable building-hacks
-
-Please see the `building-hacks-api` for information on accessing this plugin
-from Lua scripts.

From 6b1c0b5308fcec549ef07dc8269f51f14827ee7e Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Mon, 25 Jul 2022 06:53:08 -0700
Subject: [PATCH 322/854] rename building-hacks section

---
 docs/Lua API.rst | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/Lua API.rst b/docs/Lua API.rst
index aba0bcab7..107a0ba2e 100644
--- a/docs/Lua API.rst	
+++ b/docs/Lua API.rst	
@@ -4287,10 +4287,10 @@ blueprint files:
 The names of the functions are also available as the keys of the
 ``valid_phases`` table.
 
-.. _building-hacks-api:
+.. _building-hacks:
 
-building-hacks API
-==================
+building-hacks
+==============
 
 This plugin overwrites some methods in workshop df class so that mechanical workshops are possible. Although
 plugin export a function it's recommended to use lua decorated function.

From 38c17b5215b5cc241157c227375edd755e21bc17 Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Mon, 25 Jul 2022 06:56:21 -0700
Subject: [PATCH 323/854] update docs for RemoteFortressReader

---
 docs/plugins/RemoteFortressReader.rst         | 20 ++++++++++++++++---
 .../remotefortressreader.cpp                  |  8 +++++---
 2 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/docs/plugins/RemoteFortressReader.rst b/docs/plugins/RemoteFortressReader.rst
index 287debca8..103c904db 100644
--- a/docs/plugins/RemoteFortressReader.rst
+++ b/docs/plugins/RemoteFortressReader.rst
@@ -1,4 +1,18 @@
-remotefortressreader
+RemoteFortressReader
 ====================
-An in-development plugin for realtime fortress visualisation.
-See :forums:`Armok Vision <146473>`.
+Tags:
+:dfhack-keybind:`RemoteFortressReader_version`
+:dfhack-keybind:`load-art-image-chunk`
+
+:index:`Backend for Armok Vision.
+<RemoteFortressReader; Backend for Armok Vision.>` Provides an API for realtime
+remote fortress visualization. See :forums:`Armok Vision <146473>`.
+
+Usage:
+
+``enable RemoteFortressReader``
+    Enable the plugin.
+``RemoteFortressReader_version``
+    Print the loaded RemoteFortressReader version.
+``load-art-image-chunk <chunk id>``
+    Gets an art image chunk by index, loading from disk if necessary.
diff --git a/plugins/remotefortressreader/remotefortressreader.cpp b/plugins/remotefortressreader/remotefortressreader.cpp
index 9ab9a7502..643e92b21 100644
--- a/plugins/remotefortressreader/remotefortressreader.cpp
+++ b/plugins/remotefortressreader/remotefortressreader.cpp
@@ -221,12 +221,14 @@ DFHACK_PLUGIN_IS_ENABLED(enableUpdates);
 // Mandatory init function. If you have some global state, create it here.
 DFhackCExport command_result plugin_init(color_ostream &out, std::vector <PluginCommand> &commands)
 {
-    commands.push_back(PluginCommand("RemoteFortressReader_version", "List the loaded RemoteFortressReader version", RemoteFortressReader_version, false, "This is used for plugin version checking."));
+    commands.push_back(PluginCommand(
+        "RemoteFortressReader_version",
+        "List the loaded RemoteFortressReader version",
+        RemoteFortressReader_version));
     commands.push_back(PluginCommand(
         "load-art-image-chunk",
         "Gets an art image chunk by index, loading from disk if necessary",
-        loadArtImageChunk, false,
-        "Usage: load_art_image_chunk N, where N is the id of the chunk to get."));
+        loadArtImageChunk));
     enableUpdates = true;
     return CR_OK;
 }

From 886289d805af845ba8d7bc50afd8d804c8d74abc Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Mon, 25 Jul 2022 10:21:33 -0700
Subject: [PATCH 324/854] update docs for fix-armory

---
 docs/plugins/fix-armory.rst | 12 ++++++++++--
 plugins/fix-armory.cpp      |  9 +++------
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/docs/plugins/fix-armory.rst b/docs/plugins/fix-armory.rst
index f4b988420..dfc5eef7f 100644
--- a/docs/plugins/fix-armory.rst
+++ b/docs/plugins/fix-armory.rst
@@ -1,4 +1,12 @@
 fix-armory
 ==========
-`This plugin requires a binpatch <binpatches/needs-patch>`, which has not
-been available since DF 0.34.11
+Tags:
+:dfhack-keybind:`fix-armory`
+
+Allow the military to store equipment in barracks. However,
+`this plugin requires a binpatch <binpatches/needs-patch>`, which has not
+been available since DF 0.34.11.
+
+Usage::
+
+    enable fix-armory
diff --git a/plugins/fix-armory.cpp b/plugins/fix-armory.cpp
index 0f63b4d93..7dfefff0f 100644
--- a/plugins/fix-armory.cpp
+++ b/plugins/fix-armory.cpp
@@ -70,12 +70,9 @@ DFhackCExport command_result plugin_onstatechange(color_ostream &out, state_chan
 DFhackCExport command_result plugin_init (color_ostream &out, std::vector <PluginCommand> &commands)
 {
     commands.push_back(PluginCommand(
-        "fix-armory", "Enables or disables the fix-armory plugin.", fix_armory, false,
-        "  fix-armory enable\n"
-        "    Enables the tweaks.\n"
-        "  fix-armory disable\n"
-        "    Disables the tweaks. All equipment will be hauled off to stockpiles.\n"
-    ));
+        "fix-armory",
+        "Enables or disables the fix-armory plugin.",
+        fix_armory));
 
     if (Core::getInstance().isMapLoaded())
         plugin_onstatechange(out, SC_MAP_LOADED);

From a6cb79c2371debb0d763715dd63ff14a178ed1f9 Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Mon, 25 Jul 2022 10:21:59 -0700
Subject: [PATCH 325/854] remove defunct tool fix-armory

---
 docs/plugins/fix-armory.rst |  12 -
 plugins/CMakeLists.txt      |   1 -
 plugins/fix-armory.cpp      | 840 ------------------------------------
 3 files changed, 853 deletions(-)
 delete mode 100644 docs/plugins/fix-armory.rst
 delete mode 100644 plugins/fix-armory.cpp

diff --git a/docs/plugins/fix-armory.rst b/docs/plugins/fix-armory.rst
deleted file mode 100644
index dfc5eef7f..000000000
--- a/docs/plugins/fix-armory.rst
+++ /dev/null
@@ -1,12 +0,0 @@
-fix-armory
-==========
-Tags:
-:dfhack-keybind:`fix-armory`
-
-Allow the military to store equipment in barracks. However,
-`this plugin requires a binpatch <binpatches/needs-patch>`, which has not
-been available since DF 0.34.11.
-
-Usage::
-
-    enable fix-armory
diff --git a/plugins/CMakeLists.txt b/plugins/CMakeLists.txt
index 283f74fad..3b7ae17f1 100644
--- a/plugins/CMakeLists.txt
+++ b/plugins/CMakeLists.txt
@@ -120,7 +120,6 @@ if(BUILD_SUPPORTED)
     dfhack_plugin(eventful eventful.cpp LINK_LIBRARIES lua)
     dfhack_plugin(fastdwarf fastdwarf.cpp)
     dfhack_plugin(filltraffic filltraffic.cpp)
-    dfhack_plugin(fix-armory fix-armory.cpp)
     dfhack_plugin(fix-unit-occupancy fix-unit-occupancy.cpp)
     dfhack_plugin(fixveins fixveins.cpp)
     dfhack_plugin(flows flows.cpp)
diff --git a/plugins/fix-armory.cpp b/plugins/fix-armory.cpp
deleted file mode 100644
index 7dfefff0f..000000000
--- a/plugins/fix-armory.cpp
+++ /dev/null
@@ -1,840 +0,0 @@
-// Fixes containers in barracks to actually work as intended.
-
-#include "Core.h"
-#include "Console.h"
-#include "Export.h"
-#include "PluginManager.h"
-
-#include "modules/Gui.h"
-#include "modules/Screen.h"
-#include "modules/Units.h"
-#include "modules/Items.h"
-#include "modules/Job.h"
-#include "modules/World.h"
-#include "modules/Maps.h"
-
-#include "MiscUtils.h"
-
-#include "DataDefs.h"
-#include <VTableInterpose.h>
-#include "df/ui.h"
-#include "df/world.h"
-#include "df/squad.h"
-#include "df/unit.h"
-#include "df/squad_position.h"
-#include "df/squad_ammo_spec.h"
-#include "df/items_other_id.h"
-#include "df/item_weaponst.h"
-#include "df/item_armorst.h"
-#include "df/item_helmst.h"
-#include "df/item_pantsst.h"
-#include "df/item_shoesst.h"
-#include "df/item_glovesst.h"
-#include "df/item_shieldst.h"
-#include "df/item_flaskst.h"
-#include "df/item_backpackst.h"
-#include "df/item_quiverst.h"
-#include "df/item_ammost.h"
-#include "df/building_weaponrackst.h"
-#include "df/building_armorstandst.h"
-#include "df/building_cabinetst.h"
-#include "df/building_boxst.h"
-#include "df/building_squad_use.h"
-#include "df/job.h"
-#include "df/general_ref_building_holderst.h"
-#include "df/general_ref_building_destinationst.h"
-#include "df/barrack_preference_category.h"
-
-#include <stdlib.h>
-
-using std::vector;
-using std::string;
-using std::endl;
-using namespace DFHack;
-using namespace df::enums;
-
-using df::global::ui;
-using df::global::world;
-using df::global::gamemode;
-using df::global::ui_build_selector;
-
-using namespace DFHack::Gui;
-using Screen::Pen;
-
-static command_result fix_armory(color_ostream &out, vector <string> & parameters);
-
-DFHACK_PLUGIN("fix-armory");
-
-DFhackCExport command_result plugin_onstatechange(color_ostream &out, state_change_event event);
-
-DFhackCExport command_result plugin_init (color_ostream &out, std::vector <PluginCommand> &commands)
-{
-    commands.push_back(PluginCommand(
-        "fix-armory",
-        "Enables or disables the fix-armory plugin.",
-        fix_armory));
-
-    if (Core::getInstance().isMapLoaded())
-        plugin_onstatechange(out, SC_MAP_LOADED);
-
-    return CR_OK;
-}
-
-DFhackCExport command_result plugin_shutdown (color_ostream &out)
-{
-    return CR_OK;
-}
-
-/*
- * PART 1 - Stop restockpiling of items stored in the armory.
- *
- * For everything other than ammo this is quite straightforward,
- * since the uniform switch code already tries to store items
- * in barracks containers, and it is thus known what the intention
- * is. Moreover these containers know which squad and member they
- * belong to.
- *
- * For ammo there is no such code (in fact, ammo is never removed
- * from a quiver, except when it is dropped itself), so I had to
- * apply some improvisation. There is one place where BOX containers
- * with Squad Equipment set are used as an anchor location for a
- * pathfinding check when assigning ammo, so presumably that's
- * the correct place. I however wanted to also differentiate
- * training ammo, so came up with the following rules:
- *
- *  1.  Combat ammo and ammo without any allowed use can be stored
- *      in BOXes marked for Squad Equipment, either directly or via
- *      containing room. No-allowed-use ammo is assumed to be reserved
- *      for emergency combat use, or something like that; however if
- *      it is already stored in a training chest, it won't be moved.
- *  1a. If assigned to a squad position, that box can be used _only_
- *      for ammo assigned to that specific _squad_. Otherwise, if
- *      multiple squads can use this room, they will store their
- *      ammo all mixed up.
- *  2.  Training ammo can be stored in BOXes within archery ranges
- *      (designated from archery target) that are enabled for Training.
- *      Train-only ammo in particular can _only_ be stored in such
- *      boxes. The inspiration for this comes from some broken code
- *      for weapon racks in Training rooms.
- *
- * As an additional feature (partially needed due to the constraints
- * of working from an external hack), this plugin also blocks instant
- * queueing of stockpiling jobs for items blocked on the ground, if
- * these items are assigned to any squad.
- *
- * Since there apparently still are bugs that cause uniform items to be
- * momentarily dropped on ground, this delay is set not to the minimally
- * necessary 50 ticks, but to 0.5 - 1.0 in-game days, so as to provide a
- * grace period during which the items can be instantly picked up again.
- */
-
-// Completely block the use of stockpiles
-#define NO_STOCKPILES
-
-// Check if the item is assigned to any use controlled by the military tab
-static bool is_assigned_item(df::item *item)
-{
-    if (!ui)
-        return false;
-
-    auto type = item->getType();
-    int idx = binsearch_index(ui->equipment.items_assigned[type], item->id);
-    if (idx < 0)
-        return false;
-
-    return true;
-}
-
-// Check if this ammo item is assigned to this squad with one of the specified uses
-static bool is_squad_ammo(df::item *item, df::squad *squad, bool combat, bool train)
-{
-    for (size_t i = 0; i < squad->ammunition.size(); i++)
-    {
-        auto spec = squad->ammunition[i];
-        bool cs = spec->flags.bits.use_combat;
-        bool ts = spec->flags.bits.use_training;
-
-        // no-use ammo assumed to fit any category
-        if (((cs || !ts) && combat) || ((ts || !cs) && train))
-        {
-            if (binsearch_index(spec->assigned, item->id) >= 0)
-                return true;
-        }
-    }
-
-    return false;
-}
-
-// Recursively check room parents to find out if this ammo item is allowed here
-static bool can_store_ammo_rec(df::item *item, df::building *holder, int squad_id)
-{
-    auto squads = holder->getSquads();
-
-    if (squads)
-    {
-        for (size_t i = 0; i < squads->size(); i++)
-        {
-            auto use = (*squads)[i];
-
-            // For containers assigned to a squad, only consider that squad
-            if (squad_id >= 0 && use->squad_id != squad_id)
-                continue;
-
-            // Squad Equipment -> combat
-            bool combat = use->mode.bits.squad_eq;
-            bool train = false;
-
-            if (combat || train)
-            {
-                auto squad = df::squad::find(use->squad_id);
-
-                if (squad && is_squad_ammo(item, squad, combat, train))
-                    return true;
-            }
-        }
-    }
-    // Ugh, archery targets don't actually have a squad use vector
-    else if (holder->getType() == building_type::ArcheryTarget)
-    {
-        auto &squads = world->squads.all;
-
-        for (size_t si = 0; si < squads.size(); si++)
-        {
-            auto squad = squads[si];
-
-            // For containers assigned to a squad, only consider that squad
-            if (squad_id >= 0 && squad->id != squad_id)
-                continue;
-
-            for (size_t j = 0; j < squad->rooms.size(); j++)
-            {
-                auto use = squad->rooms[j];
-
-                if (use->building_id != holder->id)
-                    continue;
-
-                // Squad Equipment -> combat
-                bool combat = use->mode.bits.squad_eq;
-                // Archery target with Train -> training
-                bool train = use->mode.bits.train;
-
-                if (combat || train)
-                {
-                    if (is_squad_ammo(item, squad, combat, train))
-                        return true;
-                }
-
-                break;
-            }
-        }
-    }
-
-    for (size_t i = 0; i < holder->parents.size(); i++)
-        if (can_store_ammo_rec(item, holder->parents[i], squad_id))
-            return true;
-
-    return false;
-}
-
-// Check if the ammo item can be stored in this container
-static bool can_store_ammo(df::item *item, df::building *holder)
-{
-    // Only chests
-    if (holder->getType() != building_type::Box)
-        return false;
-
-    // with appropriate flags set
-    return can_store_ammo_rec(item, holder, holder->getSpecificSquad());
-}
-
-// Check if the item is assigned to the squad member who owns this armory building
-static bool belongs_to_position(df::item *item, df::building *holder)
-{
-    int sid = holder->getSpecificSquad();
-    if (sid < 0)
-        return false;
-
-    auto squad = df::squad::find(sid);
-    if (!squad)
-        return false;
-
-    int position = holder->getSpecificPosition();
-
-    // Weapon racks belong to the whole squad, i.e. can be used by any position
-    if (position == -1 && holder->getType() == building_type::Weaponrack)
-    {
-        for (size_t i = 0; i < squad->positions.size(); i++)
-        {
-            if (binsearch_index(squad->positions[i]->assigned_items, item->id) >= 0)
-                return true;
-        }
-    }
-    else
-    {
-        auto cpos = vector_get(squad->positions, position);
-        if (cpos && binsearch_index(cpos->assigned_items, item->id) >= 0)
-            return true;
-    }
-
-    return false;
-}
-
-// Check if the item is appropriately stored in an armory building
-static bool is_in_armory(df::item *item)
-{
-    if (item->flags.bits.in_inventory || item->flags.bits.on_ground)
-        return false;
-
-    auto holder = Items::getHolderBuilding(item);
-    if (!holder)
-        return false;
-
-    // If indeed in a building, check if it is the right one
-    if (item->getType() == item_type::AMMO)
-        return can_store_ammo(item, holder);
-    else
-        return belongs_to_position(item, holder);
-}
-
-/*
- * Hooks used to affect stockpiling code as it runs, and prevent it
- * from doing unwanted stuff.
- *
- * Toady can simply add these checks directly to the stockpiling code;
- * we have to abuse some handy item vmethods.
- */
-
-template<class Item> struct armory_hook : Item {
-    typedef Item interpose_base;
-
-    /*
-     * This vmethod is called by the actual stockpiling code before it
-     * tries to queue a job, and is normally used to prevent stockpiling
-     * of uncollected webs.
-     */
-    DEFINE_VMETHOD_INTERPOSE(bool, isCollected, ())
-    {
-#ifdef NO_STOCKPILES
-        /*
-         * Completely block any items assigned to a squad from being stored
-         * in stockpiles. The reason is that I still observe haulers running
-         * around with bins to pick them up for some reason. There could be
-         * some unaccounted race conditions involved.
-         */
-        if (is_assigned_item(this))
-            return false;
-#else
-        // Block stockpiling of items in the armory.
-        if (is_in_armory(this))
-            return false;
-
-        /*
-         * When an item is removed from inventory due to Pickup Equipment
-         * process, the unit code directly invokes the stockpiling code
-         * and thus creates the job even before the item is actually dropped
-         * on the ground. We don't want this at all, especially due to the
-         * grace period idea.
-         *
-         * With access to source, that code can just be changed to simply
-         * drop the item on ground, without running stockpiling code.
-         */
-        if (this->flags.bits.in_inventory)
-        {
-            auto holder = Items::getHolderUnit(this);
-
-            // When that call happens, the item is still in inventory
-            if (holder && is_assigned_item(this))
-            {
-                // And its ID is is this vector
-                if (::binsearch_index(holder->military.uniform_drop, this->id) >= 0)
-                    return false;
-            }
-        }
-#endif
-
-        // Call the original vmethod
-        return INTERPOSE_NEXT(isCollected)();
-    }
-
-    /*
-     * This vmethod is used to actually put the item on the ground.
-     * When it does that, it also adds it to a vector of items to be
-     * instanly restockpiled by a loop in another part of the code.
-     *
-     * We don't want this either, even more than when removing from
-     * uniform, because this can happen in lots of various situations,
-     * including deconstructed containers etc, and we want our own
-     * armory code below to have a chance to look at the item.
-     *
-     * The logical place for this code is in the loop that processes
-     * that vector, but that part is not virtual.
-     */
-    DEFINE_VMETHOD_INTERPOSE(bool, moveToGround, (int16_t x, int16_t y, int16_t z))
-    {
-        // First, let it do its work
-        bool rv = INTERPOSE_NEXT(moveToGround)(x, y, z);
-
-        // Prevent instant restockpiling of dropped assigned items.
-        if (is_assigned_item(this))
-        {
-            // The original vmethod adds the item to this vector to force instant check
-            auto &ovec = world->items.other[items_other_id::ANY_RECENTLY_DROPPED];
-
-            // If it is indeed there, remove it
-            if (erase_from_vector(ovec, &df::item::id, this->id))
-            {
-                // and queue it to be checked normally in 0.5-1 in-game days
-                // (this is a grace period in case the uniform is dropped just
-                // for a moment due to a momentary glitch)
-                this->stockpile_countdown = 12 + random_int(12);
-                this->stockpile_delay = 0;
-            }
-        }
-
-        return rv;
-    }
-};
-
-template<> IMPLEMENT_VMETHOD_INTERPOSE(armory_hook<df::item_weaponst>, isCollected);
-template<> IMPLEMENT_VMETHOD_INTERPOSE(armory_hook<df::item_armorst>, isCollected);
-template<> IMPLEMENT_VMETHOD_INTERPOSE(armory_hook<df::item_helmst>, isCollected);
-template<> IMPLEMENT_VMETHOD_INTERPOSE(armory_hook<df::item_shoesst>, isCollected);
-template<> IMPLEMENT_VMETHOD_INTERPOSE(armory_hook<df::item_pantsst>, isCollected);
-template<> IMPLEMENT_VMETHOD_INTERPOSE(armory_hook<df::item_glovesst>, isCollected);
-template<> IMPLEMENT_VMETHOD_INTERPOSE(armory_hook<df::item_shieldst>, isCollected);
-template<> IMPLEMENT_VMETHOD_INTERPOSE(armory_hook<df::item_flaskst>, isCollected);
-template<> IMPLEMENT_VMETHOD_INTERPOSE(armory_hook<df::item_backpackst>, isCollected);
-template<> IMPLEMENT_VMETHOD_INTERPOSE(armory_hook<df::item_quiverst>, isCollected);
-template<> IMPLEMENT_VMETHOD_INTERPOSE(armory_hook<df::item_ammost>, isCollected);
-
-template<> IMPLEMENT_VMETHOD_INTERPOSE(armory_hook<df::item_weaponst>, moveToGround);
-template<> IMPLEMENT_VMETHOD_INTERPOSE(armory_hook<df::item_armorst>, moveToGround);
-template<> IMPLEMENT_VMETHOD_INTERPOSE(armory_hook<df::item_helmst>, moveToGround);
-template<> IMPLEMENT_VMETHOD_INTERPOSE(armory_hook<df::item_shoesst>, moveToGround);
-template<> IMPLEMENT_VMETHOD_INTERPOSE(armory_hook<df::item_pantsst>, moveToGround);
-template<> IMPLEMENT_VMETHOD_INTERPOSE(armory_hook<df::item_glovesst>, moveToGround);
-template<> IMPLEMENT_VMETHOD_INTERPOSE(armory_hook<df::item_shieldst>, moveToGround);
-template<> IMPLEMENT_VMETHOD_INTERPOSE(armory_hook<df::item_flaskst>, moveToGround);
-template<> IMPLEMENT_VMETHOD_INTERPOSE(armory_hook<df::item_backpackst>, moveToGround);
-template<> IMPLEMENT_VMETHOD_INTERPOSE(armory_hook<df::item_quiverst>, moveToGround);
-template<> IMPLEMENT_VMETHOD_INTERPOSE(armory_hook<df::item_ammost>, moveToGround);
-
-/*
- * PART 2 - Actively queue jobs to haul assigned items to the armory.
- *
- * The logical place for this of course is in the same code that decides
- * to put stuff in stockpiles, alongside the checks to prevent moving
- * stuff away from the armory. We just run it independently every 50
- * simulation frames.
- */
-
-// Check if this item is loose and can be moved to armory
-static bool can_store_item(df::item *item)
-{
-    // bad id, or cooldown timer still counting
-    if (!item || item->stockpile_countdown > 0)
-        return false;
-
-    // bad flags?
-    if (item->flags.bits.in_job ||
-        item->flags.bits.removed ||
-        item->flags.bits.in_building ||
-        item->flags.bits.encased ||
-        item->flags.bits.owned ||
-        item->flags.bits.forbid ||
-        item->flags.bits.on_fire)
-        return false;
-
-    // in unit inventory?
-    auto top = item;
-
-    while (top->flags.bits.in_inventory)
-    {
-        auto parent = Items::getContainer(top);
-        if (!parent) break;
-        top = parent;
-    }
-
-    if (Items::getGeneralRef(top, general_ref_type::UNIT_HOLDER))
-        return false;
-
-    // already in armory?
-    if (is_in_armory(item))
-        return false;
-
-    return true;
-}
-
-// Queue a job to store the item in the building, if possible
-static bool try_store_item(df::building *target, df::item *item)
-{
-    // Check if the dwarves can path between the target and the item
-    df::coord tpos(target->centerx, target->centery, target->z);
-    df::coord ipos = Items::getPosition(item);
-
-    if (!Maps::canWalkBetween(tpos, ipos))
-        return false;
-
-    // Check if the target has enough space left
-    if (!target->canStoreItem(item, true))
-        return false;
-
-    // Create the job
-    auto href = df::allocate<df::general_ref_building_holderst>();
-    if (!href)
-        return false;
-
-    auto job = new df::job();
-
-    job->pos = tpos;
-
-    bool dest = false;
-
-    // Choose the job type - correct matching is needed so that
-    // later canStoreItem calls would take the job into account.
-    switch (target->getType()) {
-        case building_type::Weaponrack:
-            job->job_type = job_type::StoreWeapon;
-            // Without this flag dwarves will pick up the item, and
-            // then dismiss the job and put it back into the stockpile:
-            job->flags.bits.specific_dropoff = true;
-            break;
-        case building_type::Armorstand:
-            job->job_type = job_type::StoreArmor;
-            job->flags.bits.specific_dropoff = true;
-            break;
-        case building_type::Cabinet:
-            job->job_type = job_type::StoreOwnedItem;
-            dest = true;
-            break;
-        default:
-            job->job_type = job_type::StoreItemInHospital;
-            dest = true;
-            break;
-    }
-
-    // job <-> item link
-    if (!Job::attachJobItem(job, item, df::job_item_ref::Hauled))
-    {
-        delete job;
-        delete href;
-        return false;
-    }
-
-    // job <-> building link
-    href->building_id = target->id;
-    target->jobs.push_back(job);
-    job->general_refs.push_back(href);
-
-    // Two of the jobs need this link to find the job in canStoreItem().
-    // They also don't actually need BUILDING_HOLDER, but it doesn't hurt.
-    if (dest)
-    {
-        auto rdest = df::allocate<df::general_ref_building_destinationst>();
-
-        if (rdest)
-        {
-            rdest->building_id = target->id;
-            job->general_refs.push_back(rdest);
-        }
-    }
-
-    // add to job list
-    Job::linkIntoWorld(job);
-    return true;
-}
-
-// Store the item into the first building in the list that would accept it.
-static void try_store_item(std::vector<int32_t> &vec, df::item *item)
-{
-    for (size_t i = 0; i < vec.size(); i++)
-    {
-        auto target = df::building::find(vec[i]);
-        if (!target)
-            continue;
-
-        if (try_store_item(target, item))
-            return;
-    }
-}
-
-// Store the items into appropriate armory buildings
-static void try_store_item_set(std::vector<int32_t> &items, df::squad *squad, df::squad_position *pos)
-{
-    for (size_t j = 0; j < items.size(); j++)
-    {
-        auto item = df::item::find(items[j]);
-
-        // not loose
-        if (!can_store_item(item))
-            continue;
-
-        // queue jobs to put it in the appropriate container
-        if (item->isWeapon())
-            try_store_item(squad->rack_combat, item);
-        else if (item->isClothing())
-            try_store_item(pos->preferences[barrack_preference_category::Cabinet], item);
-        else if (item->isArmorNotClothing())
-            try_store_item(pos->preferences[barrack_preference_category::Armorstand], item);
-        else
-            try_store_item(pos->preferences[barrack_preference_category::Box], item);
-    }
-}
-
-// For storing ammo, use a data structure sorted by free space, to even out the load
-typedef std::map<int, std::set<df::building*> > ammo_box_set;
-
-// Enumerate boxes in the room, adding them to the set
-static void index_boxes(df::building *root, ammo_box_set &group, int squad_id)
-{
-    if (root->getType() == building_type::Box)
-    {
-        int id = root->getSpecificSquad();
-
-        if (id < 0 || id == squad_id)
-        {
-            //color_ostream_proxy out(Core::getInstance().getConsole());
-            //out.print("%08x %d\n", unsigned(root), root->getFreeCapacity(true));
-
-            group[root->getFreeCapacity(true)].insert(root);
-        }
-    }
-
-    for (size_t i = 0; i < root->children.size(); i++)
-        index_boxes(root->children[i], group, squad_id);
-}
-
-// Loop over the set from most empty to least empty
-static bool try_store_ammo(df::item *item, ammo_box_set &group)
-{
-    int volume = item->getVolume();
-
-    for (auto it = group.rbegin(); it != group.rend(); ++it)
-    {
-        if (it->first < volume)
-            break;
-
-        for (auto it2 = it->second.begin(); it2 != it->second.end(); ++it2)
-        {
-            auto bld = *it2;
-
-            if (try_store_item(bld, item))
-            {
-                it->second.erase(bld);
-                group[bld->getFreeCapacity(true)].insert(bld);
-                return true;
-            }
-        }
-    }
-
-    return false;
-}
-
-// Collect chests for ammo storage
-static void index_ammo_boxes(df::squad *squad, ammo_box_set &train_set, ammo_box_set &combat_set)
-{
-    for (size_t j = 0; j < squad->rooms.size(); j++)
-    {
-        auto room = squad->rooms[j];
-        auto bld = df::building::find(room->building_id);
-
-        // Chests in rooms marked for Squad Equipment used for combat ammo
-        if (room->mode.bits.squad_eq)
-            index_boxes(bld, combat_set, squad->id);
-
-        // Chests in archery ranges used for training ammo
-        if (room->mode.bits.train && bld->getType() == building_type::ArcheryTarget)
-            index_boxes(bld, train_set, squad->id);
-    }
-}
-
-// Store ammo into appropriate chests
-static void try_store_ammo(df::squad *squad)
-{
-    bool indexed = false;
-    ammo_box_set train_set, combat_set;
-
-    for (size_t i = 0; i < squad->ammunition.size(); i++)
-    {
-        auto spec = squad->ammunition[i];
-        bool cs = spec->flags.bits.use_combat;
-        bool ts = spec->flags.bits.use_training;
-
-        for (size_t j = 0; j < spec->assigned.size(); j++)
-        {
-            auto item = df::item::find(spec->assigned[j]);
-
-            // not loose
-            if (!can_store_item(item))
-                continue;
-
-            // compute the maps lazily
-            if (!indexed)
-            {
-                indexed = true;
-                index_ammo_boxes(squad, train_set, combat_set);
-            }
-
-            // BUG: if the same container is in both sets,
-            // when a job is queued, the free space in the other
-            // set will not be updated, which could lead to uneven
-            // loading - but not to overflowing the container!
-
-            // As said above, combat goes into Squad Equipment
-            if (cs && try_store_ammo(item, combat_set))
-                continue;
-            // Training goes into Archery Range with Train
-            if (ts && try_store_ammo(item, train_set))
-                continue;
-            // No use goes into combat
-            if (!(ts || cs) && try_store_ammo(item, combat_set))
-                continue;
-        }
-    }
-}
-
-DFHACK_PLUGIN_IS_ENABLED(is_enabled);
-
-DFhackCExport command_result plugin_onupdate(color_ostream &out, state_change_event event)
-{
-    if (!is_enabled)
-        return CR_OK;
-
-    // Process every 50th frame, sort of like regular stockpiling does
-    if (DF_GLOBAL_VALUE(cur_year_tick,1) % 50 != 0)
-        return CR_OK;
-
-    // Loop over squads
-    auto &squads = world->squads.all;
-
-    for (size_t si = 0; si < squads.size(); si++)
-    {
-        auto squad = squads[si];
-
-        for (size_t i = 0; i < squad->positions.size(); i++)
-        {
-            auto pos = squad->positions[i];
-
-            try_store_item_set(pos->assigned_items, squad, pos);
-        }
-
-        try_store_ammo(squad);
-    }
-
-    return CR_OK;
-}
-
-static void enable_hook(color_ostream &out, VMethodInterposeLinkBase &hook, bool enable)
-{
-    if (!hook.apply(enable))
-        out.printerr("Could not %s hook.\n", enable?"activate":"deactivate");
-}
-
-static void enable_hooks(color_ostream &out, bool enable)
-{
-    is_enabled = enable;
-
-    enable_hook(out, INTERPOSE_HOOK(armory_hook<df::item_weaponst>, isCollected), enable);
-    enable_hook(out, INTERPOSE_HOOK(armory_hook<df::item_armorst>, isCollected), enable);
-    enable_hook(out, INTERPOSE_HOOK(armory_hook<df::item_helmst>, isCollected), enable);
-    enable_hook(out, INTERPOSE_HOOK(armory_hook<df::item_pantsst>, isCollected), enable);
-    enable_hook(out, INTERPOSE_HOOK(armory_hook<df::item_shoesst>, isCollected), enable);
-    enable_hook(out, INTERPOSE_HOOK(armory_hook<df::item_glovesst>, isCollected), enable);
-    enable_hook(out, INTERPOSE_HOOK(armory_hook<df::item_shieldst>, isCollected), enable);
-    enable_hook(out, INTERPOSE_HOOK(armory_hook<df::item_flaskst>, isCollected), enable);
-    enable_hook(out, INTERPOSE_HOOK(armory_hook<df::item_backpackst>, isCollected), enable);
-    enable_hook(out, INTERPOSE_HOOK(armory_hook<df::item_quiverst>, isCollected), enable);
-    enable_hook(out, INTERPOSE_HOOK(armory_hook<df::item_ammost>, isCollected), enable);
-
-    enable_hook(out, INTERPOSE_HOOK(armory_hook<df::item_weaponst>, moveToGround), enable);
-    enable_hook(out, INTERPOSE_HOOK(armory_hook<df::item_armorst>, moveToGround), enable);
-    enable_hook(out, INTERPOSE_HOOK(armory_hook<df::item_helmst>, moveToGround), enable);
-    enable_hook(out, INTERPOSE_HOOK(armory_hook<df::item_pantsst>, moveToGround), enable);
-    enable_hook(out, INTERPOSE_HOOK(armory_hook<df::item_shoesst>, moveToGround), enable);
-    enable_hook(out, INTERPOSE_HOOK(armory_hook<df::item_glovesst>, moveToGround), enable);
-    enable_hook(out, INTERPOSE_HOOK(armory_hook<df::item_shieldst>, moveToGround), enable);
-    enable_hook(out, INTERPOSE_HOOK(armory_hook<df::item_flaskst>, moveToGround), enable);
-    enable_hook(out, INTERPOSE_HOOK(armory_hook<df::item_backpackst>, moveToGround), enable);
-    enable_hook(out, INTERPOSE_HOOK(armory_hook<df::item_quiverst>, moveToGround), enable);
-    enable_hook(out, INTERPOSE_HOOK(armory_hook<df::item_ammost>, moveToGround), enable);
-}
-
-static void enable_plugin(color_ostream &out)
-{
-    auto entry = World::GetPersistentData("fix-armory/enabled", NULL);
-    if (!entry.isValid())
-    {
-        out.printerr("Could not save the status.\n");
-        return;
-    }
-
-    enable_hooks(out, true);
-}
-
-static void disable_plugin(color_ostream &out)
-{
-    auto entry = World::GetPersistentData("fix-armory/enabled");
-    World::DeletePersistentData(entry);
-
-    enable_hooks(out, false);
-}
-
-DFhackCExport command_result plugin_onstatechange(color_ostream &out, state_change_event event)
-{
-    switch (event) {
-    case SC_MAP_LOADED:
-        if (!gamemode || *gamemode == game_mode::DWARF)
-        {
-            bool enable = World::GetPersistentData("fix-armory/enabled").isValid();
-
-            if (enable)
-            {
-                out.print("Enabling the fix-armory plugin.\n");
-                enable_hooks(out, true);
-            }
-            else
-                enable_hooks(out, false);
-        }
-        break;
-    case SC_MAP_UNLOADED:
-        enable_hooks(out, false);
-    default:
-        break;
-    }
-
-    return CR_OK;
-}
-
-DFhackCExport command_result plugin_enable(color_ostream &out, bool enable)
-{
-    if (!Core::getInstance().isWorldLoaded()) {
-        out.printerr("World is not loaded: please load a game first.\n");
-        return CR_FAILURE;
-    }
-
-    if (enable)
-        enable_plugin(out);
-    else
-        disable_plugin(out);
-
-    return CR_OK;
-}
-
-static command_result fix_armory(color_ostream &out, vector <string> &parameters)
-{
-    CoreSuspender suspend;
-
-    if (parameters.empty())
-        return CR_WRONG_USAGE;
-
-    string cmd = parameters[0];
-
-    if (cmd == "enable")
-        return plugin_enable(out, true);
-    else if (cmd == "disable")
-        return plugin_enable(out, false);
-    else
-        return CR_WRONG_USAGE;
-
-    return CR_OK;
-}

From 989befa5824bd1ef54fecb5589c933e1409fc994 Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Mon, 25 Jul 2022 10:22:23 -0700
Subject: [PATCH 326/854] update docs for fastdwarf

---
 docs/plugins/fastdwarf.rst | 46 ++++++++++++++++++++++++++++----------
 plugins/fastdwarf.cpp      | 18 ++++-----------
 2 files changed, 38 insertions(+), 26 deletions(-)

diff --git a/docs/plugins/fastdwarf.rst b/docs/plugins/fastdwarf.rst
index 65d2a3d45..d964b319a 100644
--- a/docs/plugins/fastdwarf.rst
+++ b/docs/plugins/fastdwarf.rst
@@ -1,14 +1,36 @@
 fastdwarf
 =========
-Controls speedydwarf and teledwarf. Speedydwarf makes dwarves move quickly
-and perform tasks quickly. Teledwarf makes dwarves move instantaneously,
-but do jobs at the same speed.
-
-:fastdwarf 0:   disables both (also ``0 0``)
-:fastdwarf 1:   enables speedydwarf and disables teledwarf (also ``1 0``)
-:fastdwarf 2:   sets a native debug flag in the game memory that implements an
-                even more aggressive version of speedydwarf.
-:fastdwarf 0 1: disables speedydwarf and enables teledwarf
-:fastdwarf 1 1: enables both
-
-See `superdwarf` for a per-creature version.
+Tags:
+:dfhack-keybind:`fastdwarf`
+
+Dwarves teleport and/or finish jobs instantly.
+
+Usage:
+
+``enable fastdwarf``
+    Enable the plugin.
+``fastdwarf <speed mode> [<tele mode>]``
+
+Examples
+--------
+
+``fastdwarf 1``
+    Make all your dwarves move and work at maximum speed.
+``fastdwarf 1 1``
+    In addition to working at maximum speed, dwarves also teleport to their
+    destinations.
+
+Options
+-------
+
+Speed modes:
+
+:0: Dwarves move and work at normal rates.
+:1: Dwarves move and work at maximum speed.
+:2: ALL units move (and work) at maximum speed, including creatures and
+    hostiles.
+
+Tele modes:
+
+:0: No teleportation.
+:1: Dwarves teleport to their destinations.
diff --git a/plugins/fastdwarf.cpp b/plugins/fastdwarf.cpp
index 3948d8577..787f85c5d 100644
--- a/plugins/fastdwarf.cpp
+++ b/plugins/fastdwarf.cpp
@@ -224,20 +224,10 @@ DFhackCExport command_result plugin_enable ( color_ostream &out, bool enable )
 
 DFhackCExport command_result plugin_init ( color_ostream &out, std::vector <PluginCommand> &commands)
 {
-    commands.push_back(PluginCommand("fastdwarf",
-        "let dwarves teleport and/or finish jobs instantly",
-        fastdwarf, false,
-        "fastdwarf: make dwarves faster.\n"
-        "Usage:\n"
-        "  fastdwarf <speed> (tele)\n"
-        "Valid values for speed:\n"
-        " * 0 - Make dwarves move and work at standard speed.\n"
-        " * 1 - Make dwarves move and work at maximum speed.\n"
-        " * 2 - Make ALL creatures move and work at maximum speed.\n"
-        "Valid values for (tele):\n"
-        " * 0 - Disable dwarf teleportation (default)\n"
-        " * 1 - Make dwarves teleport to their destinations instantly.\n"
-        ));
+    commands.push_back(PluginCommand(
+        "fastdwarf",
+        "Dwarves teleport and/or finish jobs instantly.",
+        fastdwarf));
 
     return CR_OK;
 }

From ab9c3a07c4d83769e0e5bb3dc3952dec955d0b7d Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Mon, 25 Jul 2022 10:22:42 -0700
Subject: [PATCH 327/854] add missing 'enable' usage for dwarfmonitor

---
 docs/plugins/dwarfmonitor.rst | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docs/plugins/dwarfmonitor.rst b/docs/plugins/dwarfmonitor.rst
index 6c1472c7d..75b71d06c 100644
--- a/docs/plugins/dwarfmonitor.rst
+++ b/docs/plugins/dwarfmonitor.rst
@@ -9,6 +9,8 @@ display widgets with live fort statistics.
 
 Usage:
 
+``enable dwarfmonitor``
+    Enable the plugin.
 ``dwarfmonitor enable <mode>``
     Start tracking a specific facet of fortress life. The ``mode`` can be
     "work", "misery", "date", "weather", or "all".  This will show the

From 2654de583f13ecc080475ad45fc127be2dedd273 Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Mon, 25 Jul 2022 10:23:05 -0700
Subject: [PATCH 328/854] update docs for filltraffic

---
 docs/plugins/filltraffic.rst | 58 ++++++++++++++++++------------------
 plugins/filltraffic.cpp      | 44 ++++++++-------------------
 2 files changed, 41 insertions(+), 61 deletions(-)

diff --git a/docs/plugins/filltraffic.rst b/docs/plugins/filltraffic.rst
index d3e952204..5056ec830 100644
--- a/docs/plugins/filltraffic.rst
+++ b/docs/plugins/filltraffic.rst
@@ -1,43 +1,43 @@
-.. _alltraffic:
 .. _restrictice:
 .. _restrictliquids:
 
 filltraffic
 ===========
-Set traffic designations using flood-fill starting at the cursor.
-See also `alltraffic`, `restrictice`, and `restrictliquids`.  Options:
+Tags:
+:dfhack-keybind:``
 
-:H:     High Traffic
-:N:     Normal Traffic
-:L:     Low Traffic
-:R:     Restricted Traffic
-:X:     Fill across z-levels.
-:B:     Include buildings and stockpiles.
-:P:     Include empty space.
+Usage:
+
+``filltraffic <designation> [<options>]``
+    Set traffic designations using flood-fill starting at the cursor. Flood
+    filling stops at walls and doors.
+``alltraffic <designation>``
+    Set traffic designations for every single tile of the map - useful for
+    resetting traffic designations.
+``restrictice``
+    Restrict traffic on all tiles on top of visible ice.
+``restrictliquids``
+    Restrict traffic on all visible tiles with liquid.
 
-Example:
+Examples
+--------
 
 ``filltraffic H``
-  When used in a room with doors, it will set traffic to HIGH in just that room.
+    When used in a room with doors, it will set traffic to HIGH in just that
+    room.
 
-alltraffic
-==========
-Set traffic designations for every single tile of the map - useful for resetting
-traffic designations.  See also `filltraffic`, `restrictice`, and `restrictliquids`.
+Options
+-------
 
-Options:
+Traffic designations:
 
-:H:     High Traffic
-:N:     Normal Traffic
-:L:     Low Traffic
-:R:     Restricted Traffic
+:H:     High Traffic.
+:N:     Normal Traffic.
+:L:     Low Traffic.
+:R:     Restricted Traffic.
 
-restrictice
-===========
-Restrict traffic on all tiles on top of visible ice.
-See also `alltraffic`, `filltraffic`, and `restrictliquids`.
+Filltraffic extra options:
 
-restrictliquids
-===============
-Restrict traffic on all visible tiles with liquid.
-See also `alltraffic`, `filltraffic`, and `restrictice`.
+:X:     Fill across z-levels.
+:B:     Include buildings and stockpiles.
+:P:     Include empty space.
diff --git a/plugins/filltraffic.cpp b/plugins/filltraffic.cpp
index ddb5ef877..781fce0a8 100644
--- a/plugins/filltraffic.cpp
+++ b/plugins/filltraffic.cpp
@@ -44,41 +44,21 @@ DFHACK_PLUGIN("filltraffic");
 DFhackCExport command_result plugin_init ( color_ostream &out, std::vector <PluginCommand> &commands)
 {
     commands.push_back(PluginCommand(
-        "filltraffic","Flood-fill selected traffic designation from cursor",
-        filltraffic, Gui::cursor_hotkey,
-        "  Flood-fill selected traffic type from the cursor.\n"
-        "Traffic Type Codes:\n"
-        "  H: High Traffic\n"
-        "  N: Normal Traffic\n"
-        "  L: Low Traffic\n"
-        "  R: Restricted Traffic\n"
-        "Other Options:\n"
-        "  X: Fill across z-levels.\n"
-        "  B: Include buildings and stockpiles.\n"
-        "  P: Include empty space.\n"
-        "Example:\n"
-        "  filltraffic H\n"
-        "    When used in a room with doors,\n"
-        "    it will set traffic to HIGH in just that room.\n"
-    ));
+        "filltraffic",
+        "Flood-fill selected traffic designation from cursor.",
+        filltraffic, Gui::cursor_hotkey));
     commands.push_back(PluginCommand(
-        "alltraffic","Set traffic for the entire map",
-        alltraffic, false,
-        "  Set traffic types for all tiles on the map.\n"
-        "Traffic Type Codes:\n"
-        "  H: High Traffic\n"
-        "  N: Normal Traffic\n"
-        "  L: Low Traffic\n"
-        "  R: Restricted Traffic\n"
-    ));
+        "alltraffic",
+        "Set traffic designation for the entire map.",
+        alltraffic));
     commands.push_back(PluginCommand(
-        "restrictliquids","Restrict on every visible square with liquid",
-        restrictLiquid, false, ""
-    ));
+        "restrictliquids",
+        "Restrict traffic on every visible square with liquid.",
+        restrictLiquid));
     commands.push_back(PluginCommand(
-        "restrictice","Restrict traffic on squares above visible ice",
-        restrictIce, false, ""
-    ));
+        "restrictice",
+        "Restrict traffic on squares above visible ice.",
+        restrictIce));
     return CR_OK;
 }
 

From 9c0bd6bd709e7565373cf8fdfaa1e59c99af9577 Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Mon, 25 Jul 2022 10:23:26 -0700
Subject: [PATCH 329/854] update docs for fix-unit-occupancy

---
 docs/plugins/fix-unit-occupancy.rst | 44 ++++++++++++++++++++++-------
 plugins/fix-unit-occupancy.cpp      | 14 ++-------
 2 files changed, 36 insertions(+), 22 deletions(-)

diff --git a/docs/plugins/fix-unit-occupancy.rst b/docs/plugins/fix-unit-occupancy.rst
index bf999c8a3..48efd7255 100644
--- a/docs/plugins/fix-unit-occupancy.rst
+++ b/docs/plugins/fix-unit-occupancy.rst
@@ -1,12 +1,36 @@
 fix-unit-occupancy
 ==================
-This plugin fixes issues with unit occupancy, notably phantom
-"unit blocking tile" messages (:bug:`3499`). It can be run manually, or
-periodically when enabled with the built-in enable/disable commands:
-
-:(no argument):         Run the plugin once immediately, for the whole map.
-:-h, here, cursor:      Run immediately, only operate on the tile at the cursor
-:-n, dry, dry-run:      Run immediately, do not write changes to map
-:interval <X>:          Run the plugin every ``X`` ticks (when enabled).
-                        The default is 1200 ticks, or 1 day.
-                        Ticks are only counted when the game is unpaused.
+Tags:
+:dfhack-keybind:``
+
+Fix phantom unit occupancy issues. For example, if you see "unit blocking tile"
+messages that you can't account for (:bug:`3499`), this tool can help.
+
+Usage::
+
+    enable fix-unit-occupancy
+    fix-unit-occupancy [here] [-n]
+    fix-unit-occupancy interval <num_ticks>
+
+When run without arguments (or with just the ``here`` or ``-n`` parameters),
+the fix just runs once. You can also have it run periodically by enbling the
+plugin.
+
+Examples
+--------
+
+``fix-unit-occupancy``
+    Run once and fix all occupancy issues on the map.
+``fix-unit-occupancy -n``
+    Report on, but do not fix, all occupancy issues on the map.
+
+Options
+-------
+
+``here``
+    Only operate on the tile at the cursor.
+``-n``
+    Report issues, but do not any write changes to the map.
+``interval <num_ticks>``
+    Set how often the plugin will check for and fix issues when it is enabled.
+    The default is 1200 ticks, or 1 game day.
diff --git a/plugins/fix-unit-occupancy.cpp b/plugins/fix-unit-occupancy.cpp
index d602ae213..973c185a8 100644
--- a/plugins/fix-unit-occupancy.cpp
+++ b/plugins/fix-unit-occupancy.cpp
@@ -181,18 +181,8 @@ DFhackCExport command_result plugin_init (color_ostream &out, std::vector <Plugi
 {
     commands.push_back(PluginCommand(
         "fix-unit-occupancy",
-        "Fix unit occupancy issues such as phantom 'creature blocking site' messages (bug 3499)",
-        cmd_fix_unit_occupancy,
-        false, //allow non-interactive use
-        "  enable fix-unit-occupancy: Enable the plugin\n"
-        "  disable fix-unit-occupancy fix-unit-occupancy: Disable the plugin\n"
-        "  fix-unit-occupancy: Run the plugin immediately. Available options:\n"
-        "    -h|here|cursor: Only operate on the tile at the cursor\n"
-        "    -n|dry|dry-run: Do not write changes to map\n"
-        "  fix-unit-occupancy interval X: Run the plugin every X ticks (when enabled).\n"
-        "    Default is 1200, or 1 day. Ticks are only counted when the game is unpaused.\n"
-
-    ));
+        "Fix phantom unit occupancy issues.",
+        cmd_fix_unit_occupancy));
     return CR_OK;
 }
 

From ea3dfe399ed095858102158eaf8ce17365bead4b Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Mon, 25 Jul 2022 10:54:11 -0700
Subject: [PATCH 330/854] update docs for fixveins

---
 docs/plugins/fixveins.rst | 12 +++++++++---
 plugins/fixveins.cpp      |  5 +++--
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/docs/plugins/fixveins.rst b/docs/plugins/fixveins.rst
index 58678d154..940c13b7a 100644
--- a/docs/plugins/fixveins.rst
+++ b/docs/plugins/fixveins.rst
@@ -1,5 +1,11 @@
 fixveins
 ========
-Removes invalid references to mineral inclusions and restores missing ones.
-Use this if you broke your embark with tools like `tiletypes`, or if you
-accidentally placed a construction on top of a valuable mineral floor.
+Tags:
+:dfhack-keybind:`fixveins`
+
+Restore missing mineral inclusions. This tool can also remove invalid references
+to mineral inclusions if you broke your embark with tools like `tiletypes`.
+
+Usage::
+
+    fixveins
diff --git a/plugins/fixveins.cpp b/plugins/fixveins.cpp
index 84d475518..f633f8422 100644
--- a/plugins/fixveins.cpp
+++ b/plugins/fixveins.cpp
@@ -103,8 +103,9 @@ command_result df_fixveins (color_ostream &out, vector <string> & parameters)
 
 DFhackCExport command_result plugin_init ( color_ostream &out, std::vector <PluginCommand> &commands)
 {
-    commands.push_back(PluginCommand("fixveins",
-        "Remove invalid references to mineral inclusions and restore missing ones.",
+    commands.push_back(PluginCommand(
+        "fixveins",
+        "Restore missing mineral inclusions.",
         df_fixveins));
     return CR_OK;
 }

From e13aae2ce19e20c37850bac12c2c1e59d1f1803d Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Mon, 25 Jul 2022 10:55:04 -0700
Subject: [PATCH 331/854] update docs for flows

---
 docs/plugins/flows.rst | 12 +++++++++---
 plugins/flows.cpp      |  3 ++-
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/docs/plugins/flows.rst b/docs/plugins/flows.rst
index 3df451195..354b0078e 100644
--- a/docs/plugins/flows.rst
+++ b/docs/plugins/flows.rst
@@ -1,5 +1,11 @@
 flows
 =====
-A tool for checking how many tiles contain flowing liquids. If you suspect that
-your magma sea leaks into HFS, you can use this tool to be sure without
-revealing the map.
+Tags:
+:dfhack-keybind:`flows`
+
+Counts map blocks with flowing liquids.. If you suspect that your magma sea
+leaks into HFS, you can use this tool to be sure without revealing the map.
+
+Usage::
+
+    flows
diff --git a/plugins/flows.cpp b/plugins/flows.cpp
index 070776b10..a17554cb9 100644
--- a/plugins/flows.cpp
+++ b/plugins/flows.cpp
@@ -59,7 +59,8 @@ command_result df_flows (color_ostream &out, vector <string> & parameters)
 
 DFhackCExport command_result plugin_init ( color_ostream &out, std::vector <PluginCommand> &commands)
 {
-    commands.push_back(PluginCommand("flows",
+    commands.push_back(PluginCommand(
+        "flows",
         "Counts map blocks with flowing liquids.",
         df_flows));
     return CR_OK;

From 20ccd3a99cd1937c5fb71c7de7c3a97fb2d9f5ec Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Mon, 25 Jul 2022 10:55:31 -0700
Subject: [PATCH 332/854] update docs for follow

---
 docs/plugins/follow.rst | 13 ++++++++++---
 plugins/follow.cpp      |  9 ++++-----
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/docs/plugins/follow.rst b/docs/plugins/follow.rst
index a91c14f73..a0c15547e 100644
--- a/docs/plugins/follow.rst
+++ b/docs/plugins/follow.rst
@@ -1,5 +1,12 @@
 follow
 ======
-Makes the game view follow the currently highlighted unit after you exit from the
-current menu or cursor mode. Handy for watching dwarves running around. Deactivated
-by moving the view manually.
+Tags:
+:dfhack-keybind:`follow`
+
+Make the screen follow the selected unit. Once you exit from the current menu or
+cursor mode, the screen will stay centered on the unit. Handy for watching
+dwarves running around. Deactivated by moving the cursor manually.
+
+Usage::
+
+    follow
diff --git a/plugins/follow.cpp b/plugins/follow.cpp
index e9733d5da..53ff5c523 100644
--- a/plugins/follow.cpp
+++ b/plugins/follow.cpp
@@ -31,11 +31,10 @@ uint8_t prevMenuWidth;
 DFhackCExport command_result plugin_init ( color_ostream &out, std::vector <PluginCommand> &commands)
 {
     commands.push_back(PluginCommand(
-        "follow", "Make the screen follow the selected unit",
-        follow, Gui::view_unit_hotkey,
-        "  Select a unit and run this plugin to make the camera follow it.\n"
-        "  Moving the camera yourself deactivates the plugin.\n"
-    ));
+        "follow",
+        "Make the screen follow the selected unit.",
+        follow,
+        Gui::view_unit_hotkey));
     followedUnit = 0;
     prevX=prevY=prevZ = -1;
     prevMenuWidth = 0;

From 82953d8b2fe08fc0b31ca50b0eb09896189baa5f Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Mon, 25 Jul 2022 13:37:52 -0700
Subject: [PATCH 333/854] fix doc build errors

---
 docs/Removed.rst           | 8 ++++++++
 docs/plugins/fastdwarf.rst | 7 +++----
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/docs/Removed.rst b/docs/Removed.rst
index 3dbe26820..a9d1d3470 100644
--- a/docs/Removed.rst
+++ b/docs/Removed.rst
@@ -49,6 +49,14 @@ existing .csv files. Just move them to the ``blueprints`` folder in your DF
 installation, and instead of ``digfort file.csv``, run
 ``quickfort run file.csv``.
 
+.. _fix-armory:
+
+fix-armory
+==========
+Allowed the military to store equipment in barracks containers. Removed because
+it required a binary patch to DF in order to function, and no such patch has
+existed since DF 0.34.11.
+
 .. _fortplan:
 
 fortplan
diff --git a/docs/plugins/fastdwarf.rst b/docs/plugins/fastdwarf.rst
index d964b319a..e06f2564c 100644
--- a/docs/plugins/fastdwarf.rst
+++ b/docs/plugins/fastdwarf.rst
@@ -5,11 +5,10 @@ Tags:
 
 Dwarves teleport and/or finish jobs instantly.
 
-Usage:
+Usage::
 
-``enable fastdwarf``
-    Enable the plugin.
-``fastdwarf <speed mode> [<tele mode>]``
+    enable fastdwarf
+    fastdwarf <speed mode> [<tele mode>]
 
 Examples
 --------

From eb0f016804953fc8fd5ac8dfa30c96430b616e68 Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Mon, 25 Jul 2022 16:40:19 -0700
Subject: [PATCH 334/854] update docs for forceequip

---
 docs/plugins/forceequip.rst | 101 +++++++++++++++++++++-
 plugins/forceequip.cpp      | 165 +-----------------------------------
 2 files changed, 100 insertions(+), 166 deletions(-)

diff --git a/docs/plugins/forceequip.rst b/docs/plugins/forceequip.rst
index 2278bca22..2b8a55905 100644
--- a/docs/plugins/forceequip.rst
+++ b/docs/plugins/forceequip.rst
@@ -1,7 +1,100 @@
 forceequip
 ==========
-Forceequip moves local items into a unit's inventory.  It is typically used to
-equip specific clothing/armor items onto a dwarf, but can also be used to put
-armor onto a war animal or to add unusual items (such as crowns) to any unit.
+Tags:
+:dfhack-keybind:`forceequip`
 
-For more information run ``forceequip help``.  See also `modtools/equip-item`.
+Move items into a unit's inventory. This tool is typically used to equip
+specific clothing/armor items onto a dwarf, but can also be used to put armor
+onto a war animal or to add unusual items (such as crowns) to any unit. Make
+sure the unit you want to equip is standing on the target items, which must be
+on the ground and be unforbidden. If multiple units are standing on the same
+tile, the first one will be equipped.
+
+The most reliable way to set up the environment for this command is to pile
+target items on a tile of floor with a garbage dump activity zone or the
+`autodump` command, then walk/pasture a unit (or use `gui/teleport`) on top of
+the items. Be sure to unforbid the items that you want to work with!
+
+.. note::
+
+    Weapons are not currently supported.
+
+Usage::
+
+    forceequip [<options>]
+
+As mentioned above, this plugin can be used to equip items onto units (such as
+animals) who cannot normally equip gear. There's an important caveat here: such
+creatures will automatically drop inappropriate gear almost immediately (within
+10 game ticks). If you want them to retain their equipment, you must forbid it
+AFTER using forceequip to get it into their inventory. This technique can also
+be used to clothe dwarven infants, but only if you're able to separate them from
+their mothers.
+
+By default, the ``forceequip`` command will attempt to abide by game rules as
+closely as possible. For instance, it will skip any item which is flagged for
+use in a job, and will not equip more than one piece of clothing/armor onto any
+given body part. These restrictions can be overridden via options, but doing so
+puts you at greater risk of unexpected consequences. For instance, a dwarf who
+is wearing three breastplates will not be able to move very quickly.
+
+Items equipped by this plugin DO NOT become owned by the recipient. Adult
+dwarves are free to adjust their own wardrobe, and may promptly decide to doff
+your gear in favour of their owned items. Animals, as described above, will tend
+to discard ALL clothing immediately unless it is manually forbidden. Armor items
+seem to be an exception: an animal will tend to retain an equipped suit of mail"
+ even if you neglect to forbid it.
+
+Please note that armored animals are quite vulnerable to ranged attacks. Unlike
+dwarves, animals cannot block, dodge, or deflect arrows, and they are slowed by
+the weight of their armor.
+
+Examples
+--------
+
+``forceequip``
+    Attempts to equip all of the clothing and armor under the cursor onto the
+    unit under the cursor, following game rules regarding which item can be
+    equipped on which body part and only equipping 1 item onto each body part.
+    Items owned by other dwarves are ignored.
+``forceequip v bp QQQ``
+    List the bodyparts of the selected unit.
+``forceequip bp LH``
+    Equips an appopriate item onto the unit's left hand.
+``forceequip m bp LH``
+    Equips ALL appropriate items onto the unit's left hand. The unit may end up
+    wearing a dozen left-handed mittens. Use with caution, and remember that
+    dwarves tend to drop extra items ASAP.
+``forceequip i bp NECK``
+    Equips an item around the unit's neck, ignoring appropriateness
+    restrictions. If there's a millstone or an albatross carcass sitting on the
+    same square as the targeted unit, then there's a good chance that it will
+    end up around his neck. For precise control, remember that you can
+    selectively forbid some of the items that are piled on the ground.
+``forceequip s``
+    Equips the item currently selected in the k menu, if possible.
+``forceequip s m i bp HD``
+    Equips the selected item onto the unit's head. Ignores all restrictions and
+    conflicts. If you know exactly what you want to equip, and exactly where you
+    want it to go, then this is the most straightforward and reliable option.
+
+Options
+-------
+
+``i``, ``ignore``
+    Bypasses the usual item eligibility checks (such as "Never equip gear
+    belonging to another dwarf" and "Nobody is allowed to equip a Hive".
+``m``, ``multi``
+    Bypasses the 1-item-per-bodypart limit. Useful for equipping both a mitten
+    and a gauntlet on the same hand (or twelve breastplates on the upper body).
+``m2``, ``m3``, ``m4``
+    Modifies the 1-item-per-bodypart limit, allowing each part to receive 2, 3,
+    or 4 pieces of gear.
+``s``, ``selected``
+    Equip only the item currently selected in the k menu and ignore all other
+    items in the tile.
+``bp``, ``bodypart <body part code>``
+    Specify which body part should be equipped.
+``v``, ``verbose``
+    Provide detailed narration and error messages, including listing available
+    body parts when an invalid ``bodypart`` code is specified.
diff --git a/plugins/forceequip.cpp b/plugins/forceequip.cpp
index ab39bb0d6..10a157608 100644
--- a/plugins/forceequip.cpp
+++ b/plugins/forceequip.cpp
@@ -55,171 +55,12 @@ const int const_GloveLeftHandedness = 2;
 
 command_result df_forceequip(color_ostream &out, vector <string> & parameters);
 
-const string forceequip_help =
-    "ForceEquip moves local items into a unit's inventory.  It is typically\n"
-    "used to equip specific clothing/armor items onto a dwarf, but can also\n"
-    "be used to put armor onto a war animal or to add unusual items (such\n"
-    "as crowns) to any unit.\n"
-    "This plugin can process multiple items in a single call, but will only\n"
-    "work with a single unit (the first one it finds under the cursor).\n"
-    "In order to minimize confusion, it is recommended that you use\n"
-    "forceequip only when you have a unit standing alone atop a pile of\n"
-    "gear that you would like it to wear.  Items which are stored in bins\n"
-    "or other containers (e.g. chests, armor racks) may also work, but\n"
-    "piling items on the floor (via a garbage dump activity zone, of the\n"
-    "DFHack autodump command) is the most reliable way to do it.\n"
-    "The plugin will ignore any items that are forbidden.  Hence, you\n"
-    "can setup a large pile of surplus gear, walk a unit onto it (or\n"
-    "pasture an animal on it), unforbid a few items and run forceequip.\n"
-    "The (forbidden) majority of your gear will remain in-place, ready\n"
-    "for the next passerby."
-    "\n"
-    "As mentioned above, this plugin can be used to equip items onto\n"
-    "units (such as animals) which cannot normally equip gear.  There's\n"
-    "an important caveat here - such creatures will automatically drop\n"
-    "inappropriate gear almost immediately (within 10 game ticks).\n"
-    "If you want them to retain their equipment, you must forbid it\n"
-    "AFTER using forceequip to get it into their inventory.\n"
-    "This technique can also be used to clothe dwarven infants, but\n"
-    "only if you're able to separate them from their mothers.\n"
-    "\n"
-    "By default, the forceequip plugin will attempt to avoid\n"
-    "conflicts and outright cheating.  For instance, it will skip\n"
-    "any item which is flagged for use in a job, and will not\n"
-    "equip more than one piece of clothing/armor onto any given\n"
-    "body part.  These restrictions can be overridden via command\n"
-    "switches (see examples below) but doing so puts you at greater\n"
-    "risk of unexpected consequences.  For instance, a dwarf who\n"
-    "is wearing three breastplates will not be able to move very\n"
-    "quickly.\n"
-    "\n"
-    "Items equipped by this plugin DO NOT become owned by the\n"
-    "recipient.  Adult dwarves are free to adjust their own\n"
-    "wardrobe, and may promptly decide to doff your gear in\n"
-    "favour of their owned items.  Animals, as described above,\n"
-    "will tend to discard ALL clothing immediately unless it is\n"
-    "manually forbidden.  Armor items seem to be an exception;\n"
-    "an animal will tend to retain an equipped suit of mail\n"
-    "even if you neglect to Forbid it.\n"
-    "\n"
-    "Please note that armored animals are quite vulnerable to ranged\n"
-    "attacks.  Unlike dwarves, animals cannot block, dodge, or deflect\n"
-    "arrows, and they are slowed by the weight of their armor.\n"
-    "\n"
-    "This plugin currently does not support weapons.\n"
-    "\n"
-    "Options:\n"
-    "  here, h      - process the unit and item(s) under the cursor.\n"
-    "               - This option is enabled by default since the plugin\n"
-    "               - does not currently support remote equpping.\n"
-    "  ignore, i    - bypasses the usual item eligibility checks (such as\n"
-    "               - \"Never equip gear belonging to another dwarf\" and\n"
-    "               - \"Nobody is allowed to equip a Hive\".)\n"
-    "  multi, m     - bypasses the 1-item-per-bodypart limit, allowing\n"
-    "               - the unit to receive an unlimited amount of gear.\n"
-    "               - Can be used legitimately (e.g. mitten + gauntlet)\n"
-    "               - or for cheating (e.g. twelve breastplates).\n"
-    "  m2, m3, m4   - alters the 1-item-per-bodypart limit, allowing\n"
-    "               - each part to receive 2, 3, or 4 pieces of gear.\n"
-    "  selected, s  - rather than processing all items piled at a unit's\n"
-    "               - feet, process only the one item currently selected.\n"
-    "  bodypart, bp - must be followed by a bodypart code (e.g. LH).\n"
-    "               - Instructs the plugin to equip all available items\n"
-    "               - onto this body part only.  Typically used in\n"
-    "               - conjunction with the f switch (to over-armor\n"
-    "               - a particular bodypart) or the i switch (to equip\n"
-    "               - an unusual item onto a specific slot).\n"
-    "  verbose, v   - provides detailed narration and error messages.\n"
-    "               - Can be helpful in resolving failures; not needed\n"
-    "               - for casual use.\n"
-    "\n"
-    "Examples:\n"
-    "  forceequip\n"
-    "    attempts to equip all of the items under the cursor onto the unit\n"
-    "    under the cursor.  Uses only clothing/armor items; ignores all\n"
-    "    other types.  Equips a maximum of 1 item onto each bodypart,\n"
-    "    and equips only \"appropriate\" items in each slot (e.g. glove\n"
-    "    --> hand).  Bypasses any item which might cause a conflict,\n"
-    "    such as a Boot belonging to a different dwarf.\n"
-    "  forceequip bp LH\n"
-    "    attempts to equip all local items onto the left hand of the local\n"
-    "    unit.  If the hand is already equipped then nothing will happen,\n"
-    "    and if it is not equipped then only one appropriate item (e.g. \n"
-    "    a single mitten or gauntlet) will be equipped.  This command can\n"
-    "    be useful if you don't want to selectively forbid individual items\n"
-    "    and simply want the unit to equip, say, a Helmet while leaving\n"
-    "    the rest of the pile alone.\n"
-    "  forceequip m bp LH\n"
-    "    as above, but will equip ALL appropriate items onto the unit's\n"
-    "    left hand.  After running this command, it might end up wearing\n"
-    "    a dozen left-handed mittens.  Use with caution, and remember\n"
-    "    that dwarves will tend to drop supernumary items ASAP.\n"
-    "  forceequip m\n"
-    "    as above, but will equip ALL appropriate items onto any\n"
-    "    appropriate bodypart.  Tends to put several boots onto the right\n"
-    "    foot while leaving the left foot bare.\n"
-    "  forceequip m2\n"
-    "    as above, but will equip up to two appropriate items onto each\n"
-    "    bodypart.  Helps to balance footwear, but doesn't ensure proper\n"
-    "    placement (e.g. left foot gets two socks, right foot gets two\n"
-    "    shoes).  For best results, use \"selected bp LH\" and\n"
-    "    \"selected bp RH\" instead.\n"
-    "  forceequip i\n"
-    "    performs the standard \"equip appropriate items onto appropriate\n"
-    "    bodyparts\" logic, but also includes items that would normally\n"
-    "    be considered ineligible (such as a sock which is owned by\n"
-    "    a different dwarf).\n"
-    "  forceequip bp NECK\n"
-    "    attempts to equip any appropriate gear onto the Neck of the\n"
-    "    local unit.  Since the plugin believes that no items are actually\n"
-    "    appropriate for the Neck slot, this command does nothing.\n"
-    "  forceequip i bp NECK\n"
-    "    attempts to equip items from the local pile onto the Neck\n"
-    "    of the local unit.  Ignores appropriateness restrictions.\n"
-    "    If there's a millstone or an albatross carcass sitting on\n"
-    "    the same square as the targeted unit, then there's a good\n"
-    "    chance that it will end up around his neck.  For precise\n"
-    "    control, remember that you can selectively forbid some of\n"
-    "    the items that are piled on the ground.\n"
-    "  forceequip i m bp NECK\n"
-    "    as above, but equips an unlimited number of items onto the\n"
-    "    targeted bodypart.  Effectively, all unforbidden items\n"
-    "    (including helms, millstones, boulders, etc) will be\n"
-    "    moved from the local pile and placed in the dwarf's\n"
-    "    inventory (specifically, on his neck).  When used with\n"
-    "    a large pile of goods, this will leave the dwarf heavily\n"
-    "    encumbered and very slow to move.\n"
-    "  forceequip s\n"
-    "    requires that a single item be selected using the k menu.\n"
-    "    This item must occupy the same square as the target unit,\n"
-    "    and must be unforbidden.  Attempts to equip this single\n"
-    "    item onto an appropriate slot in the unit's inventory.\n"
-    "    Can serve as a quicker alternative to the selective-\n"
-    "    unforbidding approach described above.\n"
-    "  forceequip s m i bp HD\n"
-    "    equips the selected item onto the unit's head.  Ignores\n"
-    "    all possible restrictions and conflicts.  If you know\n"
-    "    exactly what you want to equip, and exactly where you\n"
-    "    want it to go, then this is the most straightforward\n"
-    "    and reliable option.\n"
-    "  forceequip v bp QQQ\n"
-    "    guaranteed to fail (and accomplish nothing) because\n"
-    "    there are no bodyparts called QQQ.  However, since the\n"
-    "    verbose switch is used, the resulting error messages\n"
-    "    will list every bodypart that the unit DOES possess.\n"
-    "    May be useful if you're unfamiliar with the BP codes\n"
-    "    used by Dwarf Fortress, or if you're experimenting\n"
-    "    with an exotic creature.\n"
-    "\n"
-    ;
-
 DFhackCExport command_result plugin_init ( color_ostream &out, vector <PluginCommand> &commands)
 {
     commands.push_back(PluginCommand(
-        "forceequip", "Move items from the ground into a unit's inventory",
-        df_forceequip, false,
-        forceequip_help.c_str()
-    ));
+        "forceequip",
+        "Move items into a unit's inventory.",
+        df_forceequip));
 
     return CR_OK;
 }

From 367ac0064ef21089a7eca07752f3417fba6eb977 Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Mon, 25 Jul 2022 16:54:28 -0700
Subject: [PATCH 335/854] update docs for generated-creature-renamer

---
 docs/plugins/generated-creature-renamer.rst | 28 +++++++++++++--------
 plugins/generated-creature-renamer.cpp      | 13 +++-------
 2 files changed, 22 insertions(+), 19 deletions(-)

diff --git a/docs/plugins/generated-creature-renamer.rst b/docs/plugins/generated-creature-renamer.rst
index bb486a4ee..1615ba32d 100644
--- a/docs/plugins/generated-creature-renamer.rst
+++ b/docs/plugins/generated-creature-renamer.rst
@@ -1,15 +1,23 @@
 generated-creature-renamer
 ==========================
-Automatically renames generated creatures, such as forgotten beasts, titans,
-etc, to have raw token names that match the description given in-game.
+Tags:
+:dfhack-keybind:`list-generated`
+:dfhack-keybind:`save-generated-raws`
 
-The ``list-generated`` command can be used to list the token names of all
-generated creatures in a given save, with an optional ``detailed`` argument
-to show the accompanying description.
+Automatically renames generated creatures. Now, forgotten beasts, titans,
+necromancer experiments, etc. will have raw token names that match the
+description given in-game instead of unreadable generated strings.
 
-The ``save-generated-raws`` command will save a sample creature graphics file in
-the Dwarf Fortress root directory, to use as a start for making a graphics set
-for generated creatures using the new names that they get with this plugin.
+Usage:
 
-The new names are saved with the save, and the plugin, when enabled, only runs once
-per save, unless there's an update.
+``enable generated-creature-renamer``
+    Rename generated creatures when a world is loaded.
+``list-generated [detailed]``
+    List the token names of all generated creatures in the loaded save. If
+    ``detailed`` is specified, then also show the accompanying description.
+``save-generated-raws``
+    Save a sample creature graphics file in the Dwarf Fortress root directory to
+    use as a start for making a graphics set for generated creatures using the
+    new names that they get with this plugin.
+
+The new names are saved with the world.
diff --git a/plugins/generated-creature-renamer.cpp b/plugins/generated-creature-renamer.cpp
index 625c093cf..f6e9e41b6 100644
--- a/plugins/generated-creature-renamer.cpp
+++ b/plugins/generated-creature-renamer.cpp
@@ -27,17 +27,12 @@ DFhackCExport command_result plugin_init(color_ostream &out, std::vector <Plugin
     commands.push_back(PluginCommand(
         "list-generated",
         "Prints a list of generated creature tokens.",
-        list_creatures,
-        false, //allow non-interactive use
-        "Use \"list-generated detailed\" to show descriptions."
-    ));
+        list_creatures));
     commands.push_back(PluginCommand(
         "save-generated-raws",
-        "Saves a graphics raw file to use with the renamed generated creatures.",
-        save_generated_raw,
-        false, //allow non-interactive use
-        "Creates graphics_procedural_creatures.txt, with a full set of creature graphics definitions for all possible generated beasts. Modify the resulting file to suit your needs."
-    ));    return CR_OK;
+        "Exports a graphics raw file for the renamed generated creatures.",
+        save_generated_raw));
+    return CR_OK;
 }
 
 DFhackCExport command_result plugin_shutdown(color_ostream &out)

From 094f8d72574c0828c5497591c042dca5b61d2477 Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Mon, 25 Jul 2022 16:57:08 -0700
Subject: [PATCH 336/854] fix typos in forceequip cpp/docs

---
 docs/plugins/forceequip.rst | 4 ++--
 plugins/forceequip.cpp      | 3 +--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/docs/plugins/forceequip.rst b/docs/plugins/forceequip.rst
index 2b8a55905..217085fe4 100644
--- a/docs/plugins/forceequip.rst
+++ b/docs/plugins/forceequip.rst
@@ -42,8 +42,8 @@ Items equipped by this plugin DO NOT become owned by the recipient. Adult
 dwarves are free to adjust their own wardrobe, and may promptly decide to doff
 your gear in favour of their owned items. Animals, as described above, will tend
 to discard ALL clothing immediately unless it is manually forbidden. Armor items
-seem to be an exception: an animal will tend to retain an equipped suit of mail"
- even if you neglect to forbid it.
+seem to be an exception: an animal will tend to retain an equipped suit of mail
+even if you neglect to forbid it.
 
 Please note that armored animals are quite vulnerable to ranged attacks. Unlike
 dwarves, animals cannot block, dodge, or deflect arrows, and they are slowed by
diff --git a/plugins/forceequip.cpp b/plugins/forceequip.cpp
index 10a157608..2ee4e47a7 100644
--- a/plugins/forceequip.cpp
+++ b/plugins/forceequip.cpp
@@ -280,8 +280,7 @@ command_result df_forceequip(color_ostream &out, vector <string> & parameters)
 
         if (p == "help" || p == "?" || p == "h" || p == "/?" || p == "info" || p == "man")
         {
-            out << forceequip_help << endl;
-            return CR_OK;
+            return CR_WRONG_USAGE;
         }
         else if (p == "here" || p == "h")
         {

From 8cf7f59c398cbc25de7e471052e9ed4e63d97155 Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Mon, 25 Jul 2022 17:48:39 -0700
Subject: [PATCH 337/854] wrap ls and tags output

---
 library/lua/helpdb.lua | 30 +++++++++++++++++++-----------
 1 file changed, 19 insertions(+), 11 deletions(-)

diff --git a/library/lua/helpdb.lua b/library/lua/helpdb.lua
index 5e0f49920..1bf93f333 100644
--- a/library/lua/helpdb.lua
+++ b/library/lua/helpdb.lua
@@ -653,21 +653,31 @@ function help(entry)
     print(get_entry_long_help(entry))
 end
 
-local function get_max_width(list, min_width)
-    local width = min_width or 0
-    for _,item in ipairs(list) do
-        width = math.max(width, #item)
+-- prints col1 (width 20), a 2 space gap, and col2 (width 58)
+-- if col1text is longer than 20 characters, col2text is printed on the next
+-- line. if col2text is longer than 58 characters, it is wrapped.
+local COL1WIDTH, COL2WIDTH = 20, 58
+local function print_columns(col1text, col2text)
+    col2text = col2text:wrap(COL2WIDTH)
+    local wrapped_col2 = {}
+    for line in col2text:gmatch('[^'..NEWLINE..']*') do
+        table.insert(wrapped_col2, line)
+    end
+    if #col1text > COL1WIDTH then
+        print(col1text)
+    else
+        print(('%-'..COL1WIDTH..'s  %s'):format(col1text, wrapped_col2[1]))
+    end
+    for i=2,#wrapped_col2 do
+        print(('%'..COL1WIDTH..'s  %s'):format(' ', wrapped_col2[i]))
     end
-    return width
 end
 
 -- implements the 'tags' builtin command
 function tags()
     local tags = get_tags()
-    local width = get_max_width(tags, 10)
     for _,tag in ipairs(tags) do
-        print(('  %-'..width..'s %s'):format(tag,
-                                             get_tag_data(tag).description))
+        print_columns(tag, get_tag_data(tag).description)
     end
 end
 
@@ -675,10 +685,8 @@ end
 -- defined as in search_entries() above.
 function list_entries(skip_tags, include, exclude)
     local entries = search_entries(include, exclude)
-    local width = get_max_width(entries, 10)
     for _,entry in ipairs(entries) do
-        print(('  %-'..width..'s  %s'):format(
-                entry, get_entry_short_help(entry)))
+        print_columns(entry, get_entry_short_help(entry))
         if not skip_tags then
             local tags = get_entry_tags(entry)
             if #tags > 0 then

From b93e3365f6d8fb1281d8de49c680a38d1fe084be Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Mon, 25 Jul 2022 21:50:52 -0700
Subject: [PATCH 338/854] update docs for get plants

---
 docs/plugins/getplants.rst | 69 ++++++++++++++++++++++++--------------
 plugins/getplants.cpp      | 21 ++----------
 2 files changed, 46 insertions(+), 44 deletions(-)

diff --git a/docs/plugins/getplants.rst b/docs/plugins/getplants.rst
index 5a719b3ab..167ac72f2 100644
--- a/docs/plugins/getplants.rst
+++ b/docs/plugins/getplants.rst
@@ -1,24 +1,48 @@
 getplants
 =========
-This tool allows plant gathering and tree cutting by RAW ID. Specify the types
-of trees to cut down and/or shrubs to gather by their plant names, separated
-by spaces.
-
-Options:
-
-:``-t``: Tree: Select trees only (exclude shrubs)
-:``-s``: Shrub: Select shrubs only (exclude trees)
-:``-f``: Farming: Designate only shrubs that yield seeds for farming. Implies -s
-:``-c``: Clear: Clear designations instead of setting them
-:``-x``: eXcept: Apply selected action to all plants except those specified (invert
-     selection)
-:``-a``: All: Select every type of plant (obeys ``-t``/``-s``/``-f``)
-:``-v``: Verbose: Lists the number of (un)designations per plant
-:``-n *``: Number: Designate up to * (an integer number) plants of each species
-
-Specifying both ``-t`` and ``-s`` or ``-f`` will have no effect. If no plant IDs are
-specified, all valid plant IDs will be listed, with ``-t``, ``-s``, and ``-f``
-restricting the list to trees, shrubs, and farmable shrubs, respectively.
+Tags:
+:dfhack-keybind:`getplants`
+
+Designate trees for chopping and shrubs for gathering. Specify the types of
+trees to cut down and/or shrubs to gather by their plant names.
+
+Usage:
+
+``getplants [-t|-s|-f]``
+    List valid tree/shrub ids, optionally restricted to the specified type.
+``getplants <id> [<id> ...] [<options>]``
+    Designate trees/shrubs of the specified types for chopping/gathering.
+
+Examples
+--------
+
+``getplants``
+    List all valid IDs.
+``getplants -f -a``
+    Gather all plants on the map that yield seeds for farming.
+``getplants NETHER_CAP -n 10``
+    Designate 10 nether cap trees for chopping.
+
+Options
+-------
+
+``-t``
+    Tree: Select trees only (exclude shrubs).
+``-s``
+    Shrub: Select shrubs only (exclude trees).
+``-f``
+    Farming: Designate only shrubs that yield seeds for farming.
+``-a``
+    All: Select every type of plant (obeys ``-t``/``-s``/``-f``).
+``-c``
+    Clear: Clear designations instead of setting them.
+``-x``
+    eXcept: Apply selected action to all plants except those specified (invert
+    selection).
+``-v``
+    Verbose: Lists the number of (un)designations per plant.
+``-n <num>``
+    Number: Designate up to the specified number of plants of each species.
 
 .. note::
 
@@ -28,10 +52,3 @@ restricting the list to trees, shrubs, and farmable shrubs, respectively.
     This leads to some shrubs being designated when they shouldn't be, causing a
     plant gatherer to walk there and do nothing (except clearing the
     designation). See :issue:`1479` for details.
-
-    The implementation another known deficiency: it's incapable of detecting that
-    raw definitions that specify a seed extraction reaction for the structural part
-    but has no other use for it cannot actually yield any seeds, as the part is
-    never used (parts of :bug:`6940`, e.g. Red Spinach), even though DF
-    collects it, unless there's a workshop reaction to do it (which there isn't
-    in vanilla).
diff --git a/plugins/getplants.cpp b/plugins/getplants.cpp
index 25823eb17..6819b6191 100644
--- a/plugins/getplants.cpp
+++ b/plugins/getplants.cpp
@@ -584,24 +584,9 @@ command_result df_getplants (color_ostream &out, vector <string> & parameters)
 DFhackCExport command_result plugin_init ( color_ostream &out, vector <PluginCommand> &commands)
 {
     commands.push_back(PluginCommand(
-        "getplants", "Cut down trees or gather shrubs by ID",
-        df_getplants, false,
-        "  Specify the types of trees to cut down and/or shrubs to gather by their\n"
-        "  plant IDs, separated by spaces.\n"
-        "Options:\n"
-        "  -t - Tree: Select trees only (exclude shrubs)\n"
-        "  -s - Shrub: Select shrubs only (exclude trees)\n"
-        "  -f - Farming: Designate only shrubs that yield seeds for farming. Implies -s\n"
-        "  -c - Clear: Clear designations instead of setting them\n"
-        "  -x - eXcept: Apply selected action to all plants except those specified\n"
-        "  -a - All: Select every type of plant (obeys -t/-s/-f)\n"
-        "  -v - Verbose: List the number of (un)designations per plant\n"
-        "  -n * - Number: Designate up to * (an integer number) plants of each species\n"
-        "Specifying both -t and -s or -f will have no effect.\n"
-        "If no plant IDs are specified, and the -a switch isn't given, all valid plant\n"
-        "IDs will be listed with -t, -s, and -f restricting the list to trees, shrubs,\n"
-        "and farmable shrubs, respectively.\n"
-    ));
+        "getplants",
+        "Designate trees for chopping and shrubs for gathering.",
+        df_getplants));
     return CR_OK;
 }
 

From 69d88a62ddd27c54d1a484808a451ed2153ade99 Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Mon, 25 Jul 2022 21:54:34 -0700
Subject: [PATCH 339/854] update docs for hotkeys

---
 docs/plugins/hotkeys.rst | 14 ++++++++++----
 plugins/hotkeys.cpp      |  5 +++--
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/docs/plugins/hotkeys.rst b/docs/plugins/hotkeys.rst
index 57c3b3af5..49064db0a 100644
--- a/docs/plugins/hotkeys.rst
+++ b/docs/plugins/hotkeys.rst
@@ -1,8 +1,14 @@
 hotkeys
 =======
-Opens an in-game screen showing which DFHack keybindings are
-active in the current context.  See also `hotkey-notes`.
+Tags:
+:dfhack-keybind:`hotkeys`
 
-.. image:: ../images/hotkeys.png
+Show all dfhack keybindings in current context. The command opens an in-game
+screen showing which DFHack keybindings are active in the current context.
+See also `hotkey-notes`.
 
-:dfhack-keybind:`hotkeys`
+Usage::
+
+    hotkeys
+
+.. image:: ../images/hotkeys.png
diff --git a/plugins/hotkeys.cpp b/plugins/hotkeys.cpp
index a91c62bdf..84ce37eb8 100644
--- a/plugins/hotkeys.cpp
+++ b/plugins/hotkeys.cpp
@@ -356,8 +356,9 @@ DFhackCExport command_result plugin_init ( color_ostream &out, std::vector <Plug
 
     commands.push_back(
         PluginCommand(
-        "hotkeys", "Show all dfhack keybindings in current context.",
-        hotkeys_cmd, false, ""));
+        "hotkeys",
+        "Show all dfhack keybindings in current context.",
+        hotkeys_cmd));
 
     return CR_OK;
 }

From 06fc84fb399c9d1519c2c7719f67c579c4a6038e Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Mon, 25 Jul 2022 22:00:56 -0700
Subject: [PATCH 340/854] update docs for infiniteSky

---
 docs/plugins/infiniteSky.rst | 18 ++++++++++++------
 plugins/infiniteSky.cpp      | 14 +-------------
 2 files changed, 13 insertions(+), 19 deletions(-)

diff --git a/docs/plugins/infiniteSky.rst b/docs/plugins/infiniteSky.rst
index 328ee83bd..24e206f25 100644
--- a/docs/plugins/infiniteSky.rst
+++ b/docs/plugins/infiniteSky.rst
@@ -1,14 +1,20 @@
 infiniteSky
 ===========
-Automatically allocates new z-levels of sky at the top of the map as you build up,
-or on request allocates many levels all at once.
+Tags:
+:dfhack-keybind:``
+
+Automatically allocates new z-levels of sky at the top of the map as you build
+up, or on request allocates many levels all at once.
 
 Usage:
 
-``infiniteSky n``
-  Raise the sky by n z-levels.
-``infiniteSky enable/disable``
-  Enables/disables monitoring of constructions. If you build anything in the second to highest z-level, it will allocate one more sky level. This is so you can continue to build stairs upward.
+``enable infiniteSky``
+    Enables monitoring of constructions. If you build anything in the second
+    highest z-level, it will allocate one more sky level. You can build stairs
+    up as high as you like!
+``infiniteSky [<n>]``
+    Raise the sky by n z-levels. If run without parameters, raises the sky by
+    one z-level.
 
 .. warning::
 
diff --git a/plugins/infiniteSky.cpp b/plugins/infiniteSky.cpp
index d63eec6b8..bc51f06f1 100644
--- a/plugins/infiniteSky.cpp
+++ b/plugins/infiniteSky.cpp
@@ -33,19 +33,7 @@ DFhackCExport command_result plugin_init ( color_ostream &out, std::vector <Plug
     commands.push_back(PluginCommand(
         "infiniteSky",
         "Creates new sky levels on request, or as needed.",
-        infiniteSky, false,
-        "Usage:\n"
-        "  infiniteSky\n"
-        "    creates one more z-level\n"
-        "  infiniteSky [n]\n"
-        "    creates n more z-level(s)\n"
-        "  infiniteSky enable\n"
-        "    enables monitoring of constructions\n"
-        "  infiniteSky disable\n"
-        "    disable monitoring of constructions\n"
-        "\n"
-        "If construction monitoring is enabled, then the plugin will automatically create new sky z-levels as you construct upward.\n"
-    ));
+        infiniteSky));
     return CR_OK;
 }
 

From 4438134711646a3bb56bed03e99eab60a5f0cfb2 Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Mon, 25 Jul 2022 22:01:28 -0700
Subject: [PATCH 341/854] add missing keybinding for infiniteSky

---
 docs/plugins/infiniteSky.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/plugins/infiniteSky.rst b/docs/plugins/infiniteSky.rst
index 24e206f25..96f141de5 100644
--- a/docs/plugins/infiniteSky.rst
+++ b/docs/plugins/infiniteSky.rst
@@ -1,7 +1,7 @@
 infiniteSky
 ===========
 Tags:
-:dfhack-keybind:``
+:dfhack-keybind:`infiniteSky`
 
 Automatically allocates new z-levels of sky at the top of the map as you build
 up, or on request allocates many levels all at once.

From c88423e65563ed66b06f7f1bc4afc6c2c60f3296 Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Mon, 25 Jul 2022 22:05:32 -0700
Subject: [PATCH 342/854] remove docs for non-enableable, command-less plugin

---
 docs/plugins/isoworldremote.rst | 3 ---
 1 file changed, 3 deletions(-)
 delete mode 100644 docs/plugins/isoworldremote.rst

diff --git a/docs/plugins/isoworldremote.rst b/docs/plugins/isoworldremote.rst
deleted file mode 100644
index 7bacc2b57..000000000
--- a/docs/plugins/isoworldremote.rst
+++ /dev/null
@@ -1,3 +0,0 @@
-isoworldremote
-==============
-A plugin that implements a `remote API <remote>` used by Isoworld.

From 5b0f9ddd4f94e8607ff1987a4dbccd03cc4cf909 Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Tue, 26 Jul 2022 10:24:05 -0700
Subject: [PATCH 343/854] bump the default history size to 5000

100 is just too small, especially since we're not removing duplicate
entries.
---
 library/include/Console.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/library/include/Console.h b/library/include/Console.h
index 0882ba449..f0f56ca85 100644
--- a/library/include/Console.h
+++ b/library/include/Console.h
@@ -44,7 +44,7 @@ namespace  DFHack
     class CommandHistory
     {
     public:
-        CommandHistory(std::size_t capacity = 100)
+        CommandHistory(std::size_t capacity = 5000)
         {
             this->capacity = capacity;
         }

From 0fae25fc8b505bcc49dae7693b054fdcc289ddf3 Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Wed, 27 Jul 2022 00:47:38 -0400
Subject: [PATCH 344/854] Only write (most) generated rst files if they
 actually changed

Speeds up incremental builds significantly
---
 conf.py | 23 +++++++++++++++++++----
 1 file changed, 19 insertions(+), 4 deletions(-)

diff --git a/conf.py b/conf.py
index 814c7c2cb..f13117484 100644
--- a/conf.py
+++ b/conf.py
@@ -14,7 +14,9 @@ serve to show the default.
 
 # pylint:disable=redefined-builtin
 
+import contextlib
 import datetime
+import io
 from io import open
 import os
 import re
@@ -132,13 +134,26 @@ def get_open_mode():
     return 'w' if sys.version_info.major > 2 else 'wb'
 
 
+@contextlib.contextmanager
+def write_file_if_changed(path):
+    with io.StringIO() as buffer:
+        yield buffer
+        new_contents = buffer.getvalue()
+
+    with open(path, 'r') as infile:
+        old_contents = infile.read()
+
+    if old_contents != new_contents:
+        with open(path, get_open_mode()) as outfile:
+            outfile.write(new_contents)
+
+
 def generate_tag_indices():
     os.makedirs('docs/tags', mode=0o755, exist_ok=True)
-    with open('docs/tags/index.rst', get_open_mode()) as topidx:
+    with write_file_if_changed('docs/tags/index.rst') as topidx:
         for tag_tuple in get_tags():
             tag = tag_tuple[0]
-            with open(('docs/tags/{name}.rst').format(name=tag),
-                      get_open_mode()) as tagidx:
+            with write_file_if_changed(('docs/tags/{name}.rst').format(name=tag)) as tagidx:
                 tagidx.write('TODO: add links to the tools that have this tag')
             topidx.write(('.. _tag/{name}:\n\n').format(name=tag))
             topidx.write(('{name}\n').format(name=tag))
@@ -168,7 +183,7 @@ def write_tool_docs():
         # the page in one long wrapped line, similar to how the wiki does it
         os.makedirs(os.path.join('docs/tools', os.path.dirname(k[0])),
                     mode=0o755, exist_ok=True)
-        with open('docs/tools/{}.rst'.format(k[0]), get_open_mode()) as outfile:
+        with write_file_if_changed('docs/tools/{}.rst'.format(k[0])) as outfile:
             outfile.write(header)
             if k[0] != 'search' and k[0] != 'stonesense':
                 outfile.write(label)

From a8b40c5911ad8d028849fab43e5d38999735bb94 Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Wed, 27 Jul 2022 00:48:22 -0400
Subject: [PATCH 345/854] Drop Python 2 compat

---
 conf.py | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/conf.py b/conf.py
index f13117484..3bb73d40d 100644
--- a/conf.py
+++ b/conf.py
@@ -17,7 +17,6 @@ serve to show the default.
 import contextlib
 import datetime
 import io
-from io import open
 import os
 import re
 import shlex  # pylint:disable=unused-import
@@ -130,10 +129,6 @@ def get_tags():
     return tags
 
 
-def get_open_mode():
-    return 'w' if sys.version_info.major > 2 else 'wb'
-
-
 @contextlib.contextmanager
 def write_file_if_changed(path):
     with io.StringIO() as buffer:
@@ -144,7 +139,7 @@ def write_file_if_changed(path):
         old_contents = infile.read()
 
     if old_contents != new_contents:
-        with open(path, get_open_mode()) as outfile:
+        with open(path, 'w') as outfile:
             outfile.write(new_contents)
 
 

From 6293b71e9e3b821a8e43ccb65a4dfe3c4a2be335 Mon Sep 17 00:00:00 2001
From: myk002 <myk.taylor@gmail.com>
Date: Tue, 26 Jul 2022 22:01:39 -0700
Subject: [PATCH 346/854] Revert "remove docs for non-enableable, command-less
 plugin"

This reverts commit c88423e65563ed66b06f7f1bc4afc6c2c60f3296.
---
 docs/plugins/isoworldremote.rst | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 docs/plugins/isoworldremote.rst

diff --git a/docs/plugins/isoworldremote.rst b/docs/plugins/isoworldremote.rst
new file mode 100644
index 000000000..7bacc2b57
--- /dev/null
+++ b/docs/plugins/isoworldremote.rst
@@ -0,0 +1,3 @@
+isoworldremote
+==============
+A plugin that implements a `remote API <remote>` used by Isoworld.

From 671f10e5d835824c3dd78c0a142ee6dbc870e925 Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Wed, 27 Jul 2022 01:04:47 -0400
Subject: [PATCH 347/854] Fix write_file_if_changed() if target file does not
 exist

---
 conf.py | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/conf.py b/conf.py
index 3bb73d40d..fab4b286a 100644
--- a/conf.py
+++ b/conf.py
@@ -135,8 +135,11 @@ def write_file_if_changed(path):
         yield buffer
         new_contents = buffer.getvalue()
 
-    with open(path, 'r') as infile:
-        old_contents = infile.read()
+    try:
+        with open(path, 'r') as infile:
+            old_contents = infile.read()
+    except IOError:
+        old_contents = None
 
     if old_contents != new_contents:
         with open(path, 'w') as outfile:

From 10f8417cc275b6fb597c56a3e1b3563018ca15d9 Mon Sep 17 00:00:00 2001
From: myk002 <myk.taylor@gmail.com>
Date: Tue, 26 Jul 2022 22:22:31 -0700
Subject: [PATCH 348/854] create helpdb entries for all plugins

even those that have no commands and are not enableable
---
 library/LuaApi.cpp     | 16 ----------------
 library/lua/helpdb.lua | 23 ++++++++---------------
 2 files changed, 8 insertions(+), 31 deletions(-)

diff --git a/library/LuaApi.cpp b/library/LuaApi.cpp
index 4ee1a4d1c..d04da21ec 100644
--- a/library/LuaApi.cpp
+++ b/library/LuaApi.cpp
@@ -3164,21 +3164,6 @@ static int internal_getCommandDescription(lua_State *L)
     return 1;
 }
 
-static int internal_isPluginEnableable(lua_State *L)
-{
-    auto plugins = Core::getInstance().getPluginManager();
-
-    const char *name = luaL_checkstring(L, 1);
-
-    auto plugin = plugins->getPluginByName(name);
-    if (plugin)
-        lua_pushboolean(L, plugin->can_be_enabled());
-    else
-        lua_pushnil(L);
-
-    return 1;
-}
-
 static int internal_threadid(lua_State *L)
 {
     std::stringstream ss;
@@ -3255,7 +3240,6 @@ static const luaL_Reg dfhack_internal_funcs[] = {
     { "listCommands", internal_listCommands },
     { "getCommandHelp", internal_getCommandHelp },
     { "getCommandDescription", internal_getCommandDescription },
-    { "isPluginEnableable", internal_isPluginEnableable },
     { "threadid", internal_threadid },
     { "md5File", internal_md5file },
     { NULL, NULL }
diff --git a/library/lua/helpdb.lua b/library/lua/helpdb.lua
index 1bf93f333..2aee005ee 100644
--- a/library/lua/helpdb.lua
+++ b/library/lua/helpdb.lua
@@ -273,13 +273,11 @@ local function update_db(old_db, entry_name, text_entry, help_source, kwargs)
         -- already in db (e.g. from a higher-priority script dir); skip
         return
     end
-    if not kwargs.text_entry_only then
-        entrydb[entry_name] = {
-            entry_types=kwargs.entry_types,
-            short_help=kwargs.short_help,
-            text_entry=text_entry
-        }
-    end
+    entrydb[entry_name] = {
+        entry_types=kwargs.entry_types,
+        short_help=kwargs.short_help,
+        text_entry=text_entry
+    }
     if entry_name ~= text_entry then
         return
     end
@@ -317,7 +315,7 @@ local function scan_plugins(old_db)
     local plugin_names = dfhack.internal.listPlugins()
     for _,plugin in ipairs(plugin_names) do
         local commands = dfhack.internal.listCommands(plugin)
-        local includes_plugin, has_commands = false, false
+        local includes_plugin = false
         for _,command in ipairs(commands) do
             local kwargs = {entry_types={[ENTRY_TYPES.COMMAND]=true}}
             if command == plugin then
@@ -329,18 +327,13 @@ local function scan_plugins(old_db)
                       has_rendered_help(plugin) and
                             HELP_SOURCES.RENDERED or HELP_SOURCES.PLUGIN,
                       kwargs)
-            has_commands = true
         end
-        if includes_plugin then goto continue end
-        local is_enableable = dfhack.internal.isPluginEnableable(plugin)
-        if has_commands or is_enableable then
+        if not includes_plugin then
             update_db(old_db, plugin, plugin,
                       has_rendered_help(plugin) and
                             HELP_SOURCES.RENDERED or HELP_SOURCES.STUB,
-                      {entry_types={[ENTRY_TYPES.PLUGIN]=true},
-                       text_entry_only=not is_enableable})
+                      {entry_types={[ENTRY_TYPES.PLUGIN]=true}})
         end
-        ::continue::
     end
 end
 

From 474dae21c678a91e43c27f2e142b713952024105 Mon Sep 17 00:00:00 2001
From: DFHack-Urist via GitHub Actions
 <63161697+DFHack-Urist@users.noreply.github.com>
Date: Wed, 27 Jul 2022 07:18:22 +0000
Subject: [PATCH 349/854] Auto-update submodules

scripts: master
---
 scripts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts b/scripts
index 78b7554a1..b9d49dfc3 160000
--- a/scripts
+++ b/scripts
@@ -1 +1 @@
-Subproject commit 78b7554a17d7d385986b2f801d5791485e740afb
+Subproject commit b9d49dfc36dae9b8b1bf91c2a8e8179ca554abdc

From e677e8098d8c7a353ca5af2c8e3614268fd214cc Mon Sep 17 00:00:00 2001
From: myk002 <myk.taylor@gmail.com>
Date: Wed, 27 Jul 2022 15:48:11 -0700
Subject: [PATCH 350/854] add docs for plugins that only provide Lua apis

---
 docs/Lua API.rst                | 14 +++++++-------
 docs/plugins/building-hacks.rst |  6 ++++++
 docs/plugins/cxxrandom.rst      |  6 ++++++
 docs/plugins/eventful.rst       |  6 ++++++
 docs/plugins/luasocket.rst      |  6 ++++++
 docs/plugins/map-render.rst     |  6 ++++++
 docs/plugins/pathable.rst       |  6 ++++++
 docs/plugins/xlsxreader.rst     |  6 ++++++
 8 files changed, 49 insertions(+), 7 deletions(-)
 create mode 100644 docs/plugins/building-hacks.rst
 create mode 100644 docs/plugins/cxxrandom.rst
 create mode 100644 docs/plugins/eventful.rst
 create mode 100644 docs/plugins/luasocket.rst
 create mode 100644 docs/plugins/map-render.rst
 create mode 100644 docs/plugins/pathable.rst
 create mode 100644 docs/plugins/xlsxreader.rst

diff --git a/docs/Lua API.rst b/docs/Lua API.rst
index 107a0ba2e..94eaa1165 100644
--- a/docs/Lua API.rst	
+++ b/docs/Lua API.rst	
@@ -4287,7 +4287,7 @@ blueprint files:
 The names of the functions are also available as the keys of the
 ``valid_phases`` table.
 
-.. _building-hacks:
+.. _building-hacks-api:
 
 building-hacks
 ==============
@@ -4426,7 +4426,7 @@ Native functions:
 
 The lua module file also re-exports functions from ``dfhack.burrows``.
 
-.. _cxxrandom:
+.. _cxxrandom-api:
 
 cxxrandom
 =========
@@ -4596,7 +4596,7 @@ The dig-now plugin exposes the following functions to Lua:
     command ``dig-now <pos> <pos>``. See the `dig-now` documentation for details
     on default settings.
 
-.. _eventful:
+.. _eventful-api:
 
 eventful
 ========
@@ -4764,7 +4764,7 @@ Integrated tannery::
   b=require "plugins.eventful"
   b.addReactionToShop("TAN_A_HIDE","LEATHERWORKS")
 
-.. _luasocket:
+.. _luasocket-api:
 
 luasocket
 =========
@@ -4835,7 +4835,7 @@ A class with all the tcp functionality.
   Tries connecting to that address and port. Returns ``client`` object.
 
 
-.. _map-render:
+.. _map-render-api:
 
 map-render
 ==========
@@ -4851,7 +4851,7 @@ Functions
 
   returns a table with w*h*4 entries of rendered tiles. The format is same as ``df.global.gps.screen`` (tile,foreground,bright,background).
 
-.. _pathable:
+.. _pathable-api:
 
 pathable
 ========
@@ -4885,7 +4885,7 @@ sort
 The `sort <sort>` plugin does not export any native functions as of now.
 Instead, it calls Lua code to perform the actual ordering of list items.
 
-.. _xlsxreader:
+.. _xlsxreader-api:
 
 xlsxreader
 ==========
diff --git a/docs/plugins/building-hacks.rst b/docs/plugins/building-hacks.rst
new file mode 100644
index 000000000..106173c47
--- /dev/null
+++ b/docs/plugins/building-hacks.rst
@@ -0,0 +1,6 @@
+building-hacks
+==============
+
+Provides a Lua API for creating powered workshops.
+
+See `building-hacks-api` for more details.
diff --git a/docs/plugins/cxxrandom.rst b/docs/plugins/cxxrandom.rst
new file mode 100644
index 000000000..f3ed8f86d
--- /dev/null
+++ b/docs/plugins/cxxrandom.rst
@@ -0,0 +1,6 @@
+cxxrandom
+=========
+
+Provides a Lua API for random distributions.
+
+See `cxxrandom-api` for details.
diff --git a/docs/plugins/eventful.rst b/docs/plugins/eventful.rst
new file mode 100644
index 000000000..892f233bb
--- /dev/null
+++ b/docs/plugins/eventful.rst
@@ -0,0 +1,6 @@
+eventful
+========
+
+Provides a Lua API for reacting to in-game events.
+
+See `eventful-api` for details.
diff --git a/docs/plugins/luasocket.rst b/docs/plugins/luasocket.rst
new file mode 100644
index 000000000..6f7c96cae
--- /dev/null
+++ b/docs/plugins/luasocket.rst
@@ -0,0 +1,6 @@
+luasocket
+=========
+
+Provides a Lua API for accessing network sockets.
+
+See `luasocket-api` for details.
diff --git a/docs/plugins/map-render.rst b/docs/plugins/map-render.rst
new file mode 100644
index 000000000..2bcb32adf
--- /dev/null
+++ b/docs/plugins/map-render.rst
@@ -0,0 +1,6 @@
+map-render
+==========
+
+Provides a Lua API for rerendering portions of the map.
+
+See `map-render-api` for details.
diff --git a/docs/plugins/pathable.rst b/docs/plugins/pathable.rst
new file mode 100644
index 000000000..daf7697bc
--- /dev/null
+++ b/docs/plugins/pathable.rst
@@ -0,0 +1,6 @@
+pathable
+========
+
+Provides a Lua API for marking tiles that are reachable from the cursor.
+
+See `pathable-api` for details.
diff --git a/docs/plugins/xlsxreader.rst b/docs/plugins/xlsxreader.rst
new file mode 100644
index 000000000..6429ceedc
--- /dev/null
+++ b/docs/plugins/xlsxreader.rst
@@ -0,0 +1,6 @@
+xlsxreader
+==========
+
+Provides a Lua API for reading .xlsx files.
+
+See `xlsxreader-api` for details.

From 117efaa8147fc3b22fbf94a7562ecb0ecc5213f8 Mon Sep 17 00:00:00 2001
From: myk002 <myk.taylor@gmail.com>
Date: Wed, 27 Jul 2022 15:48:44 -0700
Subject: [PATCH 351/854] update short description for command-prompt

---
 plugins/command-prompt.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/command-prompt.cpp b/plugins/command-prompt.cpp
index 1994d66b5..94398837a 100644
--- a/plugins/command-prompt.cpp
+++ b/plugins/command-prompt.cpp
@@ -345,7 +345,7 @@ DFhackCExport command_result plugin_init(color_ostream &out, std::vector <Plugin
 {
     commands.push_back(PluginCommand(
                 "command-prompt",
-                "An in-game DFHack terminal.",
+                "Allows you to run a DFHack command from in-game.",
                 show_prompt,
                 hotkey_allow_all));
     return CR_OK;

From 2008fd395567ab3347f356e7305a9de4a11af161 Mon Sep 17 00:00:00 2001
From: myk002 <myk.taylor@gmail.com>
Date: Wed, 27 Jul 2022 16:03:49 -0700
Subject: [PATCH 352/854] update docs for jobutils.

I was unable to find an example usage for `job item-type`. I couldn't
find any combination of jobs or parameters that worked.
---
 docs/plugins/jobutils.rst | 71 +++++++++++++++++++++------------------
 plugins/jobutils.cpp      | 42 ++++++-----------------
 2 files changed, 49 insertions(+), 64 deletions(-)

diff --git a/docs/plugins/jobutils.rst b/docs/plugins/jobutils.rst
index 230c69f4c..8863c7a9b 100644
--- a/docs/plugins/jobutils.rst
+++ b/docs/plugins/jobutils.rst
@@ -1,40 +1,45 @@
 .. _job:
 
-job
-===
-Command for general job query and manipulation.
+jobutils
+========
+Tags:
+:dfhack-keybind:`job`
+:dfhack-keybind:`job-duplicate`
+:dfhack-keybind:`job-material`
 
-Options:
+Usage:
 
-*no extra options*
-    Print details of the current job. The job can be selected
-    in a workshop, or the unit/jobs screen.
-**list**
+``job``
+    Print details of the current job. The job can be selected in a workshop or
+    the unit/jobs screen.
+``job list``
     Print details of all jobs in the selected workshop.
-**item-material <item-idx> <material[:subtoken]>**
+``job item-material <item-idx> <material[:subtoken]>``
     Replace the exact material id in the job item.
-**item-type <item-idx> <type[:subtype]>**
+``job item-type <item-idx> <type[:subtype]>``
     Replace the exact item type id in the job item.
-
-job-duplicate
-=============
-In :kbd:`q` mode, when a job is highlighted within a workshop or furnace
-building, calling ``job-duplicate`` instantly duplicates the job.
-
-:dfhack-keybind:`job-duplicate`
-
-job-material
-============
-Alter the material of the selected job.  Similar to ``job item-material ...``
-
-Invoked as::
-
-    job-material <inorganic-token>
-
-:dfhack-keybind:`job-material`
-
-* In :kbd:`q` mode, when a job is highlighted within a workshop or furnace,
-  changes the material of the job. Only inorganic materials can be used
-  in this mode.
-* In :kbd:`b` mode, during selection of building components positions the cursor
-  over the first available choice with the matching material.
+``job-duplicate``
+    Duplicates the highlighted job. Must be in :kbd:`q` mode and have a workshop
+    or furnace building selected.
+``job-material <inorganic-token>``
+    Alters the material of the selected job (in :kbd:`q` mode) or jumps to the
+    selected material when choosing the building component of a planned building
+    (in :kbd:`b` mode). Note that this form of the command can only handle
+    inorganic materials.
+
+Use the ``job`` and ``job list`` commands to discover the type and material ids
+for existing jobs, or use the following commands to see the full lists::
+
+    lua @df.item_type
+    lua "for i,mat in ipairs(df.global.world.raws.inorganics) do if mat.material.flags.IS_STONE and not mat.material.flags.NO_STONE_STOCKPILE then print(i, mat.id) end end"
+
+Examples
+--------
+
+``job-material GNEISS``
+    Change the selected "Construct rock Coffin" job at a Mason's workshop to
+    "Construct gneiss coffin".
+``job item-material 2 MARBLE``
+    Change the selected "Construct Traction Bench" job (which has three source
+    items: a table, a mechanism, and a chain) to specifically use a marble
+    mechanism.
diff --git a/plugins/jobutils.cpp b/plugins/jobutils.cpp
index 0607b50c5..5f5994435 100644
--- a/plugins/jobutils.cpp
+++ b/plugins/jobutils.cpp
@@ -53,46 +53,26 @@ DFhackCExport command_result plugin_init (color_ostream &out, std::vector <Plugi
 
     commands.push_back(
         PluginCommand(
-            "job", "General job query and manipulation.",
-            job_cmd, false,
-            "  job [query]\n"
-            "    Print details of the current job. The job can be\n"
-            "    selected in a workshop, or the unit/jobs screen.\n"
-            "  job list\n"
-            "    Print details of all jobs in the selected workshop.\n"
-            "  job item-material <item-idx> <material[:subtoken]>\n"
-            "    Replace the exact material id in the job item.\n"
-            "  job item-type <item-idx> <type[:subtype]>\n"
-            "    Replace the exact item type id in the job item.\n"
-        )
-    );
+            "job",
+            "Inspect and modify job item properties.",
+            job_cmd));
 
     if (ui_workshop_job_cursor || ui_build_selector) {
         commands.push_back(
             PluginCommand(
-                "job-material", "Alter the material of the selected job.",
-                job_material, job_material_hotkey,
-                "  job-material <inorganic-token>\n"
-                "Intended to be used as a keybinding:\n"
-                "  - In 'q' mode, when a job is highlighted within a workshop\n"
-                "    or furnace, changes the material of the job. Only inorganic\n"
-                "    materials can be used in this mode.\n"
-                "  - In 'b' mode, during selection of building components\n"
-                "    positions the cursor over the first available choice\n"
-                "    with the matching material.\n"
-            )
-        );
+                "job-material",
+                "Alter the material of the selected job or building.",
+                job_material,
+                job_material_hotkey));
     }
 
     if (ui_workshop_job_cursor && job_next_id) {
         commands.push_back(
             PluginCommand(
-                "job-duplicate", "Duplicate the selected job in a workshop.",
-                job_duplicate, Gui::workshop_job_hotkey,
-                "  - In 'q' mode, when a job is highlighted within a workshop\n"
-                "    or furnace building, instantly duplicates the job.\n"
-            )
-        );
+                "job-duplicate",
+                "Duplicate the selected job in a workshop.",
+                job_duplicate,
+                Gui::workshop_job_hotkey));
     }
 
     return CR_OK;

From 382ad84125195b70ed86500fb3fd99bfbd707dce Mon Sep 17 00:00:00 2001
From: myk002 <myk.taylor@gmail.com>
Date: Wed, 27 Jul 2022 16:14:24 -0700
Subject: [PATCH 353/854] add example for job item-type

---
 docs/plugins/jobutils.rst | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/docs/plugins/jobutils.rst b/docs/plugins/jobutils.rst
index 8863c7a9b..e8434abdc 100644
--- a/docs/plugins/jobutils.rst
+++ b/docs/plugins/jobutils.rst
@@ -43,3 +43,7 @@ Examples
     Change the selected "Construct Traction Bench" job (which has three source
     items: a table, a mechanism, and a chain) to specifically use a marble
     mechanism.
+``job item-type 2 TABLE``
+    Change the selected "Encrust furniture with blue jade" job (which has two
+    source items: a cut gem and a piece of improvable furniture) to specifically
+    use a table instead of just any furniture.

From ed113466d92e298a8d53a70c47dbfa3e645f5cc0 Mon Sep 17 00:00:00 2001
From: myk002 <myk.taylor@gmail.com>
Date: Wed, 27 Jul 2022 16:29:54 -0700
Subject: [PATCH 354/854] update docs for isoworldremote

---
 docs/plugins/isoworldremote.rst | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/docs/plugins/isoworldremote.rst b/docs/plugins/isoworldremote.rst
index 7bacc2b57..2c359fac2 100644
--- a/docs/plugins/isoworldremote.rst
+++ b/docs/plugins/isoworldremote.rst
@@ -1,3 +1,5 @@
 isoworldremote
 ==============
-A plugin that implements a `remote API <remote>` used by Isoworld.
+Tags:
+
+Provides a `remote API <remote>` used by Isoworld.

From a053cce444893c94f84269350f71766d268e0991 Mon Sep 17 00:00:00 2001
From: myk002 <myk.taylor@gmail.com>
Date: Wed, 27 Jul 2022 16:30:14 -0700
Subject: [PATCH 355/854] update the "requires interactive terminal" message

to make it more user friendly
---
 library/Core.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/library/Core.cpp b/library/Core.cpp
index facd02823..1b3f1409f 100644
--- a/library/Core.cpp
+++ b/library/Core.cpp
@@ -1235,7 +1235,8 @@ command_result Core::runCommand(color_ostream &con, const std::string &first_, v
             }
         }
         else if (res == CR_NEEDS_CONSOLE)
-            con.printerr("%s needs interactive console to work.\n", first.c_str());
+            con.printerr("%s needs an interactive console to work.\n"
+                          "Please run this command from the DFHack terminal.\n", first.c_str());
         return res;
     }
 

From 58c0f94a2d4f445370016f58d5932724b9f8f908 Mon Sep 17 00:00:00 2001
From: myk002 <myk.taylor@gmail.com>
Date: Wed, 27 Jul 2022 17:14:00 -0700
Subject: [PATCH 356/854] order autolabor docs similarly to labormanager

---
 docs/plugins/autolabor.rst | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/docs/plugins/autolabor.rst b/docs/plugins/autolabor.rst
index ca249ee19..dc14a40bb 100644
--- a/docs/plugins/autolabor.rst
+++ b/docs/plugins/autolabor.rst
@@ -70,6 +70,11 @@ Examples
 Advanced usage
 --------------
 
+``autolabor list``
+    List current status of all labors. Use this command to see the IDs for all
+    labors.
+``autolabor status``
+    Show basic status information.
 ``autolabor <labor> <minimum> [<maximum>] [<talent pool>]``
     Set range of dwarves assigned to a labor, optionally specifying the size of
     the pool of most skilled dwarves that will ever be considered for this
@@ -80,9 +85,5 @@ Advanced usage
     Turn off autolabor for a specific labor.
 ``autolabor reset-all|<labor> reset``
     Return a labor (or all labors) to the default handling.
-``autolabor list``
-    List current status of all labors.
-``autolabor status``
-    Show basic status information.
 
 See `autolabor-artisans` for a differently-tuned setup.

From e94f1891c26d457f37ce98e13e2f4fe79eb03d6c Mon Sep 17 00:00:00 2001
From: myk002 <myk.taylor@gmail.com>
Date: Wed, 27 Jul 2022 17:14:18 -0700
Subject: [PATCH 357/854] update docs for labormanager

---
 docs/plugins/labormanager.rst         | 216 ++++++++++++++------------
 plugins/labormanager/labormanager.cpp |  35 +----
 2 files changed, 122 insertions(+), 129 deletions(-)

diff --git a/docs/plugins/labormanager.rst b/docs/plugins/labormanager.rst
index d16a10e33..103ecde2f 100644
--- a/docs/plugins/labormanager.rst
+++ b/docs/plugins/labormanager.rst
@@ -1,105 +1,127 @@
 labormanager
 ============
-Automatically manage dwarf labors to efficiently complete jobs.
-Labormanager is derived from autolabor (above) but uses a completely
-different approach to assigning jobs to dwarves. While autolabor tries
-to keep as many dwarves busy as possible, labormanager instead strives
-to get jobs done as quickly as possible.
+Tags:
+:dfhack-keybind:`labormanager`
 
-Labormanager frequently scans the current job list, current list of
-dwarfs, and the map to determine how many dwarves need to be assigned to
-what labors in order to meet all current labor needs without starving
-any particular type of job.
+Automatically manage dwarf labors. Labormanager is derived from `autolabor`
+but uses a completely different approach to assigning jobs to dwarves. While
+autolabor tries to keep as many dwarves busy as possible, labormanager instead
+strives to get jobs done as quickly as possible.
+
+Labormanager frequently scans the current job list, current list of dwarves, and
+the map to determine how many dwarves need to be assigned to what labors in
+order to meet all current labor needs without starving any particular type of
+job.
+
+Dwarves on active military duty or dwarves assigned to burrows are left
+untouched.
 
 .. warning::
 
-    *As with autolabor, labormanager will override any manual changes you
-    make to labors while it is enabled, including through other tools such
-    as Dwarf Therapist*
-
-Simple usage:
-
-:enable labormanager: Enables the plugin with default settings.
-    (Persistent per fortress)
-
-:disable labormanager: Disables the plugin.
-
-Anything beyond this is optional - labormanager works fairly well on the
-default settings.
-
-The default priorities for each labor vary (some labors are higher
-priority by default than others). The way the plugin works is that, once
-it determines how many of each labor is needed, it then sorts them by
-adjusted priority. (Labors other than hauling have a bias added to them
-based on how long it's been since they were last used, to prevent job
-starvation.) The labor with the highest priority is selected, the "best
-fit" dwarf for that labor is assigned to that labor, and then its
-priority is *halved*. This process is repeated until either dwarfs or
-labors run out.
-
-Because there is no easy way to detect how many haulers are actually
-needed at any moment, the plugin always ensures that at least one dwarf
-is assigned to each of the hauling labors, even if no hauling jobs are
-detected. At least one dwarf is always assigned to construction removing
-and cleaning because these jobs also cannot be easily detected. Lever
-pulling is always assigned to everyone. Any dwarfs for which there are
-no jobs will be assigned hauling, lever pulling, and cleaning labors. If
-you use animal trainers, note that labormanager will misbehave if you
-assign specific trainers to specific animals; results are only guaranteed
-if you use "any trainer", and animal trainers will probably be
-overallocated in any case.
-
-Labormanager also sometimes assigns extra labors to currently busy
-dwarfs so that when they finish their current job, they will go off and
-do something useful instead of standing around waiting for a job.
-
-There is special handling to ensure that at least one dwarf is assigned
-to haul food whenever food is detected left in a place where it will rot
-if not stored. This will cause a dwarf to go idle if you have no
-storepiles to haul food to.
-
-Dwarfs who are unable to work (child, in the military, wounded,
-handless, asleep, in a meeting) are entirely excluded from labor
-assignment. Any dwarf explicitly assigned to a burrow will also be
-completely ignored by labormanager.
-
-The fitness algorithm for assigning jobs to dwarfs generally attempts to
-favor dwarfs who are more skilled over those who are less skilled. It
-also tries to avoid assigning female dwarfs with children to jobs that
-are "outside", favors assigning "outside" jobs to dwarfs who are
-carrying a tool that could be used as a weapon, and tries to minimize
-how often dwarfs have to reequip.
-
-Labormanager automatically determines medical needs and reserves health
-care providers as needed. Note that this may cause idling if you have
-injured dwarfs but no or inadequate hospital facilities.
-
-Hunting is never assigned without a butchery, and fishing is never
-assigned without a fishery, and neither of these labors is assigned
-unless specifically enabled.
+    As with autolabor, labormanager will override any manual changes you make to
+    labors while it is enabled, including through other tools such as Dwarf
+    Therapist. Do not run both autolabor and labormanager at the same time!
+
+Usage::
+
+    enable labormanager
+
+Anything beyond this is optional - labormanager works well with the default
+settings. Once you have enabled it in a fortress, it stays enabled until you
+explicitly disable it, even if you save and reload your game.
+
+The default priorities for each labor vary (some labors are higher priority by
+default than others). The way the plugin works is that, once it determines how
+many jobs of each labor is needed, it then sorts them by adjusted priority.
+(Labors other than hauling have a bias added to them based on how long it's been
+since they were last used to prevent job starvation.) The labor with the highest
+priority is selected, the "best fit" dwarf for that labor is assigned to that
+labor, and then its priority is *halved*. This process is repeated until either
+dwarves or labors run out.
+
+Because there is no easy way to detect how many haulers are actually needed at
+any moment, the plugin always ensures that at least one dwarf is assigned to
+each of the hauling labors, even if no hauling jobs are detected. At least one
+dwarf is always assigned to construction removing and cleaning because these
+jobs also cannot be easily detected. Lever pulling is always assigned to
+everyone. Any dwarves for which there are no jobs will be assigned hauling,
+lever pulling, and cleaning labors. If you use animal trainers, note that
+labormanager will misbehave if you assign specific trainers to specific animals;
+results are only guaranteed if you use "any trainer".
+
+Labormanager also sometimes assigns extra labors to currently busy dwarfs so
+that when they finish their current job, they will go off and do something
+useful instead of standing around waiting for a job.
+
+There is special handling to ensure that at least one dwarf is assigned to haul
+food whenever food is detected left in a place where it will rot if not stored.
+This will cause a dwarf to go idle if you have no stockpiles to haul food to.
+
+Dwarves who are unable to work (child, in the military, wounded, handless,
+asleep, in a meeting) are entirely excluded from labor assignment. Any dwarf
+explicitly assigned to a burrow will also be completely ignored by labormanager.
+
+The fitness algorithm for assigning jobs to dwarves generally attempts to favor
+dwarves who are more skilled over those who are less skilled. It also tries to
+avoid assigning female dwarfs with children to jobs that are "outside", favors
+assigning "outside" jobs to dwarfs who are carrying a tool that could be used as
+a weapon, and tries to minimize how often dwarves have to reequip.
+
+Labormanager automatically determines medical needs and reserves health care
+providers as needed. Note that this may cause idling if you have injured dwarves
+but no or inadequate hospital facilities.
+
+Hunting is never assigned without a butchery, and fishing is never assigned
+without a fishery, and neither of these labors is assigned unless specifically
+enabled (see below).
 
 The method by which labormanager determines what labor is needed for a
-particular job is complicated and, in places, incomplete. In some
-situations, labormanager will detect that it cannot determine what labor
-is required. It will, by default, pause and print an error message on
-the dfhack console, followed by the message "LABORMANAGER: Game paused
-so you can investigate the above message.". If this happens, please open
-an issue on github, reporting the lines that immediately preceded this
-message. You can tell labormanager to ignore this error and carry on by
-typing ``labormanager pause-on-error no``, but be warned that some job may go
-undone in this situation.
-
-Advanced usage:
-
-:labormanager enable:                      Turn plugin on.
-:labormanager disable:                     Turn plugin off.
-:labormanager priority <labor> <value>:    Set the priority value (see above) for labor <labor> to <value>.
-:labormanager reset <labor>:               Reset the priority value of labor <labor> to its default.
-:labormanager reset-all:                   Reset all priority values to their defaults.
-:labormanager allow-fishing:               Allow dwarfs to fish. *Warning* This tends to result in most of the fort going fishing.
-:labormanager forbid-fishing:              Forbid dwarfs from fishing. Default behavior.
-:labormanager allow-hunting:               Allow dwarfs to hunt. *Warning* This tends to result in as many dwarfs going hunting as you have crossbows.
-:labormanager forbid-hunting:              Forbid dwarfs from hunting. Default behavior.
-:labormanager list:                        Show current priorities and current allocation stats.
-:labormanager pause-on-error yes:          Make labormanager pause if the labor inference engine fails. See above.
-:labormanager pause-on-error no:           Allow labormanager to continue past a labor inference engine failure.
+particular job is complicated and, in places, incomplete. In some situations,
+labormanager will detect that it cannot determine what labor is required. It
+will, by default, pause and print an error message on the dfhack console,
+followed by the message "LABORMANAGER: Game paused so you can investigate the
+above message.". If this happens, please open an :issue:`<issue>` on GitHub,
+reporting the lines that immediately preceded this message. You can tell
+labormanager to ignore this error and carry on by running
+``labormanager pause-on-error no``, but be warned that some job may go undone in
+this situation.
+
+Examples
+--------
+
+``labormanager priority BREWER 500``
+    Boost the priority of brewing jobs.
+``labormanager max FISH 1``
+    Only assign fishing to one dwarf at a time. Note that you also have to run
+    ``labormanager allow-fishing`` for any dwarves to be assigned fishing at
+    all.
+
+Advanced usage
+--------------
+
+``labormanager list``
+    Show current priorities and current allocation stats. Use this command to
+    see the IDs for all labors.
+``labormanager status``
+    Show basic status information.
+``labormanager priority <labor> <value>``
+    Set the priority value for labor <labor> to <value>.
+``labormanager max <labor> <value>``
+    Set maximum number of dwarves that can be assigned to a labor.
+``labormanager max <labor> none``
+    Unrestrict the number of dwarves that can be assigned to a labor.
+``labormanager max <labor> disable``
+    Don't manage the specified labor. Dwarves who you have manually enabled this
+    labor on will be less likely to have managed labors assigned to them.
+``labormanager reset-all|reset <labor>``
+    Return a labor (or all labors) to the default priority.
+``labormanager allow-fishing|forbid-fishing``
+    Allow/disallow fisherdwarves. *Warning* Allowing fishing tends to result in
+    most of the fort going fishing. Fishing is forbidden by default.
+``labormanager allow-hunting|forbid-hunting``
+    Allow/disallow hunterdwarves. *Warning* Allowing hunting tends to result in
+    as many dwarves going hunting as you have crossbows. Hunting is forbidden by
+    default.
+``labormanager pause-on-error yes|no``
+    Make labormanager pause/continue if the labor inference engine fails. See
+    the above section for details.
diff --git a/plugins/labormanager/labormanager.cpp b/plugins/labormanager/labormanager.cpp
index 02569fd8b..f508c9797 100644
--- a/plugins/labormanager/labormanager.cpp
+++ b/plugins/labormanager/labormanager.cpp
@@ -845,38 +845,9 @@ DFhackCExport command_result plugin_init(color_ostream &out, std::vector <Plugin
 
     // Fill the command list with your commands.
     commands.push_back(PluginCommand(
-        "labormanager", "Automatically manage dwarf labors.",
-        labormanager, false, /* true means that the command can't be used from non-interactive user interface */
-        // Extended help string. Used by CR_WRONG_USAGE and the help command:
-        "  labormanager enable\n"
-        "  labormanager disable\n"
-        "    Enables or disables the plugin.\n"
-        "  labormanager max <labor> <maximum>\n"
-        "    Set max number of dwarves assigned to a labor.\n"
-        "  labormanager max <labor> unmanaged\n"
-        "  labormanager max <labor> disable\n"
-        "    Don't attempt to manage this labor.\n"
-        "    Any dwarves with unmanaged labors assigned will be less\n"
-        "    likely to have managed labors assigned to them.\n"
-        "  labormanager max <labor> none\n"
-        "    Unrestrict the number of dwarves assigned to a labor.\n"
-        "  labormanager priority <labor> <priority>\n"
-        "    Change the assignment priority of a labor (default is 100)\n"
-        "  labormanager reset <labor>\n"
-        "    Return a labor to the default handling.\n"
-        "  labormanager reset-all\n"
-        "    Return all labors to the default handling.\n"
-        "  labormanager list\n"
-        "    List current status of all labors.\n"
-        "  labormanager status\n"
-        "    Show basic status information.\n"
-        "Function:\n"
-        "  When enabled, labormanager periodically checks your dwarves and enables or\n"
-        "  disables labors.  Generally, each dwarf will be assigned exactly one labor.\n"
-        "  Warning: labormanager will override any manual changes you make to labors\n"
-        "  while it is enabled, except where the labor is marked as unmanaged.\n"
-        "  Do not try to run both autolabor and labormanager at the same time.\n"
-    ));
+        "labormanager",
+        "Automatically manage dwarf labors.",
+        labormanager));
 
     generate_labor_to_skill_map();
 

From 52a0b0f2ca8758dc792e5402f0393f75d8e4b9c7 Mon Sep 17 00:00:00 2001
From: myk002 <myk.taylor@gmail.com>
Date: Wed, 27 Jul 2022 17:14:30 -0700
Subject: [PATCH 358/854] update docs for lair

---
 docs/plugins/lair.rst | 19 ++++++++++++-------
 plugins/lair.cpp      |  6 ++++--
 2 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/docs/plugins/lair.rst b/docs/plugins/lair.rst
index b80e71e3a..b4a7ed524 100644
--- a/docs/plugins/lair.rst
+++ b/docs/plugins/lair.rst
@@ -1,12 +1,17 @@
 lair
 ====
-This command allows you to mark the map as a monster lair, preventing item
-scatter on abandon. When invoked as ``lair reset``, it does the opposite.
+Tags:
+:dfhack-keybind:`lair`
 
-Unlike `reveal`, this command doesn't save the information about tiles - you
-won't be able to restore state of real monster lairs using ``lair reset``.
+Mark the map as a monster lair. This avoids item scatter when the fortress is
+abandoned.
 
-Options:
+Usage:
 
-:lair:          Mark the map as monster lair
-:lair reset:    Mark the map as ordinary (not lair)
+``lair``
+    Mark the map as monster lair.
+``lair reset``
+    Mark the map as ordinary (not lair).
+
+This command doesn't save the information about tiles - you won't be able to
+restore the state of a real monster lairs using ``lair reset``.
diff --git a/plugins/lair.cpp b/plugins/lair.cpp
index 6fb167988..7c3b1953f 100644
--- a/plugins/lair.cpp
+++ b/plugins/lair.cpp
@@ -61,7 +61,9 @@ command_result lair(color_ostream &out, std::vector<std::string> & params)
 
 DFhackCExport command_result plugin_init ( color_ostream &out, std::vector <PluginCommand> &commands)
 {
-    commands.push_back(PluginCommand("lair","Mark the map as a monster lair (avoids item scatter)",lair, false,
-        "Usage: 'lair' to mark entire map as monster lair, 'lair reset' to undo the operation.\n"));
+    commands.push_back(PluginCommand(
+        "lair",
+        "Mark the map as a monster lair to avoid item scatter.",
+        lair));
     return CR_OK;
 }

From ddae1aa90050a2917f6af008ad19470d324461cc Mon Sep 17 00:00:00 2001
From: myk002 <myk.taylor@gmail.com>
Date: Wed, 27 Jul 2022 17:14:40 -0700
Subject: [PATCH 359/854] update docs for liquids

---
 docs/plugins/liquids.rst | 51 ++++++++++++++++++++++------------------
 plugins/liquids.cpp      | 18 +++++++-------
 2 files changed, 36 insertions(+), 33 deletions(-)

diff --git a/docs/plugins/liquids.rst b/docs/plugins/liquids.rst
index 75e41da5b..61e4bcfe2 100644
--- a/docs/plugins/liquids.rst
+++ b/docs/plugins/liquids.rst
@@ -2,30 +2,42 @@
 
 liquids
 =======
-Allows adding magma, water and obsidian to the game. It replaces the normal
-dfhack command line and can't be used from a hotkey. Settings will be remembered
-as long as dfhack runs. Intended for use in combination with the command
-``liquids-here`` (which can be bound to a hotkey).  See also :issue:`80`.
+Tags:
+:dfhack-keybind:`liquids`
+:dfhack-keybind:`liquids-here`
 
-.. warning::
+Place magma, water or obsidian.  See `gui/liquids` for an in-game interface for
+this functionality.
+
+Also, if you only want to add or remove water or magma from a single tile, the
+`source` script may be easier to use.
+
+Usage:
 
-    Spawning and deleting liquids can mess up pathing data and
-    temperatures (creating heat traps). You've been warned.
+``liquids``
+    Start the interactive terminal settings interpreter. This command must be
+    called from the DFHack terminal and not from any in-game interface.
+``liquids-here``
+    Run the liquid spawner with the current/last settings made in ``liquids``
+    (if no settings in ``liquids`` were made, then it paints a point of 7/7
+    magma by default). This command is intended to be used as keybinding, and it
+    requires an active in-game cursor.
 
-.. note::
+.. warning::
 
-    `gui/liquids` is an in-game UI for this script.
+    Spawning and deleting liquids can mess up pathing data and temperatures
+    (creating heat traps). You've been warned.
 
-Settings will be remembered until you quit DF. You can call `liquids-here` to execute
-the last configured action, which is useful in combination with keybindings.
+Interactive interpreter
+-----------------------
 
-Usage: point the DF cursor at a tile you want to modify and use the commands.
+The interpreter replaces the normal dfhack command line and can't be used from a
+hotkey. Settings will be remembered as long as dfhack runs. It is intended for
+use in combination with the command ``liquids-here`` (which *can* be bound to a
+hotkey).
 
-If you only want to add or remove water or magma from one tile,
-`source` may be easier to use.
+You can enter the following commands at the prompt.
 
-Commands
---------
 Misc commands:
 
 :q:                 quit
@@ -65,10 +77,3 @@ Brush size and shape:
 :block:         DF map block with cursor in it (regular spaced 16x16x1 blocks)
 :column:        Column from cursor, up through free space
 :flood:         Flood-fill water tiles from cursor (only makes sense with wclean)
-
-liquids-here
-------------
-Run the liquid spawner with the current/last settings made in liquids (if no
-settings in liquids were made it paints a point of 7/7 magma by default).
-
-Intended to be used as keybinding. Requires an active in-game cursor.
diff --git a/plugins/liquids.cpp b/plugins/liquids.cpp
index 76c098c8a..980deb747 100644
--- a/plugins/liquids.cpp
+++ b/plugins/liquids.cpp
@@ -65,17 +65,15 @@ DFhackCExport command_result plugin_init ( color_ostream &out, std::vector <Plug
 {
     liquids_hist.load(HISTORY_FILE);
     commands.push_back(PluginCommand(
-        "liquids", "Place magma, water or obsidian.",
-        df_liquids, true,
-        "This tool allows placing magma, water and other similar things.\n"
-        "It is interactive and further help is available when you run it.\n"
-        "The settings will be remembered until dfhack is closed and you can call\n"
-        "'liquids-here' (mapped to a hotkey) to paint liquids at the cursor position\n"
-        "without the need to go back to the dfhack console.\n")); // interactive, needs console for prompt
+        "liquids",
+        "Place magma, water or obsidian.",
+        df_liquids,
+        true)); // interactive, needs console for prompt
     commands.push_back(PluginCommand(
-        "liquids-here", "Use settings from liquids at cursor position.",
-        df_liquids_here, Gui::cursor_hotkey, // non-interactive, needs ingame cursor
-        "  This command is intended to be mapped to a hotkey and is identical to pressing Enter in liquids with the current parameters.\n"));
+        "liquids-here",
+        "Use settings from liquids at cursor position.",
+        df_liquids_here,
+        Gui::cursor_hotkey)); // non-interactive, needs ingame cursor
     return CR_OK;
 }
 

From a2bca505872f4ebfcfc79c06b8d6b54cdb73bb40 Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Wed, 27 Jul 2022 22:03:03 -0400
Subject: [PATCH 360/854] docs/build.py: Add support for xml and pseudoxml
 output formats

Useful for debugging layout of generated docutils nodes
---
 docs/build.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docs/build.py b/docs/build.py
index 2a42d0968..582279bcb 100755
--- a/docs/build.py
+++ b/docs/build.py
@@ -28,6 +28,8 @@ OUTPUT_FORMATS = {
     'html': SphinxOutputFormat('html', pre_args=['-b', 'html']),
     'text': SphinxOutputFormat('text', pre_args=['-b', 'text']),
     'pdf': SphinxOutputFormat('pdf', pre_args=['-M', 'latexpdf']),
+    'xml': SphinxOutputFormat('xml', pre_args=['-b', 'xml']),
+    'pseudoxml': SphinxOutputFormat('pseudoxml', pre_args=['-b', 'pseudoxml']),
 }
 
 def _parse_known_args(parser, source_args):

From 6aabf5f3c3ec84551fda0cb5118066de1c33a375 Mon Sep 17 00:00:00 2001
From: myk002 <myk.taylor@gmail.com>
Date: Wed, 27 Jul 2022 17:21:34 -0700
Subject: [PATCH 361/854] no commas in index params

---
 docs/plugins/command-prompt.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/plugins/command-prompt.rst b/docs/plugins/command-prompt.rst
index 3b46e1b33..8e6c9e885 100644
--- a/docs/plugins/command-prompt.rst
+++ b/docs/plugins/command-prompt.rst
@@ -3,8 +3,8 @@ command-prompt
 Tags:
 :dfhack-keybind:`command-prompt`
 
-:index:`An in-game DFHack terminal, where you can enter other commands.
-<command-prompt; An in-game DFHack terminal, where you can enter other commands.>`
+:index:`An in-game DFHack terminal where you can enter other commands.
+<command-prompt; An in-game DFHack terminal where you can enter other commands.>`
 
 Usage::
 

From 756900393f35a415af124da075e9cf2e2221a783 Mon Sep 17 00:00:00 2001
From: myk002 <myk.taylor@gmail.com>
Date: Thu, 28 Jul 2022 02:46:48 -0700
Subject: [PATCH 362/854] update docs for misery

---
 docs/plugins/misery.rst | 22 +++++++++++++---------
 plugins/misery.cpp      | 19 ++++---------------
 2 files changed, 17 insertions(+), 24 deletions(-)

diff --git a/docs/plugins/misery.rst b/docs/plugins/misery.rst
index 1c146a10f..9a3a632f2 100644
--- a/docs/plugins/misery.rst
+++ b/docs/plugins/misery.rst
@@ -1,14 +1,18 @@
 misery
 ======
-When enabled, fake bad thoughts will be added to all dwarves.
+Tags:
+:dfhack-keybind:`misery`
+
+Increase the intensity of negative dwarven thoughts.
+
+When enabled, negative thoughts that your dwarves have will multiply by the
+specified factor.
 
 Usage:
 
-:misery enable n:  enable misery with optional magnitude n. If specified, n must
-    be positive.
-:misery n:         same as "misery enable n"
-:misery enable:    same as "misery enable 1"
-:misery disable:   stop adding new negative thoughts. This will not remove
-                   existing negative thoughts. Equivalent to "misery 0".
-:misery clear:     remove fake thoughts, even after saving and reloading. Does
-    not change factor.
+``enable misery``
+    Start multiplying negative thoughts.
+``misery <factor>``
+    Change the multiplicative factor of bad thoughts. The default is ``2``.
+``misery clear``
+    Clear away negative thoughts added by ``misery``.
diff --git a/plugins/misery.cpp b/plugins/misery.cpp
index b8e11f5c0..224060c6b 100644
--- a/plugins/misery.cpp
+++ b/plugins/misery.cpp
@@ -128,21 +128,10 @@ DFhackCExport command_result plugin_onupdate(color_ostream& out) {
 }
 
 DFhackCExport command_result plugin_init(color_ostream& out, vector<PluginCommand> &commands) {
-    commands.push_back(PluginCommand("misery", "increase the intensity of negative dwarven thoughts",
-        &misery, false,
-        "misery: When enabled, every new negative dwarven thought will be multiplied by a factor (2 by default).\n"
-        "Usage:\n"
-        "  misery enable n\n"
-        "    enable misery with optional magnitude n. If specified, n must be positive.\n"
-        "  misery n\n"
-        "    same as \"misery enable n\"\n"
-        "  misery enable\n"
-        "    same as \"misery enable 2\"\n"
-        "  misery disable\n"
-        "    stop adding new negative thoughts. This will not remove existing duplicated thoughts. Equivalent to \"misery 1\"\n"
-        "  misery clear\n"
-        "    remove fake thoughts added in this session of DF. Saving makes them permanent! Does not change factor.\n\n"
-        ));
+    commands.push_back(PluginCommand(
+        "misery",
+        "Increase the intensity of negative dwarven thoughts.",
+        misery));
     return CR_OK;
 }
 

From b6f20ee61a543423e7f2906c44d99b01dd5b15fe Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Thu, 28 Jul 2022 02:49:46 -0700
Subject: [PATCH 363/854] update docs for manipulator

---
 docs/plugins/manipulator.rst | 43 ++++++++++++++++++------------------
 1 file changed, 22 insertions(+), 21 deletions(-)

diff --git a/docs/plugins/manipulator.rst b/docs/plugins/manipulator.rst
index 024438d85..305499308 100644
--- a/docs/plugins/manipulator.rst
+++ b/docs/plugins/manipulator.rst
@@ -1,13 +1,20 @@
 manipulator
 ===========
-An in-game equivalent to the popular program Dwarf Therapist.
+Tags:
+
+An in-game labor management interface. It is equivalent to the popular Dwarf
+Therapist utility.
 
 To activate, open the unit screen and press :kbd:`l`.
 
+Usage::
+
+    enable manipulator
+
 .. image:: ../images/manipulator.png
 
-The far left column displays the unit's Happiness (color-coded based on its
-value), Name, Profession/Squad, and the right half of the screen displays each
+The far left column displays the unit's name, happiness (color-coded based on
+its value), profession, or squad, and the right half of the screen displays each
 dwarf's labor settings and skill levels (0-9 for Dabbling through Professional,
 A-E for Great through Grand Master, and U-Z for Legendary through Legendary+5).
 
@@ -58,12 +65,14 @@ The manipulator plugin supports saving professions: a named set of labors that c
 quickly applied to one or multiple dwarves.
 
 To save a profession, highlight a dwarf and press :kbd:`P`. The profession will be saved using
-the custom profession name of the dwarf, or the default for that dwarf if no custom profession
-name has been set.
+the custom profession name of the dwarf, or the default profession name for that dwarf if no
+custom profession name has been set.
 
 To apply a profession, either highlight a single dwarf or select multiple with
 :kbd:`x`, and press :kbd:`p` to select the profession to apply. All labors for
-the selected dwarves will be reset to the labors of the chosen profession.
+the selected dwarves will be reset to the labors of the chosen profession and
+the custom profession names for those dwarves will be set to the applied
+profession.
 
 Professions are saved as human-readable text files in the
 ``dfhack-config/professions`` folder within the DF folder, and can be edited or
@@ -96,13 +105,8 @@ Chef           0         3     Buchery, Tanning, and Cooking. It is important to
 Craftsdwarf    0         4-6   All labors used at Craftsdwarf's workshops,
                                Glassmaker's workshops, and kilns.
 Doctor         0         2-4   The full suite of medical labors, plus Animal
-                               Caretaking for those using the dwarfvet plugin.
-Farmer         1         4     Food- and animal product-related labors. This
-                               profession also has the ``Alchemist`` labor
-                               enabled since they need to focus on food-related
-                               jobs, though you might want to disable
-                               ``Alchemist`` for your first farmer until there
-                               are actual farming duties to perform.
+                               Caretaking for those using the `dwarfvet` plugin.
+Farmer         1         4     Food- and animal product-related labors.
 Fisherdwarf    0         0-1   Fishing and fish cleaning. If you assign this
                                profession to any dwarf, be prepared to be
                                inundated with fish. Fisherdwarves *never stop
@@ -117,24 +121,21 @@ Hauler         0         >20   All hauling labors plus Siege Operating, Mechanic
                                hauling labors for other dwarves so they can
                                focus on their skilled tasks. You may also want
                                to restrict your Mechanic's workshops to only
-                               skilled mechanics so your haulers don't make
-                               low-quality mechanisms.
+                               skilled mechanics so your unskilled haulers don't
+                               make low-quality mechanisms.
 Laborer        0         10-12 All labors that don't improve quality with skill,
                                such as Soapmaking and furnace labors.
 Marksdwarf     0         10-30 Similar to Hauler. See the description for
                                Meleedwarf below for more details.
-Mason          2         2-4   Masonry and Gem Cutting/Encrusting. In the early
-                               game, you may need to run "`prioritize`
-                               ConstructBuilding" to get your masons to build
-                               wells and bridges if they are too busy crafting
-                               stone furniture.
+Mason          2         2-4   Masonry and Gem Cutting/Encrusting.
 Meleedwarf     0         20-50 Similar to Hauler, but without most civilian
                                labors. This profession is separate from Hauler
                                so you can find your military dwarves easily.
                                Meleedwarves and Marksdwarves have Mechanics and
                                hauling labors enabled so you can temporarily
                                deactivate your military after sieges and allow
-                               your military dwarves to help clean up.
+                               your military dwarves to help clean up and reset
+                               traps.
 Migrant        0         0     You can assign this profession to new migrants
                                temporarily while you sort them into professions.
                                Like Marksdwarf and Meleedwarf, the purpose of

From bcab483b57dce9f50846910e4af80ce454f7cf32 Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Thu, 28 Jul 2022 02:50:37 -0700
Subject: [PATCH 364/854] update docs for mode

---
 docs/plugins/mode.rst | 33 +++++++++++++++++++++++++--------
 plugins/mode.cpp      | 10 ++++------
 2 files changed, 29 insertions(+), 14 deletions(-)

diff --git a/docs/plugins/mode.rst b/docs/plugins/mode.rst
index 9b3fc6984..225a49e1e 100644
--- a/docs/plugins/mode.rst
+++ b/docs/plugins/mode.rst
@@ -1,5 +1,8 @@
 mode
 ====
+Tags:
+:dfhack-keybind:`mode`
+
 This command lets you see and change the game mode directly.
 
 .. warning::
@@ -9,13 +12,27 @@ This command lets you see and change the game mode directly.
     Not all combinations are good for every situation and most of them will
     produce undesirable results. There are a few good ones though.
 
-Examples:
+Usage:
+
+``mode``
+    Print the current game mode.
+``mode set``
+    Enter an interactive commandline menu where you can set the game mode.
+
+Examples
+--------
+
+Scenario 1:
+
+* You are in fort game mode, managing your fortress and paused.
+* You switch to the arena game mode, *assume control of a creature* and then
+* switch to adventure game mode.
+
+You just lost a fortress and gained an adventurer.
+
+Scenario 2:
 
-  * You are in fort game mode, managing your fortress and paused.
-  * You switch to the arena game mode, *assume control of a creature* and then
-  * switch to adventure game mode(1).
-    You just lost a fortress and gained an adventurer.  Alternatively:
+* You are in fort game mode, managing your fortress and paused at the Esc menu.
+* You switch to the adventure game mode, assume control of a creature, then save or retire.
 
-  * You are in fort game mode, managing your fortress and paused at the esc menu.
-  * You switch to the adventure game mode, assume control of a creature, then save or retire.
-  * You just created a returnable mountain home and gained an adventurer.
+You just created a returnable mountain home and gained an adventurer.
diff --git a/plugins/mode.cpp b/plugins/mode.cpp
index 5e58c50a0..aeda6380b 100644
--- a/plugins/mode.cpp
+++ b/plugins/mode.cpp
@@ -19,12 +19,10 @@ DFHACK_PLUGIN("mode");
 DFhackCExport command_result plugin_init ( color_ostream &out, std::vector <PluginCommand> &commands)
 {
     commands.push_back(PluginCommand(
-        "mode","View, change and track game mode.",
-        mode, true,
-        "  Without any parameters, this command prints the current game mode\n"
-        "  You can interactively set the game mode with 'mode set'.\n"
-        "!!Setting the game modes can be dangerous and break your game!!\n"
-    ));
+        "mode",
+        "View, change and track game mode.",
+        mode,
+        true));
     return CR_OK;
 }
 

From f68b58c46047396cc2132618d0b0729f752d3ae3 Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Thu, 28 Jul 2022 03:22:32 -0700
Subject: [PATCH 365/854] update docs for mousequery

---
 docs/Tags.rst               | 35 ++++++++++++++++----------------
 docs/plugins/mousequery.rst | 40 +++++++++++++++++++++++++++----------
 plugins/mousequery.cpp      | 16 +++------------
 3 files changed, 51 insertions(+), 40 deletions(-)

diff --git a/docs/Tags.rst b/docs/Tags.rst
index 432632ba1..294358bd8 100644
--- a/docs/Tags.rst
+++ b/docs/Tags.rst
@@ -1,19 +1,20 @@
 :orphan:
 
-- `tag/adventure`: Tools that are useful while in adventure mode
-- `tag/fort`: Tools that are useful while in fort mode
-- `tag/legends`: Tools that are useful while in legends mode
-- `tag/items`: Tools that create or modify in-game items
-- `tag/units`: Tools that create or modify units
-- `tag/jobs`: Tools that create or modify jobs
-- `tag/labors`: Tools that deal with labor assignment
-- `tag/auto`: Tools that automatically manage some aspect of your fortress
-- `tag/map`: Map modification
-- `tag/system`: Tools related to working with DFHack commands or the core DFHack library
-- `tag/productivity`: Tools that help you do things that you could do manually, but using the tool is better and faster
-- `tag/animals`: Tools that help you manage animals
-- `tag/fix`: Tools that fix specific bugs
-- `tag/inspection`: Tools that let you inspect game data
-- `tag/buildings`: Tools that help you work wtih placing or configuring buildings and furniture
-- `tag/quickfort`: Tools that are involved in creating and playing back blueprints
-- `tag/dev`: Tools useful for develpers and modders
+- `tag/adventure`: Tools that are useful while in adventure mode.
+- `tag/fort`: Tools that are useful while in fort mode.
+- `tag/legends`: Tools that are useful while in legends mode.
+- `tag/items`: Tools that create or modify in-game items.
+- `tag/units`: Tools that create or modify units.
+- `tag/jobs`: Tools that create or modify jobs.
+- `tag/labors`: Tools that deal with labor assignment.
+- `tag/auto`: Tools that automatically manage some aspect of your fortress.
+- `tag/map`: Map modification.
+- `tag/system`: Tools related to working with DFHack commands or the core DFHack library.
+- `tag/productivity`: Tools that help you do things that you could do manually, but using the tool is better and faster.
+- `tag/animals`: Tools that help you manage animals.
+- `tag/fix`: Tools that fix specific bugs.
+- `tag/inspection`: Tools that let you inspect game data.
+- `tag/buildings`: Tools that help you work wtih placing or configuring buildings and furniture.
+- `tag/quickfort`: Tools that are involved in creating and playing back blueprints.
+- `tag/dev`: Tools useful for develpers and modders.
+- `tag/interface`: Tools that modify or extend the user interface.
diff --git a/docs/plugins/mousequery.rst b/docs/plugins/mousequery.rst
index 2f613acaa..eedca7646 100644
--- a/docs/plugins/mousequery.rst
+++ b/docs/plugins/mousequery.rst
@@ -1,16 +1,36 @@
 mousequery
 ==========
-Adds mouse controls to the DF interface, e.g. click-and-drag designations.
+Tags: `tag/fort`, `tag/interface`
+:dfhack-keybind:`mousequery`
 
-Options:
-
-:plugin:    enable/disable the entire plugin
-:rbutton:   enable/disable right mouse button
-:track:     enable/disable moving cursor in build and designation mode
-:edge:      enable/disable active edge scrolling (when on, will also enable tracking)
-:live:      enable/disable query view when unpaused
-:delay:     Set delay when edge scrolling in tracking mode. Omit amount to display current setting.
+Adds mouse controls to the DF interface. For example, with ``mousequery`` you
+can click on buildings to configure them, hold the mouse button to draw dig
+designations, or click and drag to move the map around.
 
 Usage::
 
-    mousequery [plugin] [rbutton] [track] [edge] [live] [enable|disable]
+    enable mousequery
+    mousequery [rbutton|track|edge|live] [enable|disable]
+    mousequery drag [left|right|disable]
+    mousequery delay [<ms>]
+
+:rbutton:   When the right mouse button is clicked, cancel out of menus or
+            scroll the main map if you r-click near an edge.
+:track:     Move the cursor with the mouse instead of the cursor keys when you
+            are in build or designation modes.
+:edge:      Scroll the map when you move the cursor to a map edge. See ``delay``
+            below. If enabled also enables ``track``.
+:delay:     Set delay in milliseconds for map edge scrolling. Omit the amount to
+            display the current setting.
+:live:      Display information in the lower right corner of the screen about
+            the items/building/tile under the cursor, even while unpaused.
+
+Examples
+--------
+
+``mousequery rbutton enable``
+    Enable using the right mouse button to cancel out of menus and scroll the
+    map.
+``mousequery edge enable``
+``mousequery delay 300``
+    Enable edge scrolling and set the delay to 300ms.
diff --git a/plugins/mousequery.cpp b/plugins/mousequery.cpp
index 618252ad3..cd85de2bc 100644
--- a/plugins/mousequery.cpp
+++ b/plugins/mousequery.cpp
@@ -916,19 +916,9 @@ DFhackCExport command_result plugin_init ( color_ostream &out, std::vector <Plug
 {
     commands.push_back(
         PluginCommand(
-        "mousequery", "Add mouse functionality to Dwarf Fortress",
-        mousequery_cmd, false,
-        "mousequery [plugin|rbutton|track|edge|live] [enable|disable]\n"
-        "  plugin: enable/disable the entire plugin\n"
-        "  rbutton: enable/disable right mouse button\n"
-        "  track: enable/disable moving cursor in build and designation mode\n"
-        "  edge: enable/disable active edge scrolling (when on, will also enable tracking)\n"
-        "  live: enable/disable query view when unpaused\n\n"
-        "mousequery drag [left|right|disable]\n"
-        "  Enable/disable map dragging with the specified mouse button\n\n"
-        "mousequery delay <amount>\n"
-        "  Set delay when edge scrolling in tracking mode. Omit amount to display current setting.\n"
-        ));
+        "mousequery",
+        "Add mouse functionality to Dwarf Fortress.",
+        mousequery_cmd));
 
     return CR_OK;
 }

From 88648284b0d72a2c25086c4fcd1a0d5486179a04 Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Thu, 28 Jul 2022 03:25:00 -0700
Subject: [PATCH 366/854] update docs for nestboxes

---
 docs/plugins/nestboxes.rst | 11 +++++++++--
 plugins/nestboxes.cpp      | 11 ++++-------
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/docs/plugins/nestboxes.rst b/docs/plugins/nestboxes.rst
index 2b633f31b..fb9df20a9 100644
--- a/docs/plugins/nestboxes.rst
+++ b/docs/plugins/nestboxes.rst
@@ -1,5 +1,12 @@
 nestboxes
 =========
+Tags:
 
-Automatically scan for and forbid fertile eggs incubating in a nestbox.
-Toggle status with `enable` or `disable <disable>`.
+Protect fertile eggs incubating in a nestbox. This plugin will automatically
+scan for and forbid fertile eggs incubating in a nestbox so that dwarves won't
+come to collect them for eating. The eggs will hatch normally, even when
+forbidden.
+
+Usage::
+
+    enable nestboxes
diff --git a/plugins/nestboxes.cpp b/plugins/nestboxes.cpp
index 8b9a33289..403a8cb37 100644
--- a/plugins/nestboxes.cpp
+++ b/plugins/nestboxes.cpp
@@ -69,13 +69,10 @@ DFhackCExport command_result plugin_init (color_ostream &out, std::vector <Plugi
 {
     if (world && ui) {
         commands.push_back(
-            PluginCommand("nestboxes", "Automatically scan for and forbid fertile eggs incubating in a nestbox.",
-                nestboxes, false,
-                "To enable: nestboxes enable\n"
-                "To disable: nestboxes disable\n"
-                "There is no other configuration.\n"
-            )
-        );
+            PluginCommand(
+                "nestboxes",
+                "Protect fertile eggs incubating in a nestbox.",
+                nestboxes));
     }
     return CR_OK;
 }

From 5b8d8d7fe811e6734fca211d875553e8bd722bd2 Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Thu, 28 Jul 2022 03:48:27 -0700
Subject: [PATCH 367/854] update docs for orders

---
 docs/plugins/orders.rst | 95 +++++++++++++++++++++++++----------------
 plugins/orders.cpp      | 17 +-------
 2 files changed, 61 insertions(+), 51 deletions(-)

diff --git a/docs/plugins/orders.rst b/docs/plugins/orders.rst
index eb0e8a7ca..2506bc582 100644
--- a/docs/plugins/orders.rst
+++ b/docs/plugins/orders.rst
@@ -1,31 +1,51 @@
 orders
 ======
-
-A plugin for manipulating manager orders.
-
-Subcommands:
-
-:list: Shows the list of previously exported orders, including the orders library.
-:export NAME: Exports the current list of manager orders to a file named ``dfhack-config/orders/NAME.json``.
-:import NAME: Imports manager orders from a file named ``dfhack-config/orders/NAME.json``.
-:clear: Deletes all manager orders in the current embark.
-:sort: Sorts current manager orders by repeat frequency so daily orders don't
-    prevent other orders from ever being completed: one-time orders first, then
-    yearly, seasonally, monthly, then finally daily.
+Tags:
+:dfhack-keybind:`orders`
+
+Manage manager orders.
+
+Usage:
+
+``orders orders list``
+    Shows the list of previously exported orders, including the orders library.
+``orders export <name>``
+    Saves all the current manager orders in a file.
+``orders import <name>``
+    Imports the specified manager orders. Note this adds to your current set of
+    manager orders. It will not clear the orders that already exist.
+``orders clear``
+    Deletes all manager orders in the current embark.
+``orders sort``
+    Sorts current manager orders by repeat frequency so repeating orders don't
+    prevent one-time orders from ever being completed. The sorting order is:
+    one-time orders first, then yearly, seasonally, monthly, and finally, daily.
 
 You can keep your orders automatically sorted by adding the following command to
 your ``onMapLoad.init`` file::
 
     repeat -name orders-sort -time 1 -timeUnits days -command [ orders sort ]
 
+Exported orders are saved in the ``dfhack-config/orders`` directory, where you
+can view, edit, and delete them, if desired.
+
+Examples
+--------
+
+``orders export myorders``
+    Export the current manager orders to a file named
+    ``dfhack-config/orders/myorders.json``.
+``orders import library/basic``
+    Import manager orders from the library that keep your fort stocked with
+    basic essentials.
 
 The orders library
 ------------------
 
 DFHack comes with a library of useful manager orders that are ready for import:
 
-:source:`basic.json <data/orders/basic.json>`
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+:source:`library/basic <data/orders/basic.json>`
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 This collection of orders handles basic fort necessities:
 
@@ -45,12 +65,12 @@ This collection of orders handles basic fort necessities:
 You should import it as soon as you have enough dwarves to perform the tasks.
 Right after the first migration wave is usually a good time.
 
-:source:`furnace.json <data/orders/furnace.json>`
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+:source:`library/furnace <data/orders/furnace.json>`
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 This collection creates basic items that require heat. It is separated out from
-``basic.json`` to give players the opportunity to set up magma furnaces first in
-order to save resources. It handles:
+``library/basic`` to give players the opportunity to set up magma furnaces first
+in order to save resources. It handles:
 
 - charcoal (including smelting of bituminous coal and lignite)
 - pearlash
@@ -61,8 +81,8 @@ order to save resources. It handles:
 
 Orders are missing for plaster powder until DF :bug:`11803` is fixed.
 
-:source:`military.json <data/orders/military.json>`
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+:source:`library/military <data/orders/military.json>`
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 This collection adds high-volume smelting jobs for military-grade metal ores and
 produces weapons and armor:
@@ -83,33 +103,36 @@ Make sure you have a lot of fuel (or magma forges and furnaces) before you turn
 
 This file should only be imported, of course, if you need to equip a military.
 
-:source:`smelting.json <data/orders/smelting.json>`
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+:source:`library/smelting <data/orders/smelting.json>`
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 This collection adds smelting jobs for all ores. It includes handling the ores
-already managed by ``military.json``, but has lower limits. This ensures all
-ores will be covered if a player imports ``smelting`` but not ``military``, but
-the higher-volume ``military`` orders will take priority if both are imported.
+already managed by ``library/military``, but has lower limits. This ensures all
+ores will be covered if a player imports ``library/smelting`` but not
+``library/military``, but the higher-volume ``library/military`` orders will
+take priority if both are imported.
 
-:source:`rockstock.json <data/orders/rockstock.json>`
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+:source:`library/rockstock <data/orders/rockstock.json>`
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 This collection of orders keeps a small stock of all types of rock furniture.
 This allows you to do ad-hoc furnishings of guildhalls, libraries, temples, or
 other rooms with `buildingplan` and your masons will make sure there is always
 stock on hand to fulfill the plans.
 
-:source:`glassstock.json <data/orders/glassstock.json>`
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+:source:`library/glassstock <data/orders/glassstock.json>`
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-Similar to ``rockstock`` above, this collection keeps a small stock of all types
-of glass furniture. If you have a functioning glass industry, this is more
-sustainable than ``rockstock`` since you can never run out of sand. If you have
-plenty of rock and just want the variety, you can import both ``rockstock`` and
-``glassstock`` to get a mixture of rock and glass furnishings in your fort.
+Similar to ``library/rockstock`` above, this collection keeps a small stock of
+all types of glass furniture. If you have a functioning glass industry, this is
+more sustainable than ``library/rockstock`` since you can never run out of sand.
+If you have plenty of rock and just want the variety, you can import both
+``library/rockstock`` and ``library/glassstock`` to get a mixture of rock and
+glass furnishings in your fort.
 
-There are a few items that ``glassstock`` produces that ``rockstock`` does not,
-since there are some items that can not be made out of rock, for example:
+There are a few items that ``library/glassstock`` produces that
+``library/rockstock`` does not, since there are some items that can not be made
+out of rock, for example:
 
 - tubes and corkscrews for building magma-safe screw pumps
 - windows
diff --git a/plugins/orders.cpp b/plugins/orders.cpp
index 9e1bf3e1a..800a0db6e 100644
--- a/plugins/orders.cpp
+++ b/plugins/orders.cpp
@@ -49,21 +49,8 @@ DFhackCExport command_result plugin_init(color_ostream & out, std::vector<Plugin
 {
     commands.push_back(PluginCommand(
         "orders",
-        "Manipulate manager orders.",
-        orders_command,
-        false,
-        "orders - Manipulate manager orders\n"
-        "  orders list\n"
-        "    Shows the list of previously exported orders.\n"
-        "  orders export [name]\n"
-        "    Exports the current list of manager orders to a file named dfhack-config/orders/[name].json.\n"
-        "  orders import [name]\n"
-        "    Imports manager orders from a file named dfhack-config/orders/[name].json.\n"
-        "  orders clear\n"
-        "    Deletes all manager orders in the current embark.\n"
-        "  orders sort\n"
-        "    Sorts current manager orders by repeat frequency so they don't conflict.\n"
-    ));
+        "Manage manager orders.",
+        orders_command));
     return CR_OK;
 }
 

From e8bc9d9c0ee89c8fc3fc7c9ef1c78b762481d652 Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Thu, 28 Jul 2022 03:49:52 -0700
Subject: [PATCH 368/854] fix formatting in mousequery docs

---
 docs/plugins/mousequery.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/plugins/mousequery.rst b/docs/plugins/mousequery.rst
index eedca7646..39f401bb2 100644
--- a/docs/plugins/mousequery.rst
+++ b/docs/plugins/mousequery.rst
@@ -31,6 +31,6 @@ Examples
 ``mousequery rbutton enable``
     Enable using the right mouse button to cancel out of menus and scroll the
     map.
-``mousequery edge enable``
 ``mousequery delay 300``
-    Enable edge scrolling and set the delay to 300ms.
+    When run after ``mousequery edge enable``, sets the edge scrolling delay to
+    300ms.

From a6fb509cc7076c1f304571fb2c960b80b2b0be01 Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Thu, 28 Jul 2022 04:05:41 -0700
Subject: [PATCH 369/854] convert table to list so it's readable in text
 rendering

---
 docs/plugins/manipulator.rst | 140 +++++++++++++++++------------------
 1 file changed, 66 insertions(+), 74 deletions(-)

diff --git a/docs/plugins/manipulator.rst b/docs/plugins/manipulator.rst
index 305499308..c8140a3bf 100644
--- a/docs/plugins/manipulator.rst
+++ b/docs/plugins/manipulator.rst
@@ -90,82 +90,74 @@ want to import to a dwarf. Once you have assigned a profession to at least one
 dwarf, you can select "Import Professions from DF" in the DT "File" menu. The
 professions will then be available for use in DT.
 
-In the charts below, the "At Start" and "Max" columns indicate the approximate
-number of dwarves of each profession that you are likely to need at the start of
-the game and how many you are likely to need in a mature fort. These are just
+In the list below, the "needed" range indicates the approximate number of
+dwarves of each profession that you are likely to need at the start of the game
+and how many you are likely to need in a mature fort. These are just
 approximations. Your playstyle may demand more or fewer of each profession.
 
-=============  ========  ===== =================================================
-Profession     At Start  Max   Description
-=============  ========  ===== =================================================
-Chef           0         3     Buchery, Tanning, and Cooking. It is important to
-                               focus just a few dwarves on cooking since
-                               well-crafted meals make dwarves very happy. They
-                               are also an excellent trade good.
-Craftsdwarf    0         4-6   All labors used at Craftsdwarf's workshops,
-                               Glassmaker's workshops, and kilns.
-Doctor         0         2-4   The full suite of medical labors, plus Animal
-                               Caretaking for those using the `dwarfvet` plugin.
-Farmer         1         4     Food- and animal product-related labors.
-Fisherdwarf    0         0-1   Fishing and fish cleaning. If you assign this
-                               profession to any dwarf, be prepared to be
-                               inundated with fish. Fisherdwarves *never stop
-                               fishing*. Be sure to also run ``prioritize -a
-                               PrepareRawFish ExtractFromRawFish`` or else
-                               caught fish will just be left to rot.
-Hauler         0         >20   All hauling labors plus Siege Operating, Mechanic
-                               (so haulers can assist in reloading traps) and
-                               Architecture (so haulers can help build massive
-                               windmill farms and pump stacks). As you
-                               accumulate enough Haulers, you can turn off
-                               hauling labors for other dwarves so they can
-                               focus on their skilled tasks. You may also want
-                               to restrict your Mechanic's workshops to only
-                               skilled mechanics so your unskilled haulers don't
-                               make low-quality mechanisms.
-Laborer        0         10-12 All labors that don't improve quality with skill,
-                               such as Soapmaking and furnace labors.
-Marksdwarf     0         10-30 Similar to Hauler. See the description for
-                               Meleedwarf below for more details.
-Mason          2         2-4   Masonry and Gem Cutting/Encrusting.
-Meleedwarf     0         20-50 Similar to Hauler, but without most civilian
-                               labors. This profession is separate from Hauler
-                               so you can find your military dwarves easily.
-                               Meleedwarves and Marksdwarves have Mechanics and
-                               hauling labors enabled so you can temporarily
-                               deactivate your military after sieges and allow
-                               your military dwarves to help clean up and reset
-                               traps.
-Migrant        0         0     You can assign this profession to new migrants
-                               temporarily while you sort them into professions.
-                               Like Marksdwarf and Meleedwarf, the purpose of
-                               this profession is so you can find your new
-                               dwarves more easily.
-Miner          2         2-10  Mining and Engraving. This profession also has
-                               the ``Alchemist`` labor enabled, which disables
-                               hauling for those using the `autohauler` plugin.
-                               Once the need for Miners tapers off in the late
-                               game, dwarves with this profession make good
-                               military dwarves, wielding their picks as
-                               weapons.
-Outdoorsdwarf  1         2-4   Carpentry, Bowyery, Woodcutting, Animal Training,
-                               Trapping, Plant Gathering, Beekeeping, and Siege
-                               Engineering.
-Smith          0         2-4   Smithing labors. You may want to specialize your
-                               Smiths to focus on a single smithing skill to
-                               maximize equipment quality.
-StartManager   1         0     All skills not covered by the other starting
-                               professions (Miner, Mason, Outdoorsdwarf, and
-                               Farmer), plus a few overlapping skills to
-                               assist in critical tasks at the beginning of the
-                               game. Individual labors should be turned off as
-                               migrants are assigned more specialized
-                               professions that cover them, and the StartManager
-                               dwarf can eventually convert to some other
-                               profession.
-Tailor         0         2     Textile industry labors: Dying, Leatherworking,
-                               Weaving, and Clothesmaking.
-=============  ========  ===== =================================================
+- ``Chef`` (needed: 0, 3)
+    Buchery, Tanning, and Cooking. It is important to focus just a few dwarves
+    on cooking since well-crafted meals make dwarves very happy. They are also
+    an excellent trade good.
+- ``Craftsdwarf`` (needed: 0, 4-6)
+    All labors used at Craftsdwarf's workshops, Glassmaker's workshops, and
+    kilns.
+``Doctor`` (needed: 0, 2-4)
+    The full suite of medical labors, plus Animal Caretaking for those using
+    the `dwarfvet` plugin.
+``Farmer`` (needed 1, 4)
+    Food- and animal product-related labors.
+``Fisherdwarf`` (needed 0, 0-1)
+    Fishing and fish cleaning. If you assign this profession to any dwarf, be
+    prepared to be inundated with fish. Fisherdwarves *never stop fishing*. Be
+    sure to also run ``prioritize -a PrepareRawFish ExtractFromRawFish`` or else
+    caught fish will just be left to rot.
+``Hauler`` (needed 0, >20)
+    All hauling labors plus Siege Operating, Mechanic (so haulers can assist in
+    reloading traps) and Architecture (so haulers can help build massive
+    windmill farms and pump stacks). As you accumulate enough Haulers, you can
+    turn off hauling labors for other dwarves so they can focus on their skilled
+    tasks. You may also want to restrict your Mechanic's workshops to only
+    skilled mechanics so your unskilled haulers don't make low-quality
+    mechanisms.
+``Laborer`` (needed 0, 10-12)
+    All labors that don't improve quality with skill, such as Soapmaking and
+    furnace labors.
+``Marksdwarf`` (needed 0, 10-30)
+    Similar to ``Hauler``. See the description for ``Meleedwarf`` below for more
+    details.
+``Mason`` (needed 2, 2-4)
+    Masonry and Gem Cutting/Encrusting.
+``Meleedwarf`` (needed 0, 20-50)
+    Similar to ``Hauler``, but without most civilian labors. This profession is
+    separate from ``Hauler`` so you can find your military dwarves easily.
+    ``Meleedwarves`` and ``Marksdwarves`` have Mechanics and hauling labors
+    enabled so you can temporarily deactivate your military after sieges and
+    allow your military dwarves to help clean up and reset traps.
+``Migrant`` (needed 0, 0)
+    You can assign this profession to new migrants temporarily while you sort
+    them into professions.  Like ``Marksdwarf`` and ``Meleedwarf``, the purpose
+    of this profession is so you can find your new dwarves more easily.
+``Miner`` (needed 2, 2-10)
+    Mining and Engraving. This profession also has the ``Alchemist`` labor
+    enabled, which disables hauling for those using the `autohauler` plugin.
+    Once the need for Miners tapers off in the late game, dwarves with this
+    profession make good military dwarves, wielding their picks as weapons.
+``Outdoorsdwarf`` (needed 1, 2-4)
+    Carpentry, Bowyery, Woodcutting, Animal Training, Trapping, Plant Gathering,
+    Beekeeping, and Siege Engineering.
+``Smith`` (needed 0, 2-4)
+    Smithing labors. You may want to specialize your Smiths to focus on a single
+    smithing skill to maximize equipment quality.
+``StartManager`` (needed 1, 0)
+    All skills not covered by the other starting professions (``Miner``,
+    ``Mason``, ``Outdoorsdwarf``, and ``Farmer``), plus a few overlapping skills
+    to assist in critical tasks at the beginning of the game. Individual labors
+    should be turned off as migrants are assigned more specialized professions
+    that cover them, and the StartManager dwarf can eventually convert to some
+    other profession.
+``Tailor`` (needed 0, 2)
+    Textile industry labors: Dying, Leatherworking, Weaving, and Clothesmaking.
 
 A note on autohauler
 ~~~~~~~~~~~~~~~~~~~~

From 5954d7a19a2875571aec7b742a4ddb3149968f53 Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Thu, 28 Jul 2022 05:32:30 -0700
Subject: [PATCH 370/854] make docs for plug match the implementation

---
 docs/builtins/plug.rst | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/docs/builtins/plug.rst b/docs/builtins/plug.rst
index 26699d400..963660bbb 100644
--- a/docs/builtins/plug.rst
+++ b/docs/builtins/plug.rst
@@ -11,5 +11,4 @@ Usage:
 ``plug``
     Lists available plugins and whether they are enabled.
 ``plug <plugin> [<plugin> ...]``
-    Shows the commands implemented by the named plugins and whether the plugins
-    are enabled.
+    Lists only the named plugins.

From ac2d943fb129037c9bd580eae958bf7d3f4b23ca Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Thu, 28 Jul 2022 05:41:29 -0700
Subject: [PATCH 371/854] remove commas from cleaners index entry

---
 docs/plugins/cleaners.rst | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/docs/plugins/cleaners.rst b/docs/plugins/cleaners.rst
index 305bf0db6..4a6aee1e3 100644
--- a/docs/plugins/cleaners.rst
+++ b/docs/plugins/cleaners.rst
@@ -7,11 +7,11 @@ Tags:
 :dfhack-keybind:`clean`
 :dfhack-keybind:`spotclean`
 
-:index:`Removes contaminants from tiles, items, and units.
-<clean; Removes contaminants from tiles, items, and units.>` More specifically,
-it cleans all the splatter that get scattered all over the map and that clings
-to your items and units. In an old fortress, this can significantly reduce FPS
-lag. It can also spoil your !!FUN!!, so think before you use it.
+:index:`Removes contaminants.  <clean; Removes contaminants.>` More
+specifically, it cleans all the splatter that get scattered all over the map and
+that clings to your items and units. In an old fortress, cleaning with this tool
+can significantly reduce FPS lag. It can also spoil your !!FUN!!, so think
+before you use it.
 
 Usage::
 

From 507b1632a23f58f277a295b0d3d39efeff6e232f Mon Sep 17 00:00:00 2001
From: myk002 <myk.taylor@gmail.com>
Date: Tue, 26 Jul 2022 11:35:31 -0700
Subject: [PATCH 372/854] support backtick as a keybinding

---
 docs/Core.rst       | 3 ++-
 docs/changelog.txt  | 1 +
 library/Core.cpp    | 3 +++
 plugins/hotkeys.cpp | 3 +++
 4 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/docs/Core.rst b/docs/Core.rst
index fe881a54d..0cc62bef9 100644
--- a/docs/Core.rst
+++ b/docs/Core.rst
@@ -224,7 +224,8 @@ To set keybindings, use the built-in ``keybinding`` command. Like any other
 command it can be used at any time from the console, but bindings are not
 remembered between runs of the game unless re-created in `dfhack.init`.
 
-Currently, any combinations of Ctrl/Alt/Shift with A-Z, 0-9, or F1-F12 are supported.
+Currently, any combinations of Ctrl/Alt/Shift with A-Z, 0-9, F1-F12 or \`
+are supported.
 
 Possible ways to call the command:
 
diff --git a/docs/changelog.txt b/docs/changelog.txt
index 447f2f22e..c57bf3435 100644
--- a/docs/changelog.txt
+++ b/docs/changelog.txt
@@ -42,6 +42,7 @@ changelog.txt uses a syntax similar to RST, with a few special sequences:
 
 ## Misc Improvements
 - Init scripts: ``dfhack.init`` and other init scripts have moved to ``dfhack-config/init/``. If you have customized your ``dfhack.init`` file and want to keep your changes, please move the part that you have customized to the new location at ``dfhack-config/init/dfhack.init``. If you do not have changes that you want to keep, do not copy anything, and the new defaults will be used automatically.
+- `keybinding`: support backquote (``\```) as a hotkey
 - `manipulator`: add a library of useful default professions
 - `manipulator`: move professions configuration from ``professions/`` to ``dfhack-config/professions/`` to keep it together with other dfhack configuration. If you have saved professions that you would like to keep, please manually move them to the new folder.
 - ``materials.ItemTraitsDialog``: added a default ``on_select``-handler which toggles the traits.
diff --git a/library/Core.cpp b/library/Core.cpp
index 6d1f13589..12faa9f7c 100644
--- a/library/Core.cpp
+++ b/library/Core.cpp
@@ -2611,6 +2611,9 @@ static bool parseKeySpec(std::string keyspec, int *psym, int *pmod, std::string
     if (keyspec.size() == 1 && keyspec[0] >= 'A' && keyspec[0] <= 'Z') {
         *psym = SDL::K_a + (keyspec[0]-'A');
         return true;
+    } else if (keyspec.size() == 1 && keyspec[0] == '`') {
+        *psym = SDL::K_BACKQUOTE;
+        return true;
     } else if (keyspec.size() == 1 && keyspec[0] >= '0' && keyspec[0] <= '9') {
         *psym = SDL::K_0 + (keyspec[0]-'0');
         return true;
diff --git a/plugins/hotkeys.cpp b/plugins/hotkeys.cpp
index e4cd13574..ecf3b2969 100644
--- a/plugins/hotkeys.cpp
+++ b/plugins/hotkeys.cpp
@@ -44,6 +44,7 @@ static void find_active_keybindings(df::viewscreen *screen)
     sorted_keys.clear();
 
     vector<string> valid_keys;
+
     for (char c = 'A'; c <= 'Z'; c++)
     {
         valid_keys.push_back(string(&c, 1));
@@ -54,6 +55,8 @@ static void find_active_keybindings(df::viewscreen *screen)
         valid_keys.push_back("F" + int_to_string(i));
     }
 
+    valid_keys.push_back("`");
+
     auto current_focus = Gui::getFocusString(screen);
     for (int shifted = 0; shifted < 2; shifted++)
     {

From b6e27b1875754f0d7a77c91290a7730892bf101d Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Thu, 28 Jul 2022 05:46:25 -0700
Subject: [PATCH 373/854] fix rendering of quoted backtick

---
 docs/changelog.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/changelog.txt b/docs/changelog.txt
index c57bf3435..242ec37da 100644
--- a/docs/changelog.txt
+++ b/docs/changelog.txt
@@ -42,7 +42,7 @@ changelog.txt uses a syntax similar to RST, with a few special sequences:
 
 ## Misc Improvements
 - Init scripts: ``dfhack.init`` and other init scripts have moved to ``dfhack-config/init/``. If you have customized your ``dfhack.init`` file and want to keep your changes, please move the part that you have customized to the new location at ``dfhack-config/init/dfhack.init``. If you do not have changes that you want to keep, do not copy anything, and the new defaults will be used automatically.
-- `keybinding`: support backquote (``\```) as a hotkey
+- `keybinding`: support backquote (\`) as a hotkey
 - `manipulator`: add a library of useful default professions
 - `manipulator`: move professions configuration from ``professions/`` to ``dfhack-config/professions/`` to keep it together with other dfhack configuration. If you have saved professions that you would like to keep, please manually move them to the new folder.
 - ``materials.ItemTraitsDialog``: added a default ``on_select``-handler which toggles the traits.

From 380b003b5664211ad9aa0b86a7aa660be26f5f8d Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Thu, 28 Jul 2022 06:05:35 -0700
Subject: [PATCH 374/854] fix list formatting for manipulator

---
 docs/plugins/manipulator.rst | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/docs/plugins/manipulator.rst b/docs/plugins/manipulator.rst
index c8140a3bf..87ac4e088 100644
--- a/docs/plugins/manipulator.rst
+++ b/docs/plugins/manipulator.rst
@@ -102,17 +102,17 @@ approximations. Your playstyle may demand more or fewer of each profession.
 - ``Craftsdwarf`` (needed: 0, 4-6)
     All labors used at Craftsdwarf's workshops, Glassmaker's workshops, and
     kilns.
-``Doctor`` (needed: 0, 2-4)
+- ``Doctor`` (needed: 0, 2-4)
     The full suite of medical labors, plus Animal Caretaking for those using
     the `dwarfvet` plugin.
-``Farmer`` (needed 1, 4)
+- ``Farmer`` (needed 1, 4)
     Food- and animal product-related labors.
-``Fisherdwarf`` (needed 0, 0-1)
+- ``Fisherdwarf`` (needed 0, 0-1)
     Fishing and fish cleaning. If you assign this profession to any dwarf, be
     prepared to be inundated with fish. Fisherdwarves *never stop fishing*. Be
     sure to also run ``prioritize -a PrepareRawFish ExtractFromRawFish`` or else
     caught fish will just be left to rot.
-``Hauler`` (needed 0, >20)
+- ``Hauler`` (needed 0, >20)
     All hauling labors plus Siege Operating, Mechanic (so haulers can assist in
     reloading traps) and Architecture (so haulers can help build massive
     windmill farms and pump stacks). As you accumulate enough Haulers, you can
@@ -120,43 +120,43 @@ approximations. Your playstyle may demand more or fewer of each profession.
     tasks. You may also want to restrict your Mechanic's workshops to only
     skilled mechanics so your unskilled haulers don't make low-quality
     mechanisms.
-``Laborer`` (needed 0, 10-12)
+- ``Laborer`` (needed 0, 10-12)
     All labors that don't improve quality with skill, such as Soapmaking and
     furnace labors.
-``Marksdwarf`` (needed 0, 10-30)
+- ``Marksdwarf`` (needed 0, 10-30)
     Similar to ``Hauler``. See the description for ``Meleedwarf`` below for more
     details.
-``Mason`` (needed 2, 2-4)
+- ``Mason`` (needed 2, 2-4)
     Masonry and Gem Cutting/Encrusting.
-``Meleedwarf`` (needed 0, 20-50)
+- ``Meleedwarf`` (needed 0, 20-50)
     Similar to ``Hauler``, but without most civilian labors. This profession is
     separate from ``Hauler`` so you can find your military dwarves easily.
     ``Meleedwarves`` and ``Marksdwarves`` have Mechanics and hauling labors
     enabled so you can temporarily deactivate your military after sieges and
     allow your military dwarves to help clean up and reset traps.
-``Migrant`` (needed 0, 0)
+- ``Migrant`` (needed 0, 0)
     You can assign this profession to new migrants temporarily while you sort
     them into professions.  Like ``Marksdwarf`` and ``Meleedwarf``, the purpose
     of this profession is so you can find your new dwarves more easily.
-``Miner`` (needed 2, 2-10)
+- ``Miner`` (needed 2, 2-10)
     Mining and Engraving. This profession also has the ``Alchemist`` labor
     enabled, which disables hauling for those using the `autohauler` plugin.
     Once the need for Miners tapers off in the late game, dwarves with this
     profession make good military dwarves, wielding their picks as weapons.
-``Outdoorsdwarf`` (needed 1, 2-4)
+- ``Outdoorsdwarf`` (needed 1, 2-4)
     Carpentry, Bowyery, Woodcutting, Animal Training, Trapping, Plant Gathering,
     Beekeeping, and Siege Engineering.
-``Smith`` (needed 0, 2-4)
+- ``Smith`` (needed 0, 2-4)
     Smithing labors. You may want to specialize your Smiths to focus on a single
     smithing skill to maximize equipment quality.
-``StartManager`` (needed 1, 0)
+- ``StartManager`` (needed 1, 0)
     All skills not covered by the other starting professions (``Miner``,
     ``Mason``, ``Outdoorsdwarf``, and ``Farmer``), plus a few overlapping skills
     to assist in critical tasks at the beginning of the game. Individual labors
     should be turned off as migrants are assigned more specialized professions
     that cover them, and the StartManager dwarf can eventually convert to some
     other profession.
-``Tailor`` (needed 0, 2)
+- ``Tailor`` (needed 0, 2)
     Textile industry labors: Dying, Leatherworking, Weaving, and Clothesmaking.
 
 A note on autohauler

From a09b35c2bd5e273a4fe7666ee7791e3f3a8d4272 Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Thu, 28 Jul 2022 15:32:26 -0700
Subject: [PATCH 375/854] ignore generated directories

---
 .gitignore | 2 ++
 conf.py    | 3 +++
 2 files changed, 5 insertions(+)

diff --git a/.gitignore b/.gitignore
index 5155f2bb9..0711d9b17 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,8 +18,10 @@ build/VC2010
 docs/changelogs/
 docs/html/
 docs/pdf/
+docs/pseudoxml/
 docs/text/
 docs/tools/
+docs/xml/
 
 # in-place build
 build/Makefile
diff --git a/conf.py b/conf.py
index fab4b286a..b01027a6b 100644
--- a/conf.py
+++ b/conf.py
@@ -310,7 +310,10 @@ exclude_patterns = [
     'docs/tags/*',
     'docs/text/*',
     'docs/builtins/*',
+    'docs/pdf/*',
     'docs/plugins/*',
+    'docs/pseudoxml/*',
+    'docs/xml/*',
     'scripts/docs/*',
     ]
 

From 2e2abbe87ad4610999fea2a03e064881bc74951f Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Thu, 28 Jul 2022 16:46:10 -0700
Subject: [PATCH 376/854] update docs for petcapRemover

and make it actually start running when it is enabled
---
 docs/plugins/petcapRemover.rst | 41 ++++++++++++++++++++++------------
 plugins/petcapRemover.cpp      | 18 +++++----------
 2 files changed, 33 insertions(+), 26 deletions(-)

diff --git a/docs/plugins/petcapRemover.rst b/docs/plugins/petcapRemover.rst
index 65ebaeeab..e3ce47916 100644
--- a/docs/plugins/petcapRemover.rst
+++ b/docs/plugins/petcapRemover.rst
@@ -1,19 +1,32 @@
 petcapRemover
 =============
-Allows you to remove or raise the pet population cap. In vanilla
-DF, pets will not reproduce unless the population is below 50 and the number of
-children of that species is below a certain percentage. This plugin allows
-removing the second restriction and removing or raising the first. Pets still
-require PET or PET_EXOTIC tags in order to reproduce. Type ``help petcapRemover``
-for exact usage. In order to make population more stable and avoid sudden
-population booms as you go below the raised population cap, this plugin counts
-pregnancies toward the new population cap. It can still go over, but only in the
-case of multiple births.
+Tags:
+:dfhack-keybind:`petcapRemover`
+
+Modify the pet population cap. In vanilla DF, pets will not reproduce unless the
+population is below 50 and the number of children of that species is below a
+certain percentage. This plugin allows removing these restrictions and setting
+your own thresholds. Pets still require PET or PET_EXOTIC tags in order to
+reproduce. In order to make population more stable and avoid sudden population
+booms as you go below the raised population cap, this plugin counts pregnancies
+toward the new population cap. It can still go over, but only in the case of
+multiple births.
 
 Usage:
 
-:petcapRemover:             cause pregnancies now and schedule the next check
-:petcapRemover every n:     set how often in ticks the plugin checks for possible pregnancies
-:petcapRemover cap n:       set the new cap to n. if n = 0, no cap
-:petcapRemover pregtime n:  sets the pregnancy duration to n ticks. natural pregnancies are
-                            300000 ticks for the current race and 200000 for everyone else
+``enable petcapRemover``
+    Enables the plugin and starts running with default settings.
+``petcapRemover cap <value>``
+    Set the new population cap per species to the specified value. If set to 0,
+    then there is no cap (good luck with all those animals!). The default cap
+    is 100.
+``petcapRemover``
+    Impregnate female pets that have access to a compatible male, up to the
+    population cap.
+``petcapRemover every <ticks>``
+    Set how often the plugin will cause pregnancies. The default frequency is
+    every 10,000 ticks (a little over 8 game days).
+``petcapRemover pregtime <ticks>``
+    Sets the pregnancy duration to the specified number of ticks. The default
+    value is 200,000 ticks, which is the natural pet pregnancy duration.
+
diff --git a/plugins/petcapRemover.cpp b/plugins/petcapRemover.cpp
index 7d6588cbc..2c1de318d 100644
--- a/plugins/petcapRemover.cpp
+++ b/plugins/petcapRemover.cpp
@@ -36,18 +36,8 @@ DFhackCExport command_result plugin_init ( color_ostream &out, std::vector <Plug
 {
     commands.push_back(PluginCommand(
         "petcapRemover",
-        "Remove the pet population cap by causing pregnancies.",
-        petcapRemover,
-        false, //allow non-interactive use
-        "petcapRemover\n"
-        " does pregnancies now and schedules the next check\n"
-        "petcapRemover every n\n"
-        " set how often in ticks the plugin checks for possible pregnancies\n"
-        "petcapRemover cap n\n"
-        " sets the new cap to n. if n = 0, no cap. Caps between 1 and 50 effectively don't do anything because normal DF pregnancies will continue to happen below that cap.\n"
-        "petcapRemover pregtime n\n"
-        " sets the pregnancy duration to n ticks. Natural pregnancies are 300000 ticks for the current race and 200000 ticks for everyone else.\n"
-    ));
+        "Modify the pet population cap.",
+        petcapRemover));
     return CR_OK;
 }
 
@@ -204,6 +194,10 @@ DFhackCExport command_result plugin_enable(color_ostream &out, bool enable)
         is_enabled = enable;
         if ( !is_enabled ) {
             EventManager::unregisterAll(plugin_self);
+        } else {
+            // start the cycle
+            vector<string> params;
+            return petcapRemover(out, params);
         }
     }
 

From 2d400fb571c37c2681ff0b8f112cde9d8d106077 Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Thu, 28 Jul 2022 22:51:17 -0700
Subject: [PATCH 377/854] update docs for plants

n.b. original docs were a lie.
---
 docs/plugins/plants.rst | 34 ++++++++++++++++++++++------------
 plugins/plants.cpp      | 19 ++++++-------------
 2 files changed, 28 insertions(+), 25 deletions(-)

diff --git a/docs/plugins/plants.rst b/docs/plugins/plants.rst
index 0111b0770..4fc87f353 100644
--- a/docs/plugins/plants.rst
+++ b/docs/plugins/plants.rst
@@ -1,18 +1,28 @@
 .. _plant:
 
-plant
-=====
-A tool for creating shrubs, growing, or getting rid of them.
+plants
+======
+Tags:
+:dfhack-keybind:`plant`
 
-Subcommands:
+Grow shrubs or trees.
 
-:create:      Creates a new sapling under the cursor. Takes a raw ID as argument
-              (e.g. TOWER_CAP). The cursor must be located on a dirt or grass floor tile.
-:grow:        Turns saplings into trees; under the cursor if a sapling is selected,
-              or every sapling on the map if the cursor is hidden.
+Usage:
 
-For mass effects, use one of the additional options:
+``plant create <ID>``
+    Creates a new plant of the specified type at the active cursor position.
+    The cursor must be on a dirt or grass floor tile.
+``plant grow``
+    Grows saplings into trees. If the cursor is active, it only affects the
+    sapling under the cursor. If no cursor is active, it affect all saplings
+    on the map.
 
-:shrubs:    affect all shrubs on the map
-:trees:     affect all trees on the map
-:all:       affect every plant!
+To see the full list of plant ids, run the following command::
+
+    devel/query --table df.global.world.raws.plants.all --search ^id --maxdepth 1
+
+Example
+-------
+
+``plant create TOWER_CAP``
+    Create a Tower Cap sapling at the cursor position.
diff --git a/plugins/plants.cpp b/plugins/plants.cpp
index 69e712ef8..2325c01e3 100644
--- a/plugins/plants.cpp
+++ b/plugins/plants.cpp
@@ -32,10 +32,7 @@ command_result df_grow (color_ostream &out, vector <string> & parameters)
     {
         if(parameters[i] == "help" || parameters[i] == "?")
         {
-            out.print("Usage:\n"
-                "This command turns all living saplings on the map into full-grown trees.\n"
-                "With active cursor, work on the targetted one only.\n");
-            return CR_OK;
+            return CR_WRONG_USAGE;
         }
     }
 
@@ -91,11 +88,7 @@ command_result df_createplant (color_ostream &out, vector <string> & parameters)
 {
     if ((parameters.size() != 1) || (parameters[0] == "help" || parameters[0] == "?"))
     {
-        out.print("Usage:\n"
-            "Create a new plant at the cursor.\n"
-            "Specify the type of plant to create by its raw ID (e.g. TOWER_CAP or MUSHROOM_HELMET_PLUMP).\n"
-            "Only shrubs and saplings can be placed, and they must be located on a dirt or grass floor.\n");
-        return CR_OK;
+        return CR_WRONG_USAGE;
     }
 
     CoreSuspender suspend;
@@ -201,10 +194,10 @@ command_result df_plant (color_ostream &out, vector <string> & parameters)
 
 DFhackCExport command_result plugin_init ( color_ostream &out, std::vector <PluginCommand> &commands)
 {
-    commands.push_back(PluginCommand("plant", "Plant creation and removal.", df_plant, false,
-        "Command to create, grow or remove plants on the map. For more details, check the subcommand help :\n"
-        "plant grow help   - Grows saplings into trees.\n"
-        "plant create help - Create a new plant.\n"));
+    commands.push_back(PluginCommand(
+        "plant",
+        "Grow shrubs or trees.",
+        df_plant));
 
     return CR_OK;
 }

From 1bbe996d581a617afeb1b34019665cdcb437e763 Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Thu, 28 Jul 2022 22:55:20 -0700
Subject: [PATCH 378/854] update docs for power-meter

---
 docs/plugins/power-meter.rst | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/docs/plugins/power-meter.rst b/docs/plugins/power-meter.rst
index 163ef91be..9443f2a93 100644
--- a/docs/plugins/power-meter.rst
+++ b/docs/plugins/power-meter.rst
@@ -1,5 +1,13 @@
 power-meter
 ===========
+Tags:
+
+Provides the backend for `gui/power-meter`.
+
+Usage::
+
+    enable power-meter
+
 The power-meter plugin implements a modified pressure plate that detects power being
 supplied to gear boxes built in the four adjacent N/S/W/E tiles.
 

From cf69a1a2cf6ca82f5bff87247902c0e13f39b215 Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Thu, 28 Jul 2022 23:04:07 -0700
Subject: [PATCH 379/854] update docs for probe

---
 docs/plugins/probe.rst | 26 +++++++++++++++++---------
 plugins/probe.cpp      | 18 ++++++------------
 2 files changed, 23 insertions(+), 21 deletions(-)

diff --git a/docs/plugins/probe.rst b/docs/plugins/probe.rst
index 1dcc28336..614d0bc81 100644
--- a/docs/plugins/probe.rst
+++ b/docs/plugins/probe.rst
@@ -1,13 +1,21 @@
 probe
 =====
+Tags:
+:dfhack-keybind:`probe`
+:dfhack-keybind:`bprobe`
+:dfhack-keybind:`cprobe`
 
-This plugin provides multiple commands that print low-level properties of the
-selected objects.
+Display low-level properties of selected objects.
 
-* ``probe``: prints some properties of the tile selected with :kbd:`k`. Some of
-  these properties can be passed into `tiletypes`.
-* ``cprobe``: prints some properties of the unit selected with :kbd:`v`, as well
-  as the IDs of any worn items. `gui/gm-unit` and `gui/gm-editor` are more
-  complete in-game alternatives.
-* ``bprobe``: prints some properties of the building selected with :kbd:`q` or
-  :kbd:`t`. `gui/gm-editor` is a more complete in-game alternative.
+Usage:
+
+``probe``
+    Displays properties of the tile selected with :kbd:`k`. Some of these
+    properties can be passed into `tiletypes`.
+``bprobe``
+    Displays properties of the building selected with :kbd:`q` or :kbd:`t`.
+    For deeper inspection of the building, see `gui/gm-editor`.
+``cprobe``
+    Displays properties of the unit selected with :kbd:`v`. It also displays the
+    IDs of any worn items. For deeper inspection of the unit and inventory items,
+    see `gui/gm-unit` and `gui/gm-editor`.
diff --git a/plugins/probe.cpp b/plugins/probe.cpp
index ba7c42ede..b9b98ee75 100644
--- a/plugins/probe.cpp
+++ b/plugins/probe.cpp
@@ -49,20 +49,14 @@ command_result df_bprobe (color_ostream &out, vector <string> & parameters);
 DFhackCExport command_result plugin_init ( color_ostream &out, std::vector <PluginCommand> &commands)
 {
     commands.push_back(PluginCommand("probe",
-                                     "A tile probe",
-                                     df_probe,
-                                     false,
-                                     "Hover the cursor over a tile to view its properties.\n"));
+                                     "Display information about the selected tile.",
+                                     df_probe));
     commands.push_back(PluginCommand("cprobe",
-                                     "A creature probe",
-                                     df_cprobe,
-                                     false,
-                                     "Select a creature to view its properties.\n"));
+                                     "Display information about the selected creature.",
+                                     df_cprobe));
     commands.push_back(PluginCommand("bprobe",
-                                     "A simple building probe",
-                                     df_bprobe,
-                                     false,
-                                     "Select a building to view its properties.\n"));
+                                     "Display information about the selected building.",
+                                     df_bprobe));
     return CR_OK;
 }
 

From 1270cf3f0a6f67685b8d007995edaa1e9ef7bb74 Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Thu, 28 Jul 2022 23:12:11 -0700
Subject: [PATCH 380/854] update docs for prospector

---
 docs/plugins/prospector.rst | 59 +++++++++++++++++++++----------------
 plugins/prospector.cpp      | 43 ++-------------------------
 2 files changed, 36 insertions(+), 66 deletions(-)

diff --git a/docs/plugins/prospector.rst b/docs/plugins/prospector.rst
index 03dd193f8..95436abec 100644
--- a/docs/plugins/prospector.rst
+++ b/docs/plugins/prospector.rst
@@ -1,43 +1,50 @@
 .. _prospect:
 
-prospect
-========
+prospector
+==========
+Tags:
+:dfhack-keybind:`prospect`
 
-**Usage:**
+Shows a summary of resources that exist on the map or an estimate of resources
+available in the selected embark area.
 
-    ``prospect [all|hell] [<options>]``
+Usage::
 
-Shows a summary of resources that exist on the map. By default, only the visible
-part of the map is scanned. Include the ``all`` keyword if you want ``prospect``
-to scan the whole map as if it were revealed. Use ``hell`` instead of ``all`` if
-you also want to see the Z range of HFS tubes in the 'features' report section.
+    prospect [all|hell] [<options>]
 
-**Options:**
+By default, only the visible part of the map is scanned. Include the ``all``
+keyword if you want ``prospect`` to scan the whole map as if it were revealed.
+Use ``hell`` instead of ``all`` if you also want to see the Z range of HFS
+tubes in the 'features' report section.
 
-:``-h``, ``--help``:
-    Shows this help text.
-:``-s``, ``--show <sections>``:
-    Shows only the named comma-separated list of report sections. Report section
-    names are: summary, liquids, layers, features, ores, gems, veins, shrubs,
-    and trees. If run during pre-embark, only the layers, ores, gems, and veins
-    report sections are available.
-:``-v``, ``--values``:
-    Includes material value in the output. Most useful for the 'gems' report
-    section.
-
-**Examples:**
+Examples
+--------
 
 ``prospect all``
     Shows the entire report for the entire map.
 
 ``prospect hell --show layers,ores,veins``
     Shows only the layers, ores, and other vein stone report sections, and
-    includes information on HFS tubes when a fort is loaded.
+    includes information on HFS tubes (if run on a fortress map and not the
+    pre-embark screen).
 
 ``prospect all -sores``
     Show only information about ores for the pre-embark or fortress map report.
 
-**Pre-embark estimate:**
+Options
+-------
+
+``-s``, ``--show <sections>``
+    Shows only the named comma-separated list of report sections. Report section
+    names are: summary, liquids, layers, features, ores, gems, veins, shrubs,
+    and trees. If run during pre-embark, only the layers, ores, gems, and veins
+    report sections are available.
+``-v``, ``--values``
+    Includes material value in the output. Most useful for the 'gems' report
+    section.
+
+Pre-embark estimate
+-------------------
 
 If prospect is called during the embark selection screen, it displays an
 estimate of layer stone availability. If the ``all`` keyword is specified, it
@@ -48,6 +55,6 @@ the embark rectangle.
 
     The results of pre-embark prospect are an *estimate*, and can at best be
     expected to be somewhere within +/- 30% of the true amount; sometimes it
-    does a lot worse. Especially, it is not clear how to precisely compute how
-    many soil layers there will be in a given embark tile, so it can report a
-    whole extra layer, or omit one that is actually present.
+    does a lot worse. In particular, it is not clear how to precisely compute
+    how many soil layers there will be in a given embark tile, so it can report
+    a whole extra layer, or omit one that is actually present.
diff --git a/plugins/prospector.cpp b/plugins/prospector.cpp
index 0516dd552..e75c967dc 100644
--- a/plugins/prospector.cpp
+++ b/plugins/prospector.cpp
@@ -260,46 +260,9 @@ command_result prospector (color_ostream &out, vector <string> & parameters);
 DFhackCExport command_result plugin_init ( color_ostream &out, std::vector <PluginCommand> &commands)
 {
     commands.push_back(PluginCommand(
-        "prospect", "Show stats of available raw resources.",
-        prospector, false,
-    "  prospect [all|hell] [<options>]\n"
-    "\n"
-    "  Shows a summary of resources that exist on the map. By default,\n"
-    "  only the visible part of the map is scanned. Include the 'all' keyword\n"
-    "  if you want prospect to scan the whole map as if it were revealed.\n"
-    "  Use 'hell' instead of 'all' if you also want to see the Z range of HFS\n"
-    "  tubes in the 'features' report section.\n"
-    "\n"
-    "Options:\n"
-    "  -h,--help\n"
-    "    Shows this help text.\n"
-    "  -s,--show <sections>\n"
-    "    Shows only the named comma-separated list of report sections.\n"
-    "    Report section names are: summary, liquids, layers, features, ores,\n"
-    "    gems, veins, shrubs, and trees. If run during pre-embark, only the\n"
-    "    layers, ores, gems, and veins report sections are available.\n"
-    "  -v,--values\n"
-    "    Includes material value in the output. Most useful for the 'gems'\n"
-    "    report section.\n"
-    "\n"
-    "Examples:\n"
-    "  prospect all\n"
-    "    Shows the entire report for the entire map.\n"
-    "\n"
-    "  prospect hell --show layers,ores,veins\n"
-    "    Shows only the layers, ores, and other vein stone report sections,\n"
-    "    and includes information on HFS tubes when a fort is loaded.\n"
-    "\n"
-    "  prospect all -sores\n"
-    "    Show only information about ores for the pre-embark or fortress map\n"
-    "    report.\n"
-    "\n"
-    "Pre-embark estimate:\n"
-    "  If called during the embark selection screen, displays a rough\n"
-    "  estimate of layer stone availability. If the 'all' keyword is\n"
-    "  specified, also estimates ores, gems, and other vein material. The\n"
-    "  estimate covers all tiles of the embark rectangle.\n"
-    ));
+        "prospect",
+        "Show raw resources available on the map.",
+        prospector));
     return CR_OK;
 }
 

From e513253d8d9b7b4b9c78a2dd18c945ce19575191 Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Thu, 28 Jul 2022 23:20:24 -0700
Subject: [PATCH 381/854] update docs for regrass

---
 docs/plugins/regrass.rst | 13 ++++++++++++-
 plugins/regrass.cpp      |  6 ++++--
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/docs/plugins/regrass.rst b/docs/plugins/regrass.rst
index f3d00d8e1..d47e98d19 100644
--- a/docs/plugins/regrass.rst
+++ b/docs/plugins/regrass.rst
@@ -1,3 +1,14 @@
 regrass
 =======
-Regrows all the grass. Not much to it ;)
+Tags:
+:dfhack-keybind:`regrass`
+
+Regrows all the grass. Use this command if your grazers have eaten everything
+down to the dirt.
+
+Usage::
+
+    regrass [max]
+
+Specify the 'max' option to pack more grass onto a tile than what the game
+normally allows to give your grazers extra chewing time.
diff --git a/plugins/regrass.cpp b/plugins/regrass.cpp
index 0cac5bd77..5d2a6450c 100644
--- a/plugins/regrass.cpp
+++ b/plugins/regrass.cpp
@@ -29,8 +29,10 @@ command_result df_regrass (color_ostream &out, vector <string> & parameters);
 
 DFhackCExport command_result plugin_init (color_ostream &out, std::vector<PluginCommand> &commands)
 {
-    commands.push_back(PluginCommand("regrass", "Regrows surface grass.", df_regrass, false,
-        "Specify parameter 'max' to set all grass types to full density, otherwise only one type of grass will be restored per tile.\n"));
+    commands.push_back(PluginCommand(
+        "regrass",
+        "Regrows surface grass.",
+        df_regrass));
     return CR_OK;
 }
 

From 7a4e8ea18ef0f4b2fde767c36add8f2fade839a0 Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Fri, 29 Jul 2022 16:05:49 -0700
Subject: [PATCH 382/854] some plugins can't be directly enabled by the user

---
 docs/plugins/RemoteFortressReader.rst |  2 --
 docs/plugins/autoclothing.rst         |  9 +++++----
 docs/plugins/autogems.rst             |  3 ++-
 docs/plugins/burrows.rst              |  6 +-----
 docs/plugins/power-meter.rst          | 13 +++----------
 5 files changed, 11 insertions(+), 22 deletions(-)

diff --git a/docs/plugins/RemoteFortressReader.rst b/docs/plugins/RemoteFortressReader.rst
index 103c904db..f3bf505ac 100644
--- a/docs/plugins/RemoteFortressReader.rst
+++ b/docs/plugins/RemoteFortressReader.rst
@@ -10,8 +10,6 @@ remote fortress visualization. See :forums:`Armok Vision <146473>`.
 
 Usage:
 
-``enable RemoteFortressReader``
-    Enable the plugin.
 ``RemoteFortressReader_version``
     Print the loaded RemoteFortressReader version.
 ``load-art-image-chunk <chunk id>``
diff --git a/docs/plugins/autoclothing.rst b/docs/plugins/autoclothing.rst
index bbfe14cc9..2e0d03ec1 100644
--- a/docs/plugins/autoclothing.rst
+++ b/docs/plugins/autoclothing.rst
@@ -9,14 +9,15 @@ set how many of each clothing type every citizen should have.
 
 Usage::
 
-    enable autoclothing
-    autoclothing <material> <item> [number]
+    autoclothing
+    autoclothing <material> <item> [quantity]
 
 ``material`` can be "cloth", "silk", "yarn", or "leather". The ``item`` can be
 anything your civilization can produce, such as "dress" or "mitten".
 
-When invoked without a number, it shows the current configuration for that
-material and item.
+When invoked without parameters, it shows a summary of all managed clothing
+orders. When invoked with a material and item, but without a quantity, it shows
+the current configuration for that material and item.
 
 Examples
 --------
diff --git a/docs/plugins/autogems.rst b/docs/plugins/autogems.rst
index 72b850754..ee1bc8be6 100644
--- a/docs/plugins/autogems.rst
+++ b/docs/plugins/autogems.rst
@@ -10,7 +10,8 @@ orders for cutting them at a Jeweler's Workshop.
 Usage:
 
 ``enable autogems``
-    Enables the plugin
+    Enables the plugin and starts autocutting gems according to its
+    configuration.
 ``autogems-reload``
     :index:`Reloads the autogems configuration file.
     <autogems-reload; Reloads the autogems configuration file.>` You might need
diff --git a/docs/plugins/burrows.rst b/docs/plugins/burrows.rst
index 733f784d0..29b81330d 100644
--- a/docs/plugins/burrows.rst
+++ b/docs/plugins/burrows.rst
@@ -15,15 +15,11 @@ You can also use the ``burrow`` command to
 
 Usage:
 
-``enable burrows``
-    Enable the plugin for the auto-grow feature (see
-    ``burrow enable auto-grow`` below)
 ``burrow enable auto-grow``
     When a wall inside a burrow with a name ending in '+' is dug out, the burrow
     will be extended to newly-revealed adjacent walls. This final '+' may be
     omitted in burrow name args of other ``burrows`` commands. Note that digging
-    1-wide corridors with the miner inside the burrow is SLOW. Be sure to also
-    run ``enable burrows`` for this feature to work.
+    1-wide corridors with the miner inside the burrow is SLOW.
 ``burrow disable auto-grow``
     Disables auto-grow processing.
 ``burrow clear-unit <burrow> [<burrow> ...]``
diff --git a/docs/plugins/power-meter.rst b/docs/plugins/power-meter.rst
index 9443f2a93..e099a7903 100644
--- a/docs/plugins/power-meter.rst
+++ b/docs/plugins/power-meter.rst
@@ -2,13 +2,6 @@ power-meter
 ===========
 Tags:
 
-Provides the backend for `gui/power-meter`.
-
-Usage::
-
-    enable power-meter
-
-The power-meter plugin implements a modified pressure plate that detects power being
-supplied to gear boxes built in the four adjacent N/S/W/E tiles.
-
-The configuration front-end is implemented by `gui/power-meter`.
+Allows presure plates to measure power. If you run `gui/power-meter` while
+building a pressure plate, the pressure plate can be modified to detects power
+being supplied to gear boxes built in the four adjacent N/S/W/E tiles.

From eef7812bf67fa828cb595827b8be629e4d20f5ee Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Fri, 29 Jul 2022 16:08:00 -0700
Subject: [PATCH 383/854] update docs for rename

---
 docs/plugins/rename.rst | 41 ++++++++++++++++++++++++++---------------
 plugins/rename.cpp      | 13 +++----------
 2 files changed, 29 insertions(+), 25 deletions(-)

diff --git a/docs/plugins/rename.rst b/docs/plugins/rename.rst
index 55534e636..0c4bc9ddb 100644
--- a/docs/plugins/rename.rst
+++ b/docs/plugins/rename.rst
@@ -1,19 +1,30 @@
 rename
 ======
-Allows renaming various things.  Use `gui/rename` for an in-game interface.
+Tags:
+:dfhack-keybind:`rename`
 
-Options:
+Easily rename things.  Use `gui/rename` for an in-game interface.
 
-``rename squad <index> "name"``
-  Rename squad by index to 'name'.
-``rename hotkey <index> \"name\"``
-  Rename hotkey by index. This allows assigning
-  longer commands to the DF hotkeys.
-``rename unit "nickname"``
-  Rename a unit/creature highlighted in the DF user interface.
-``rename unit-profession "custom profession"``
-  Change proffession name of the highlighted unit/creature.
-``rename building "name"``
-  Set a custom name for the selected building.
-  The building must be one of stockpile, workshop, furnace, trap,
-  siege engine or an activity zone.
+Usage:
+
+``rename squad <ordinal> "<name>"``
+    Rename the indicated squad. The ordinal is the number that corresponds to
+    the list of squads in the squads menu (:kbd:`s`). The first squad is ordinal
+    ``1``.
+``rename hotkey <ordinal> "<name>"``
+    Rename the indicated hotkey. The ordinal the the number that corresponds to
+    the list of hotkeys in the hotkeys menu (:kbd:`H`). The first hotkey is
+    ordinal ``1``.
+``rename unit "<name>"``
+    Give the selected unit the given nickname.
+``rename unit-profession "<name>"``
+    Give the selected unit the given profession name.
+``rename building "<name>"``
+    Set a custom name to the selected building. The building must be a
+    stockpile, workshop, furnace, trap, siege engine, or activity zone.
+
+Example
+-------
+
+``rename squad 1 "The Whiz Bonkers"``
+    Rename the first squad to The Whiz Bonkers.
diff --git a/plugins/rename.cpp b/plugins/rename.cpp
index 0ef3e02d5..7c46fc908 100644
--- a/plugins/rename.cpp
+++ b/plugins/rename.cpp
@@ -61,16 +61,9 @@ DFhackCExport command_result plugin_init (color_ostream &out, std::vector <Plugi
 {
     if (world && ui) {
         commands.push_back(PluginCommand(
-            "rename", "Rename various things.", rename, false,
-            "  rename squad <index> \"name\"\n"
-            "  rename hotkey <index> \"name\"\n"
-            "    (identified by ordinal index)\n"
-            "  rename unit \"nickname\"\n"
-            "  rename unit-profession \"custom profession\"\n"
-            "    (a unit must be highlighted in the ui)\n"
-            "  rename building \"nickname\"\n"
-            "    (a building must be highlighted via 'q')\n"
-        ));
+            "rename",
+            "Easily rename things.",
+            rename));
 
         if (Core::getInstance().isWorldLoaded())
             plugin_onstatechange(out, SC_WORLD_LOADED);

From a7011421b4a59f2cb472397744d2a88d084ac741 Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Fri, 29 Jul 2022 16:31:37 -0700
Subject: [PATCH 384/854] update docs for rendermax

---
 docs/plugins/rendermax.rst      | 36 +++++++++++++++++++++++----------
 plugins/rendermax/rendermax.cpp | 15 ++++----------
 2 files changed, 29 insertions(+), 22 deletions(-)

diff --git a/docs/plugins/rendermax.rst b/docs/plugins/rendermax.rst
index a173a75db..641a7a248 100644
--- a/docs/plugins/rendermax.rst
+++ b/docs/plugins/rendermax.rst
@@ -1,18 +1,32 @@
 rendermax
 =========
-A collection of renderer replacing/enhancing filters. For better effect try changing the
-black color in palette to non totally black. See :forums:`128487` for more info.
+Tags:
+:dfhack-keybind:`rendermax`
 
-Options:
+Modify the map lighting. This plugin provides a collection of OpenGL lighting
+filters that affect how the map is drawn to the screen.
 
-:trippy:                        Randomizes the color of each tiles. Used for fun, or testing.
-:light:                         Enable lighting engine.
-:light reload:                  Reload the settings file.
-:light sun <x>|cycle:           Set time to <x> (in hours) or set it to df time cycle.
-:occlusionON, occlusionOFF:     Show debug occlusion info.
-:disable:                       Disable any filter that is enabled.
+Usage:
 
-An image showing lava and dragon breath. Not pictured here: sunlight, shining items/plants,
-materials that color the light etc...
+``rendermax light``
+    Light the map tiles realisitically. Outside tiles are light during the day
+    and dark at night. Inside tiles are always dark unless a nearby unit is
+    lighting it up, as if they were carrying torches.
+``rendermax light sun <hour>|cycle``
+    Set the outside lighting to correspond with the specified day hour (1-24),
+    or specify ``cycle`` to have the lighting follow the sun (which is the
+    default).
+``rendermax light reload``
+    Reload the lighting settings file.
+``rendermax trippy``
+    Randomize the color of each tile. Used for fun, or testing.
+``rendermax disable``
+    Disable any ``rendermax`` lighting filters that are currently active.
+
+An image showing lava and dragon breath. Not pictured here: sunlight, shining
+items/plants, materials that color the light etc.
 
 .. image:: ../images/rendermax.png
+
+For better visibility, try changing the black color in palette to non totally
+black. See :forums:`128487` for more info.
diff --git a/plugins/rendermax/rendermax.cpp b/plugins/rendermax/rendermax.cpp
index d391bdb36..b7c703e09 100644
--- a/plugins/rendermax/rendermax.cpp
+++ b/plugins/rendermax/rendermax.cpp
@@ -49,16 +49,9 @@ static command_result rendermax(color_ostream &out, vector <string> & parameters
 DFhackCExport command_result plugin_init (color_ostream &out, std::vector <PluginCommand> &commands)
 {
     commands.push_back(PluginCommand(
-        "rendermax", "switch rendering engine.", rendermax, false,
-        "  rendermax trippy\n"
-        "  rendermax truecolor red|green|blue|white\n"
-        "  rendermax lua\n"
-        "  rendermax light - lighting engine\n"
-        "  rendermax light reload - reload the settings file\n"
-        "  rendermax light sun <x>|cycle - set time to x (in hours) or cycle (same effect if x<0)\n"
-        "  rendermax light occlusionON|occlusionOFF - debug the occlusion map\n"
-        "  rendermax disable\n"
-        ));
+        "rendermax",
+        "Modify the map lighting.",
+        rendermax));
     return CR_OK;
 }
 
@@ -331,7 +324,7 @@ static command_result rendermax(color_ostream &out, vector <string> & parameters
         return CR_WRONG_USAGE;
     if(!enabler->renderer->uses_opengl())
     {
-        out.printerr("Sorry, this plugin needs open gl enabled printmode. Try STANDARD or other non-2D\n");
+        out.printerr("Sorry, this plugin needs open GL-enabled printmode. Try STANDARD or other non-2D.\n");
         return CR_FAILURE;
     }
     string cmd=parameters[0];

From c6d5fcb37873438c4851d0ff823192b50f744466 Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Fri, 29 Jul 2022 17:12:01 -0700
Subject: [PATCH 385/854] update docs for resume

---
 docs/plugins/resume.rst | 15 +++++++++++++--
 plugins/resume.cpp      | 15 +++------------
 2 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/docs/plugins/resume.rst b/docs/plugins/resume.rst
index ccca39e28..d8feb0896 100644
--- a/docs/plugins/resume.rst
+++ b/docs/plugins/resume.rst
@@ -1,4 +1,15 @@
 resume
 ======
-Allows automatic resumption of suspended constructions, along with colored
-UI hints for construction status.
+Tags:
+:dfhack-keybind:``
+
+Color planned buildings based on their suspend status. When enabled, this plugin
+will display a colored 'X' over suspended buildings. When run as a command, it
+can resume all suspended building jobs, allowing you to quickly recover if a
+bunch of jobs were suspended due to the workers getting scared off by wildlife
+or items temporarily blocking buildling sites.
+
+Usage::
+
+    enable resume
+    resume all
diff --git a/plugins/resume.cpp b/plugins/resume.cpp
index 6b8ad5e7d..21a4b521e 100644
--- a/plugins/resume.cpp
+++ b/plugins/resume.cpp
@@ -302,18 +302,9 @@ DFhackCExport command_result plugin_init ( color_ostream &out, std::vector <Plug
 {
     commands.push_back(
         PluginCommand(
-        "resume", "Display and easily resume suspended constructions",
-        resume_cmd, false,
-        "resume show\n"
-        "  Show overlay when paused:\n"
-        "    Yellow: Suspended construction\n"
-        "    Red: Suspended after resume attempt, possibly stuck\n"
-        "    Green: Planned building waiting for materials\n"
-        "resume hide\n"
-        "  Hide overlay\n"
-        "resume all\n"
-        "  Resume all suspended building constructions\n"
-        ));
+        "resume",
+        "Mark suspended constructions on the map and easily resume them.",
+        resume_cmd));
 
     return CR_OK;
 }

From 438293c0a0d0087d5bd8e912328adc20da348f40 Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Fri, 29 Jul 2022 17:12:15 -0700
Subject: [PATCH 386/854] update docs for reveal

---
 docs/plugins/reveal.rst | 58 +++++++++++++++++++++++++----------------
 plugins/reveal.cpp      | 42 ++++++++++++++++-------------
 2 files changed, 59 insertions(+), 41 deletions(-)

diff --git a/docs/plugins/reveal.rst b/docs/plugins/reveal.rst
index 42f490aa4..f8611d033 100644
--- a/docs/plugins/reveal.rst
+++ b/docs/plugins/reveal.rst
@@ -2,29 +2,41 @@
 
 reveal
 ======
-This reveals the map. By default, HFS will remain hidden so that the demons
-don't spawn. You can use ``reveal hell`` to reveal everything. With hell revealed,
-you won't be able to unpause until you hide the map again. If you really want
-to unpause with hell revealed, use ``reveal demons``.
+Tags:
+:dfhack-keybind:`reveal`
+:dfhack-keybind:`unreveal`
+:dfhack-keybind:`revforget`
+:dfhack-keybind:`revtoggle`
+:dfhack-keybind:`revflood`
+:dfhack-keybind:`nopause`
 
-Reveal also works in adventure mode, but any of its effects are negated once
-you move. When you use it this way, you don't need to run ``unreveal``.
+Reveals the map. This reveals all z-layers in fort mode. It also works in
+adventure mode, but any of its effects are negated once you move. When you use
+it this way, you don't need to run ``unreveal`` to hide the map again.
 
-Usage and related commands:
+Usage:
 
-:reveal:        Reveal the whole map, except for HFS to avoid demons spawning
-:reveal hell:   Also show hell, but requires ``unreveal`` before unpausing
-:reveal demon:  Reveals everything and allows unpausing - good luck!
-:unreveal:      Reverts the effects of ``reveal``
-:revtoggle:     Switches between ``reveal`` and ``unreveal``
-:revflood:      Hide everything, then reveal tiles with a path to the cursor.
-                Note that tiles behind constructed walls are also revealed as a
-                workaround for :bug:`1871`.
-:revforget:     Discard info about what was visible before revealing the map.
-                Only useful where (e.g.) you abandoned with the fort revealed
-                and no longer want the data.
-
-nopause
-=======
-Disables pausing (both manual and automatic) with the exception of pause forced
-by `reveal` ``hell``. This is nice for digging under rivers.
+``reveal [hell|demon]``
+    Reveal the whole map. If ``hell`` is specified, also reveal HFS areas, but
+    you are required to run ``unreveal`` before unpausing is allowed in order
+    to prevent the demons from spawning. If you really want to unpause with hell
+    revealed, specify ``demon`` instead of ``hell``.
+``unreveal``
+    Reverts the effects of ``reveal``.
+``revtoggle``
+    Switches between ``reveal`` and ``unreveal``. Convenient to bind to a
+    hotkey.
+``revforget``
+    Discard info about what was visible before revealing the map. Only useful
+    where (for example) you abandoned with the fort revealed and no longer need
+    the saved map data when you load a new fort.
+``revflood``
+    Hide everything, then reveal tiles with a path to the cursor. This allows
+    reparing maps that you accidentally saved while they were revealed. Note
+    that tiles behind constructed walls are also revealed as a workaround for
+    :bug:`1871`.
+``nopause 1|0``
+    Disables pausing (both manual and automatic) with the exception of the pause
+    forced by `reveal` ``hell``. This is nice for digging under rivers. Use
+    ``nopause 1`` to prevent pausing and ``nopause 0`` to allow pausing like
+    normal.
diff --git a/plugins/reveal.cpp b/plugins/reveal.cpp
index 39720926c..8d76bd54b 100644
--- a/plugins/reveal.cpp
+++ b/plugins/reveal.cpp
@@ -82,24 +82,30 @@ command_result nopause(color_ostream &out, vector<string> & params);
 
 DFhackCExport command_result plugin_init ( color_ostream &out, vector <PluginCommand> &commands)
 {
-    commands.push_back(PluginCommand("reveal","Reveal the map.",reveal,false,
-        "Reveals the map, by default ignoring hell.\n"
-        "Options:\n"
-        "hell     - also reveal hell, while forcing the game to pause.\n"
-        "demon    - reveal hell, do not pause.\n"));
-    commands.push_back(PluginCommand("unreveal","Revert the map to its previous state.",unreveal,false,
-        "Reverts the previous reveal operation, hiding the map again.\n"));
-    commands.push_back(PluginCommand("revtoggle","Reveal/unreveal depending on state.",revtoggle,false,
-        "Toggles between reveal and unreveal.\n"));
-    commands.push_back(PluginCommand("revflood","Hide all, and reveal tiles reachable from the cursor.",revflood,false,
-        "This command hides the whole map. Then, starting from the cursor,\n"
-        "reveals all accessible tiles. Allows repairing perma-revealed maps.\n"
-        "Note that constructed walls are considered passable to work around DF bug 1871.\n"));
-    commands.push_back(PluginCommand("revforget", "Forget the current reveal data.",revforget,false,
-        "Forget the current reveal data, allowing to use reveal again.\n"));
-    commands.push_back(PluginCommand("nopause","Disable manual and automatic pausing.",nopause,false,
-        "Disable pausing (doesn't affect pause forced by reveal).\n"
-        "Activate with 'nopause 1', deactivate with 'nopause 0'.\n"));
+    commands.push_back(PluginCommand(
+        "reveal",
+        "Reveal the map.",
+        reveal));
+    commands.push_back(PluginCommand(
+        "unreveal",
+        "Revert a revealed map to its unrevealed state.",
+        unreveal));
+    commands.push_back(PluginCommand(
+        "revtoggle",
+        "Switch betwen reveal and unreveal.",
+        revtoggle));
+    commands.push_back(PluginCommand(
+        "revflood",
+        "Hide all, then reveal tiles reachable from the cursor.",
+        revflood));
+    commands.push_back(PluginCommand(
+        "revforget",
+        "Forget the current reveal data.",
+        revforget));
+    commands.push_back(PluginCommand(
+        "nopause",
+        "Disable manual and automatic pausing.",
+        nopause));
     return CR_OK;
 }
 

From aa3a389b6fa06b08e12f365ac8789cb9b84a32b2 Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Fri, 29 Jul 2022 17:37:50 -0700
Subject: [PATCH 387/854] fix parsing bold text and indenting of ls output

---
 library/lua/helpdb.lua | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/library/lua/helpdb.lua b/library/lua/helpdb.lua
index 2aee005ee..cf8e86af5 100644
--- a/library/lua/helpdb.lua
+++ b/library/lua/helpdb.lua
@@ -179,14 +179,15 @@ local function update_entry(entry, iterator, opts)
         end
         if not header_found and line:find('%w') then
             header_found = true
-        elseif not tags_found and line:find('^Tags: [%w, ]+$') then
-            local _,_,tags = line:trim():find('Tags: (.*)')
+        elseif not tags_found and line:find('^[*]*Tags:[*]* [%w, ]+$') then
+            local _,_,tags = line:trim():find('[*]*Tags:[*]* *(.*)')
             entry.tags = {}
             for _,tag in ipairs(tags:split('[ ,]+')) do
                 entry.tags[tag] = true
             end
             tags_found = true
-        elseif not short_help_found and not line:find('^Keybinding:') and
+        elseif not short_help_found and
+                not line:find('^[*]*Keybinding:') and
                 line:find('%w') then
             if in_short_help then
                 entry.short_help = entry.short_help .. ' ' .. line
@@ -646,9 +647,11 @@ function help(entry)
     print(get_entry_long_help(entry))
 end
 
--- prints col1 (width 20), a 2 space gap, and col2 (width 58)
--- if col1text is longer than 20 characters, col2text is printed on the next
--- line. if col2text is longer than 58 characters, it is wrapped.
+-- prints col1text (width 21), a one space gap, and col2 (width 58)
+-- if col1text is longer than 21 characters, col2text is printed starting on the
+-- next line. if col2text is longer than 58 characters, it is wrapped. col2text
+-- lines on lines below the col1text output are indented by one space further
+-- than the col2text on the first line.
 local COL1WIDTH, COL2WIDTH = 20, 58
 local function print_columns(col1text, col2text)
     col2text = col2text:wrap(COL2WIDTH)
@@ -656,12 +659,14 @@ local function print_columns(col1text, col2text)
     for line in col2text:gmatch('[^'..NEWLINE..']*') do
         table.insert(wrapped_col2, line)
     end
+    local col2_start_line = 1
     if #col1text > COL1WIDTH then
         print(col1text)
     else
-        print(('%-'..COL1WIDTH..'s  %s'):format(col1text, wrapped_col2[1]))
+        print(('%-'..COL1WIDTH..'s %s'):format(col1text, wrapped_col2[1]))
+        col2_start_line = 2
     end
-    for i=2,#wrapped_col2 do
+    for i=col2_start_line,#wrapped_col2 do
         print(('%'..COL1WIDTH..'s  %s'):format(' ', wrapped_col2[i]))
     end
 end

From f785a910ffd492f198fe5ad09d185a3cc7d94a98 Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Fri, 29 Jul 2022 17:38:23 -0700
Subject: [PATCH 388/854] update docs for search

---
 docs/plugins/search.rst | 48 ++++++++++++++++++++++-------------------
 1 file changed, 26 insertions(+), 22 deletions(-)

diff --git a/docs/plugins/search.rst b/docs/plugins/search.rst
index 57b9e5df4..c8f5d68b3 100644
--- a/docs/plugins/search.rst
+++ b/docs/plugins/search.rst
@@ -1,40 +1,44 @@
-
 .. _search-plugin:
 
 search
 ======
-The search plugin adds search to the Stocks, Animals, Trading, Stockpile,
-Noble (assignment candidates), Military (position candidates), Burrows
-(unit list), Rooms, Announcements, Job List and Unit List screens.
+Tags:
+
+The search plugin adds search capabilities to the Stocks, Animals, Trading,
+Stockpile, Noble (assignment candidates), Military (position candidates),
+Burrows (unit list), Rooms, Announcements, Job List, and Unit List screens.
+
+Usage::
+
+    enable search
 
 .. image:: ../images/search.png
 
 Searching works the same way as the search option in :guilabel:`Move to Depot`.
-You will see the Search option displayed on screen with a hotkey (usually :kbd:`s`).
-Pressing it lets you start typing a query and the relevant list will start
-filtering automatically.
+You will see the Search option displayed on screen with a hotkey
+(usually :kbd:`s`). Pressing it lets you start typing a query and the relevant
+list will start filtering automatically.
 
-Pressing :kbd:`Enter`, :kbd:`Esc` or the arrow keys will return you to browsing the now
-filtered list, which still functions as normal. You can clear the filter
-by either going back into search mode and backspacing to delete it, or
-pressing the "shifted" version of the search hotkey while browsing the
-list (e.g. if the hotkey is :kbd:`s`, then hitting :kbd:`Shift`:kbd:`s` will clear any
-filter).
+Pressing :kbd:`Enter`, :kbd:`Esc` or the arrow keys will return you to browsing
+the now filtered list, which still functions as normal. You can clear the filter
+by either going back into search mode and backspacing to delete it, or pressing
+the "shifted" version of the search hotkey while browsing the list (e.g. if the
+hotkey is :kbd:`s`, then hitting :kbd:`Shift`:kbd:`s` will clear any filter).
 
 Leaving any screen automatically clears the filter.
 
-In the Trade screen, the actual trade will always only act on items that
-are actually visible in the list; the same effect applies to the Trade
-Value numbers displayed by the screen. Because of this, the :kbd:`t` key is
-blocked while search is active, so you have to reset the filters first.
-Pressing :kbd:`Alt`:kbd:`C` will clear both search strings.
+In the Trade screen, the actual trade will always only act on items that are
+actually visible in the list; the same effect applies to the Trade Value numbers
+displayed by the screen. Because of this, the :kbd:`t` key is blocked while
+search is active, so you have to reset the filters first. Pressing
+:kbd:`Alt`:kbd:`C` will clear both search strings.
 
 In the stockpile screen the option only appears if the cursor is in the
 rightmost list:
 
 .. image:: ../images/search-stockpile.png
 
-Note that the 'Permit XXX'/'Forbid XXX' keys conveniently operate only
-on items actually shown in the rightmost list, so it is possible to select
-only fat or tallow by forbidding fats, then searching for fat/tallow, and
-using Permit Fats again while the list is filtered.
+Note that the 'Permit XXX'/'Forbid XXX' keys conveniently operate only on items
+actually shown in the rightmost list, so it is possible to select only fat or
+tallow by forbidding fats, then searching for fat/tallow, and using Permit Fats
+again while the list is filtered.

From 8cc0cee9a85664129aad3a46b1212168bf9b4c1a Mon Sep 17 00:00:00 2001
From: Myk <myk002@yahoo.com>
Date: Sat, 30 Jul 2022 07:37:46 -0700
Subject: [PATCH 389/854] Fix grammar in power meter docs

---
 docs/plugins/power-meter.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/plugins/power-meter.rst b/docs/plugins/power-meter.rst
index e099a7903..7186a413d 100644
--- a/docs/plugins/power-meter.rst
+++ b/docs/plugins/power-meter.rst
@@ -2,6 +2,6 @@ power-meter
 ===========
 Tags:
 
-Allows presure plates to measure power. If you run `gui/power-meter` while
-building a pressure plate, the pressure plate can be modified to detects power
+Allow presure plates to measure power. If you run `gui/power-meter` while
+building a pressure plate, the pressure plate can be modified to detect power
 being supplied to gear boxes built in the four adjacent N/S/W/E tiles.

From feda5851e995ebce3bf983d844b324aa469869b5 Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Sun, 31 Jul 2022 13:28:01 -0700
Subject: [PATCH 390/854] add example for ruby plugin

---
 docs/plugins/ruby.rst | 21 +++++++++++++++++++--
 1 file changed, 19 insertions(+), 2 deletions(-)

diff --git a/docs/plugins/ruby.rst b/docs/plugins/ruby.rst
index bdd5521a4..beb9be4a1 100644
--- a/docs/plugins/ruby.rst
+++ b/docs/plugins/ruby.rst
@@ -2,5 +2,22 @@
 
 ruby
 ====
-Ruby language plugin, which evaluates the following arguments as a ruby string.
-Best used as ``:rb [string]``, for the special parsing mode.  Alias ``rb_eval``.
+Tags:
+:dfhack-keybind:`rb`
+:dfhack-keybind:`rb_eval`
+
+Allow Ruby scripts to be executed. When invoked as a command, you can Eval() a
+ruby string.
+
+Usage::
+
+    enable ruby
+    rb "ruby expression"
+    rb_eval "ruby expression"
+    :rb ruby expression
+
+Example
+-------
+
+``:rb puts df.unit_find(:selected).name``
+    Print the name of the selected unit.

From edb7bd3168ba633681a3d16890891d1b90c698e5 Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Sun, 31 Jul 2022 13:28:29 -0700
Subject: [PATCH 391/854] update docs for seedwatch

---
 docs/plugins/seedwatch.rst | 54 ++++++++++++++++++++++++------------
 plugins/seedwatch.cpp      | 56 +++++---------------------------------
 2 files changed, 43 insertions(+), 67 deletions(-)

diff --git a/docs/plugins/seedwatch.rst b/docs/plugins/seedwatch.rst
index 1d5ab9e62..2b04b3fa6 100644
--- a/docs/plugins/seedwatch.rst
+++ b/docs/plugins/seedwatch.rst
@@ -1,27 +1,45 @@
 seedwatch
 =========
-Watches the numbers of seeds available and enables/disables seed and plant cooking.
+Tags:
+:dfhack-keybind:`seedwatch`
 
-Each plant type can be assigned a limit. If their number falls below that limit,
-the plants and seeds of that type will be excluded from cookery.
-If the number rises above the limit + 20, then cooking will be allowed.
+Manages seed and plant cooking based on seed stock levels.
 
-The plugin needs a fortress to be loaded and will deactivate automatically otherwise.
-You have to reactivate with 'seedwatch start' after you load the game.
+Each seed type can be assigned a target. If the number of seeds of that type
+falls below that target, then the plants and seeds of that type will be excluded
+from cookery. If the number rises above the target + 20, then cooking will be
+allowed.
 
-Options:
+The plugin needs a fortress to be loaded and will deactivate automatically
+otherwise. You have to reactivate with ``enable seedwatch`` after you load a
+fort.
 
-:all:       Adds all plants from the abbreviation list to the watch list.
-:start:     Start watching.
-:stop:      Stop watching.
-:info:      Display whether seedwatch is watching, and the watch list.
-:clear:     Clears the watch list.
+Usage:
 
-Examples:
+``enable seedwatch``
+    Start managing seed and plant cooking. By default, no types are watched.
+    You have to add them with further ``seedwatch`` commands.
+``seedwatch <type> <target>``
+    Adds the specifiied type to the watchlist (if it's not already there) and
+    sets the target number of seeds to the specified number. You can pass the
+    keyword ``all`` instead of a specific type to set the target for all types.
+``seedwatch <type>``
+    Removes the specified type from the watch list.
+``seedwatch clear``
+    Clears all types from the watch list.
+``seedwatch info``
+    Display whether seedwatch is enabled and prints out the watch list.
+
+To print out a list of all plant types, you can run this command::
+
+    devel/query --table df.global.world.raws.plants.all --search ^id --maxdepth 1
+
+Examples
+--------
 
-``seedwatch MUSHROOM_HELMET_PLUMP 30``
-    add ``MUSHROOM_HELMET_PLUMP`` to the watch list, limit = 30
-``seedwatch MUSHROOM_HELMET_PLUMP``
-    removes ``MUSHROOM_HELMET_PLUMP`` from the watch list.
 ``seedwatch all 30``
-    adds all plants from the abbreviation list to the watch list, the limit being 30.
+    Adds all seeds to the watch list and sets the targets to 30.
+``seedwatch MUSHROOM_HELMET_PLUMP 50``
+    Add Plump Helmets to the watch list and sets the target to 50.
+``seedwatch MUSHROOM_HELMET_PLUMP``
+    removes Plump Helmets from the watch list.
diff --git a/plugins/seedwatch.cpp b/plugins/seedwatch.cpp
index 478a0899a..17a765bcf 100644
--- a/plugins/seedwatch.cpp
+++ b/plugins/seedwatch.cpp
@@ -49,47 +49,6 @@ bool ignoreSeeds(df::item_flags& f) // seeds with the following flags should not
         f.bits.in_job;
 };
 
-void printHelp(color_ostream &out) // prints help
-{
-    out.print(
-        "Watches the numbers of seeds available and enables/disables seed and plant cooking.\n"
-        "Each plant type can be assigned a limit. If their number falls below,\n"
-        "the plants and seeds of that type will be excluded from cookery.\n"
-        "If the number rises above the limit + %i, then cooking will be allowed.\n", buffer
-        );
-    out.printerr(
-        "The plugin needs a fortress to be loaded and will deactivate automatically otherwise.\n"
-        "You have to reactivate with 'seedwatch start' after you load the game.\n"
-        );
-    out.print(
-        "Options:\n"
-        "seedwatch all   - Adds all plants from the abbreviation list to the watch list.\n"
-        "seedwatch start - Start watching.\n"
-        "seedwatch stop  - Stop watching.\n"
-        "seedwatch info  - Display whether seedwatch is watching, and the watch list.\n"
-        "seedwatch clear - Clears the watch list.\n\n"
-        );
-    if(!abbreviations.empty())
-    {
-        out.print("You can use these abbreviations for the plant tokens:\n");
-        for(map<string, string>::const_iterator i = abbreviations.begin(); i != abbreviations.end(); ++i)
-        {
-            out.print("%s -> %s\n", i->first.c_str(), i->second.c_str());
-        }
-    }
-    out.print(
-        "Examples:\n"
-        "seedwatch MUSHROOM_HELMET_PLUMP 30\n"
-        "  add MUSHROOM_HELMET_PLUMP to the watch list, limit = 30\n"
-        "seedwatch MUSHROOM_HELMET_PLUMP\n"
-        "  removes MUSHROOM_HELMET_PLUMP from the watch list.\n"
-        "seedwatch ph 30\n"
-        "  is the same as 'seedwatch MUSHROOM_HELMET_PLUMP 30'\n"
-        "seedwatch all 30\n"
-        "  adds all plants from the abbreviation list to the watch list, the limit being 30.\n"
-        );
-};
-
 // searches abbreviations, returns expansion if so, returns original if not
 string searchAbbreviations(string in)
 {
@@ -142,8 +101,7 @@ command_result df_seedwatch(color_ostream &out, vector<string>& parameters)
     if(gm.g_mode != game_mode::DWARF || !World::isFortressMode(gm.g_type))
     {
         // just print the help
-        printHelp(out);
-        return CR_OK;
+        return CR_WRONG_USAGE;
     }
 
     string par;
@@ -151,14 +109,12 @@ command_result df_seedwatch(color_ostream &out, vector<string>& parameters)
     switch(parameters.size())
     {
     case 0:
-        printHelp(out);
         return CR_WRONG_USAGE;
 
     case 1:
         par = parameters[0];
         if ((par == "help") || (par == "?"))
         {
-            printHelp(out);
             return CR_WRONG_USAGE;
         }
         else if(par == "start")
@@ -180,11 +136,11 @@ command_result df_seedwatch(color_ostream &out, vector<string>& parameters)
             out.print("seedwatch Info:\n");
             if(running)
             {
-                out.print("seedwatch is supervising.  Use 'seedwatch stop' to stop supervision.\n");
+                out.print("seedwatch is supervising.  Use 'disable seedwatch' to stop supervision.\n");
             }
             else
             {
-                out.print("seedwatch is not supervising.  Use 'seedwatch start' to start supervision.\n");
+                out.print("seedwatch is not supervising.  Use 'enable seedwatch' to start supervision.\n");
             }
             map<int32_t, int16_t> watchMap;
             Kitchen::fillWatchMap(watchMap);
@@ -246,7 +202,6 @@ command_result df_seedwatch(color_ostream &out, vector<string>& parameters)
         }
         break;
     default:
-        printHelp(out);
         return CR_WRONG_USAGE;
         break;
     }
@@ -256,7 +211,10 @@ command_result df_seedwatch(color_ostream &out, vector<string>& parameters)
 
 DFhackCExport command_result plugin_init(color_ostream &out, vector<PluginCommand>& commands)
 {
-    commands.push_back(PluginCommand("seedwatch", "Toggles seed cooking based on quantity available", df_seedwatch));
+    commands.push_back(PluginCommand(
+        "seedwatch",
+        "Toggles seed cooking based on quantity available.",
+        df_seedwatch));
     // fill in the abbreviations map, with abbreviations for the standard plants
     abbreviations["bs"] = "SLIVER_BARB";
     abbreviations["bt"] = "TUBER_BLOATED";

From 8f7a23ee4d1061b20e6eeaf2b133e9cf3b30c2d6 Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Sun, 31 Jul 2022 13:28:41 -0700
Subject: [PATCH 392/854] update docs for showmood

---
 docs/plugins/showmood.rst | 9 ++++++++-
 plugins/showmood.cpp      | 6 ++++--
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/docs/plugins/showmood.rst b/docs/plugins/showmood.rst
index 9276766c4..8afe4c629 100644
--- a/docs/plugins/showmood.rst
+++ b/docs/plugins/showmood.rst
@@ -1,3 +1,10 @@
 showmood
 ========
-Shows all items needed for the currently active strange mood.
+Tags:
+:dfhack-keybind:`showmood`
+
+Shows all items needed for the active strange mood.
+
+Usage::
+
+    showmood
diff --git a/plugins/showmood.cpp b/plugins/showmood.cpp
index c7d620676..abeb2e98e 100644
--- a/plugins/showmood.cpp
+++ b/plugins/showmood.cpp
@@ -297,8 +297,10 @@ command_result df_showmood (color_ostream &out, vector <string> & parameters)
 
 DFhackCExport command_result plugin_init (color_ostream &out, std::vector<PluginCommand> &commands)
 {
-    commands.push_back(PluginCommand("showmood", "Shows items needed for current strange mood.", df_showmood, false,
-        "Run this command without any parameters to display information on the currently active Strange Mood."));
+    commands.push_back(PluginCommand(
+        "showmood",
+        "Shows all items needed for active strange mood.",
+        df_showmood));
     return CR_OK;
 }
 

From a1f937e354678661bc4ca622e45ccfb51ebdbe82 Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Sun, 31 Jul 2022 13:28:55 -0700
Subject: [PATCH 393/854] update docs for siege-engine

---
 docs/plugins/siege-engine.rst | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/docs/plugins/siege-engine.rst b/docs/plugins/siege-engine.rst
index 0e9511d3d..a4cfed2ba 100644
--- a/docs/plugins/siege-engine.rst
+++ b/docs/plugins/siege-engine.rst
@@ -1,12 +1,19 @@
 siege-engine
 ============
-Siege engines in DF haven't been updated since the game was 2D, and can
-only aim in four directions.  To make them useful above-ground,
-this plugin allows you to:
+Tags:
+
+Extend the functionality and usability of siege engines. Siege engines in DF
+haven't been updated since the game was 2D, and can only aim in four
+directions. To make them useful above-ground, this plugin allows you to:
 
 * link siege engines to stockpiles
 * restrict operator skill levels (like workshops)
 * load any object into a catapult, not just stones
 * aim at a rectangular area in any direction, and across Z-levels
 
-The front-end is implemented by `gui/siege-engine`.
+Usage::
+
+    enable siege-engine
+
+You can use the new features by selecting a built siege engine and running
+`gui/siege-engine`.

From 72619148265d8836ecb45f6f8252fd0db077e5ab Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Sun, 31 Jul 2022 13:29:08 -0700
Subject: [PATCH 394/854] update docs for sort

---
 docs/plugins/sort.rst | 62 ++++++++++++++++++++++++++++---------------
 plugins/sort.cpp      | 20 ++------------
 2 files changed, 42 insertions(+), 40 deletions(-)

diff --git a/docs/plugins/sort.rst b/docs/plugins/sort.rst
index cc86b3ddd..12684175f 100644
--- a/docs/plugins/sort.rst
+++ b/docs/plugins/sort.rst
@@ -1,33 +1,51 @@
-sort-items
-==========
-Sort the visible item list::
-
-    sort-items order [order...]
+sort
+====
+Tags:
+:dfhack-keybind:`sort-items`
+:dfhack-keybind:`sort-units`
 
-Sort the item list using the given sequence of comparisons.
-The ``<`` prefix for an order makes undefined values sort first.
-The ``>`` prefix reverses the sort order for defined values.
+Sort the visible item or unit list.
 
-Item order examples::
+Usage::
 
-    description material wear type quality
+    sort-items <property> [<property> ...]
+    sort-units <property> [<property> ...]
 
-The orderings are defined in ``hack/lua/plugins/sort/*.lua``
+Both commands sort the visible list using the given sequence of comparisons.
+Each property can be prefixed with a ``<`` or ``>`` character to indicate
+whether elements that don't have the given property defined go first or last
+(respectively) in the sorted list.
 
-sort-units
-==========
-Sort the visible unit list::
+Examples
+--------
 
-    sort-units order [order...]
+``sort-items material type quality``
+    Sort a list of items by material, then by type, then by quality
+``sort-units profession name``
+    Sort a list of units by profession, then by name
 
-Sort the unit list using the given sequence of comparisons.
-The ``<`` prefix for an order makes undefined values sort first.
-The ``>`` prefix reverses the sort order for defined values.
+Properties
+----------
 
-Unit order examples::
+Items can be sorted by the following properties:
 
-    name age arrival squad squad_position profession
+- ``type``
+- ``description``
+- ``base_quality``
+- ``quality``
+- ``improvement``
+- ``wear``
+- ``material``
 
-The orderings are defined in ``hack/lua/plugins/sort/*.lua``
+Units can be sorted by the following properties:
 
-:dfhack-keybind:`sort-units`
+- ``name``
+- ``age``
+- ``arrival``
+- ``noble``
+- ``profession``
+- ``profession_class``
+- ``race``
+- ``squad``
+- ``squad_position``
+- ``happiness``
diff --git a/plugins/sort.cpp b/plugins/sort.cpp
index ab2829655..630ac9e53 100644
--- a/plugins/sort.cpp
+++ b/plugins/sort.cpp
@@ -56,25 +56,9 @@ static command_result sort_items(color_ostream &out, vector <string> & parameter
 DFhackCExport command_result plugin_init (color_ostream &out, std::vector <PluginCommand> &commands)
 {
     commands.push_back(PluginCommand(
-        "sort-units", "Sort the visible unit list.", sort_units, unit_list_hotkey,
-        "  sort-units order [order...]\n"
-        "    Sort the unit list using the given sequence of comparisons.\n"
-        "    The '<' prefix for an order makes undefined values sort first.\n"
-        "    The '>' prefix reverses the sort order for defined values.\n"
-        "  Unit order examples:\n"
-        "    name, age, arrival, squad, squad_position, profession\n"
-        "The orderings are defined in hack/lua/plugins/sort/*.lua\n"
-    ));
+        "sort-units", "Sort the visible unit list.", sort_units, unit_list_hotkey));
     commands.push_back(PluginCommand(
-        "sort-items", "Sort the visible item list.", sort_items, item_list_hotkey,
-        "  sort-items order [order...]\n"
-        "    Sort the item list using the given sequence of comparisons.\n"
-        "    The '<' prefix for an order makes undefined values sort first.\n"
-        "    The '>' prefix reverses the sort order for defined values.\n"
-        "  Item order examples:\n"
-        "    description, material, wear, type, quality\n"
-        "The orderings are defined in hack/lua/plugins/sort/*.lua\n"
-    ));
+        "sort-items", "Sort the visible item list.", sort_items, item_list_hotkey));
     return CR_OK;
 }
 

From af0631cbd9d38263dcfe4dcd940d42f114ec8a6b Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Sun, 31 Jul 2022 13:29:18 -0700
Subject: [PATCH 395/854] update docs for spectate

---
 docs/plugins/spectate.rst | 13 ++++++++++---
 plugins/spectate.cpp      |  7 +------
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/docs/plugins/spectate.rst b/docs/plugins/spectate.rst
index 6c2ca9e24..983086c94 100644
--- a/docs/plugins/spectate.rst
+++ b/docs/plugins/spectate.rst
@@ -1,5 +1,12 @@
 spectate
 ========
-Simple plugin to automate following random dwarves. Most of the time things will
-be weighted towards z-levels with the highest job activity. Simply enter the
-``spectate`` command to toggle the plugin's state.
+Tags:
+
+Automatically follow exciting dwarves.
+
+Usage::
+
+    enable spectate
+
+The plugin will automatically switch which dwarf is being followed periodically,
+preferring dwarves on z-levels with the highest job activity.
diff --git a/plugins/spectate.cpp b/plugins/spectate.cpp
index aae48cf5a..1161c3f32 100644
--- a/plugins/spectate.cpp
+++ b/plugins/spectate.cpp
@@ -42,12 +42,7 @@ command_result spectate (color_ostream &out, std::vector <std::string> & paramet
 DFhackCExport command_result plugin_init (color_ostream &out, std::vector <PluginCommand> &commands) {
     commands.push_back(PluginCommand("spectate",
                                      "Automated spectator mode.",
-                                     spectate,
-                                     false,
-                                     ""
-                                     " spectate\n"
-                                     "    toggles spectator mode\n"
-                                     "\n"));
+                                     spectate));
     return CR_OK;
 }
 

From 479494e5a6a135605e0cc6722c163226aea11cb9 Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Sun, 31 Jul 2022 13:29:28 -0700
Subject: [PATCH 396/854] update docs for steam-engine

---
 docs/plugins/steam-engine.rst | 106 +++++++++++++++++-----------------
 plugins/steam-engine.cpp      |  76 ------------------------
 2 files changed, 54 insertions(+), 128 deletions(-)

diff --git a/docs/plugins/steam-engine.rst b/docs/plugins/steam-engine.rst
index 416ac9ad1..35cd490f5 100644
--- a/docs/plugins/steam-engine.rst
+++ b/docs/plugins/steam-engine.rst
@@ -1,40 +1,47 @@
 steam-engine
 ============
-The steam-engine plugin detects custom workshops with STEAM_ENGINE in
-their token, and turns them into real steam engines.
+Tags:
 
-The vanilla game contains only water wheels and windmills as sources of
-power, but windmills give relatively little power, and water wheels require
-flowing water, which must either be a real river and thus immovable and
+Allow modded steam engine buildings to function. The steam-engine plugin detects
+custom workshops with STEAM_ENGINE in their token, and turns them into real
+steam engines!
+
+The plugin auto-enables itself when it detects the relevant tags in the world
+raws. It does not need to be enabled with the `enable` command.
+
+Rationale
+---------
+The vanilla game contains only water wheels and windmills as sources of power,
+but windmills give relatively little power, and water wheels require flowing
+water, which must either be a real river and thus immovable and
 limited in supply, or actually flowing and thus laggy.
 
-Compared to the :wiki:`water reactor <Water_wheel#Dwarven_Water_Reactor>`
-exploit, steam engines make a lot of sense!
+Compared to the
+:wiki:`dwarven water reactor <Water_wheel#Dwarven_Water_Reactor>` exploit,
+steam engines make a lot of sense!
 
 Construction
 ------------
-The workshop needs water as its input, which it takes via a
-passable floor tile below it, like usual magma workshops do.
-The magma version also needs magma.
+The workshop needs water as its input, which it takes via a passable floor tile
+below it, like usual magma workshops do. The magma version also needs magma.
 
-Due to DFHack limits, the workshop will collapse over true open space.
-However down stairs are passable but support machines, so you can use them.
+Due to DF game limits, the workshop will collapse over true open space. However,
+down stairs are passable but support machines, so you can use them.
 
-After constructing the building itself, machines can be connected
-to the edge tiles that look like gear boxes. Their exact position
-is extracted from the workshop raws.
+After constructing the building itself, machines can be connected to the edge
+tiles that look like gear boxes. Their exact position is extracted from the
+workshop raws.
 
-Like with collapse above, due to DFHack limits the workshop
-can only immediately connect to machine components built AFTER it.
-This also means that engines cannot be chained without intermediate
-axles built after both engines.
+Like with collapse above, due to DF game limits the workshop can only
+immediately connect to machine components built AFTER it.  This also means that
+engines cannot be chained without intermediate axles built after both engines.
 
 Operation
 ---------
-In order to operate the engine, queue the Stoke Boiler job (optionally
-on repeat). A furnace operator will come, possibly bringing a bar of fuel,
-and perform it. As a result, a "boiling water" item will appear
-in the :kbd:`t` view of the workshop.
+In order to operate the engine, queue the Stoke Boiler job (optionally on
+repeat). A furnace operator will come, possibly bringing a bar of fuel, and
+perform it. As a result, a "boiling water" item will appear in the :kbd:`t`
+view of the workshop.
 
 .. note::
 
@@ -44,41 +51,36 @@ in the :kbd:`t` view of the workshop.
     have infinite power. However, liquid consumption should be slow
     enough that water can be supplied by a pond zone bucket chain.
 
-Every such item gives 100 power, up to a limit of 300 for coal,
-and 500 for a magma engine. The building can host twice that
-amount of items to provide longer autonomous running. When the
-boiler gets filled to capacity, all queued jobs are suspended;
-once it drops back to 3+1 or 5+1 items, they are re-enabled.
-
-While the engine is providing power, steam is being consumed.
-The consumption speed includes a fixed 10% waste rate, and
-the remaining 90% are applied proportionally to the actual
-load in the machine. With the engine at nominal 300 power with
-150 load in the system, it will consume steam for actual
+Every such item gives 100 power, up to a limit of 300 for coal, or 500 for a
+magma engine. The building can host twice that amount of items to provide longer
+autonomous running. When the boiler gets filled to capacity, all queued jobs are
+suspended. Once it drops back to 3+1 or 5+1 items, they are re-enabled.
+
+While the engine is providing power, steam is being consumed. The consumption
+speed includes a fixed 10% waste rate, and the remaining 90% is applied
+proportionally to the actual load in the machine. With the engine at nominal 300
+power with 150 load in the system, it will consume steam for actual
 300*(10% + 90%*150/300) = 165 power.
 
-Masterpiece mechanism and chain will decrease the mechanical
-power drawn by the engine itself from 10 to 5. Masterpiece
-barrel decreases waste rate by 4%. Masterpiece piston and pipe
-decrease it by further 4%, and also decrease the whole steam
-use rate by 10%.
+A masterpiece mechanism and chain will decrease the mechanical power drawn by
+the engine itself from 10 to 5. A masterpiece barrel decreases waste rate by 4%.
+A masterpiece piston and pipe decrease it by further 4%, and also decrease the
+whole steam use rate by 10%.
 
 Explosions
 ----------
-The engine must be constructed using barrel, pipe and piston
-from fire-safe, or in the magma version magma-safe metals.
+The engine must be constructed using barrel, pipe, and piston from fire-safe,
+or, in the magma version, magma-safe metals.
 
-During operation weak parts get gradually worn out, and
-eventually the engine explodes. It should also explode if
-toppled during operation by a building destroyer, or a
-tantruming dwarf.
+During operation, weak parts gradually wear out, and eventually the engine
+explodes. It should also explode if toppled during operation by a building
+destroyer or a tantruming dwarf.
 
 Save files
 ----------
-It should be safe to load and view engine-using fortresses
-from a DF version without DFHack installed, except that in such
-case the engines won't work. However actually making modifications
-to them, or machines they connect to (including by pulling levers),
-can easily result in inconsistent state once this plugin is
-available again. The effects may be as weird as negative power
-being generated.
+It should be safe to load and view engine-using fortresses from a DF version
+without DFHack installed, except that in such case the engines, of course, won't
+work. However actually making modifications to them or machines they connect to
+(including by pulling levers) can easily result in inconsistent state once this
+plugin is available again. The effects may be as weird as negative power being
+generated.
diff --git a/plugins/steam-engine.cpp b/plugins/steam-engine.cpp
index fbc575e36..6e3c317d3 100644
--- a/plugins/steam-engine.cpp
+++ b/plugins/steam-engine.cpp
@@ -37,82 +37,6 @@
 #include "df/workshop_type.h"
 #include "df/world.h"
 
-/*
- * This plugin implements a steam engine workshop. It activates
- * if there are any workshops in the raws with STEAM_ENGINE in
- * their token, and provides the necessary behavior.
- *
- * Construction:
- *
- * The workshop needs water as its input, which it takes via a
- * passable floor tile below it, like usual magma workshops do.
- * The magma version also needs magma.
- *
- * ISSUE: Since this building is a machine, and machine collapse
- * code cannot be modified, it would collapse over true open space.
- * As a loophole, down stair provides support to machines, while
- * being passable, so use them.
- *
- * After constructing the building itself, machines can be connected
- * to the edge tiles that look like gear boxes. Their exact position
- * is extracted from the workshop raws.
- *
- * ISSUE: Like with collapse above, part of the code involved in
- * machine connection cannot be modified. As a result, the workshop
- * can only immediately connect to machine components built AFTER it.
- * This also means that engines cannot be chained without intermediate
- * short axles that can be built later.
- *
- * Operation:
- *
- * In order to operate the engine, queue the Stoke Boiler job.
- * A furnace operator will come, possibly bringing a bar of fuel,
- * and perform it. As a result, a "boiling water" item will appear
- * in the 't' view of the workshop.
- *
- * Note: The completion of the job will actually consume one unit
- * of appropriate liquids from below the workshop.
- *
- * Every such item gives 100 power, up to a limit of 300 for coal,
- * and 500 for a magma engine. The building can host twice that
- * amount of items to provide longer autonomous running. When the
- * boiler gets filled to capacity, all queued jobs are suspended;
- * once it drops back to 3+1 or 5+1 items, they are re-enabled.
- *
- * While the engine is providing power, steam is being consumed.
- * The consumption speed includes a fixed 10% waste rate, and
- * the remaining 90% are applied proportionally to the actual
- * load in the machine. With the engine at nominal 300 power with
- * 150 load in the system, it will consume steam for actual
- * 300*(10% + 90%*150/300) = 165 power.
- *
- * Masterpiece mechanism and chain will decrease the mechanical
- * power drawn by the engine itself from 10 to 5. Masterpiece
- * barrel decreases waste rate by 4%. Masterpiece piston and pipe
- * decrease it by further 4%, and also decrease the whole steam
- * use rate by 10%.
- *
- * Explosions:
- *
- * The engine must be constructed using barrel, pipe and piston
- * from fire-safe, or in the magma version magma-safe metals.
- *
- * During operation weak parts get gradually worn out, and
- * eventually the engine explodes. It should also explode if
- * toppled during operation by a building destroyer, or a
- * tantruming dwarf.
- *
- * Save files:
- *
- * It should be safe to load and view fortresses using engines
- * from a DF version without DFHack installed, except that in such
- * case the engines won't work. However actually making modifications
- * to them, or machines they connect to (including by pulling levers),
- * can easily result in inconsistent state once this plugin is
- * available again. The effects may be as weird as negative power
- * being generated.
- */
-
 using std::vector;
 using std::string;
 using std::stack;

From 08d434d16ea24d902c0f0b9fe8da5ac9e09d5972 Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Sun, 31 Jul 2022 13:29:40 -0700
Subject: [PATCH 397/854] update docs for stockflow

---
 docs/plugins/stockflow.rst | 39 +++++++++++++++++++-------------------
 plugins/stockflow.cpp      | 32 +++++--------------------------
 2 files changed, 25 insertions(+), 46 deletions(-)

diff --git a/docs/plugins/stockflow.rst b/docs/plugins/stockflow.rst
index c3db7a673..0e2f5a1ad 100644
--- a/docs/plugins/stockflow.rst
+++ b/docs/plugins/stockflow.rst
@@ -1,24 +1,14 @@
 stockflow
 =========
-Allows the fortress bookkeeper to queue jobs through the manager,
-based on space or items available in stockpiles.
+Tags:
+:dfhack-keybind:`stockflow`
 
-Inspired by `workflow`.
+Queue manager jobs based on free space in stockpiles. With this plugin, the
+fortress bookkeeper can tally up free space in specific stockpiles and queue
+jobs through the manager to produce items to fill the free space.
 
-Usage:
-
-``stockflow enable``
-    Enable the plugin.
-``stockflow disable``
-    Disable the plugin.
-``stockflow fast``
-    Enable the plugin in fast mode.
-``stockflow list``
-    List any work order settings for your stockpiles.
-``stockflow status``
-    Display whether the plugin is enabled.
-
-While enabled, the :kbd:`q` menu of each stockpile will have two new options:
+When the plugin is enabled, the :kbd:`q` menu of each stockpile will have two
+new options:
 
 * :kbd:`j`:  Select a job to order, from an interface like the manager's screen.
 * :kbd:`J`:  Cycle between several options for how many such jobs to order.
@@ -27,5 +17,16 @@ Whenever the bookkeeper updates stockpile records, new work orders will
 be placed on the manager's queue for each such selection, reduced by the
 number of identical orders already in the queue.
 
-In fast mode, new work orders will be enqueued once per day, instead of
-waiting for the bookkeeper.
+This plugin is similar to `workflow`, but uses stockpiles to manage job triggers
+instead of abstract stock quantities.
+
+Usage:
+
+``enable stockflow``
+    Enable the plugin.
+``stockflow status``
+    Display whether the plugin is enabled.
+``stockflow list``
+    List any work order settings for your stockpiles.
+``stockflow fast``
+    Enqueue orders once per day instead of waiting for the bookkeeper.
diff --git a/plugins/stockflow.cpp b/plugins/stockflow.cpp
index aede089ad..65223f603 100644
--- a/plugins/stockflow.cpp
+++ b/plugins/stockflow.cpp
@@ -29,30 +29,6 @@ REQUIRE_GLOBAL(world);
 REQUIRE_GLOBAL(ui);
 
 bool fast = false;
-const char *tagline = "Allow the bookkeeper to queue manager jobs.";
-const char *usage = (
-    "  stockflow enable\n"
-    "    Enable the plugin.\n"
-    "  stockflow disable\n"
-    "    Disable the plugin.\n"
-    "  stockflow fast\n"
-    "    Enable the plugin in fast mode.\n"
-    "  stockflow list\n"
-    "    List any work order settings for your stockpiles.\n"
-    "  stockflow status\n"
-    "    Display whether the plugin is enabled.\n"
-    "\n"
-    "While enabled, the 'q' menu of each stockpile will have two new options:\n"
-    "  j: Select a job to order, from an interface like the manager's screen.\n"
-    "  J: Cycle between several options for how many such jobs to order.\n"
-    "\n"
-    "Whenever the bookkeeper updates stockpile records, new work orders will\n"
-    "be placed on the manager's queue for each such selection, reduced by the\n"
-    "number of identical orders already in the queue.\n"
-    "\n"
-    "In fast mode, new work orders will be enqueued once per day, instead of\n"
-    "waiting for the bookkeeper.\n"
-);
 
 /*
  * Lua interface.
@@ -342,8 +318,7 @@ static command_result stockflow_cmd(color_ostream &out, vector <string> & parame
             desired = true;
             fast = true;
         } else if (parameters[0] == "usage" || parameters[0] == "help" || parameters[0] == "?") {
-            out.print("%s: %s\nUsage:\n%s", plugin_name, tagline, usage);
-            return CR_OK;
+            return CR_WRONG_USAGE;
         } else if (parameters[0] == "list") {
             if (!enabled) {
                 out.printerr("Stockflow is not currently enabled.\n");
@@ -416,7 +391,10 @@ DFhackCExport command_result plugin_init(color_ostream &out, std::vector <Plugin
         enabled = true;
     }
 
-    commands.push_back(PluginCommand(plugin_name, tagline, stockflow_cmd, false, usage));
+    commands.push_back(PluginCommand(
+        plugin_name,
+        "Queue manager jobs based on free space in stockpiles.",
+        stockflow_cmd));
     return CR_OK;
 }
 

From 5621a19278f0433cd2670ced1bb7988fc6e68ea9 Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Sun, 31 Jul 2022 13:29:53 -0700
Subject: [PATCH 398/854] update docs for stockpiles

---
 docs/plugins/stockpiles.rst       | 52 ++++++++++++++++++++-----------
 plugins/stockpiles/stockpiles.cpp | 48 +++++++++-------------------
 2 files changed, 48 insertions(+), 52 deletions(-)

diff --git a/docs/plugins/stockpiles.rst b/docs/plugins/stockpiles.rst
index 000527ce5..76d52117d 100644
--- a/docs/plugins/stockpiles.rst
+++ b/docs/plugins/stockpiles.rst
@@ -2,27 +2,41 @@
 
 stockpiles
 ==========
-Offers the following commands to save and load stockpile settings.
-See `gui/stockpiles` for an in-game interface.
+Tags:
+:dfhack-keybind:`copystock`
+:dfhack-keybind:`savestock`
+:dfhack-keybind:`loadstock`
 
-:copystock:     Copies the parameters of the currently highlighted stockpile to the custom
-                stockpile settings and switches to custom stockpile placement mode, effectively
-                allowing you to copy/paste stockpiles easily.
-                :dfhack-keybind:`copystock`
+Import and export stockpile settings. When the plugin is enabled, the :kbd:`q`
+menu of each stockpile will have an option for saving or loading the stockpile
+settings. See `gui/stockpiles` for an in-game interface.
 
-:savestock:     Saves the currently highlighted stockpile's settings to a file in your Dwarf
-                Fortress folder. This file can be used to copy settings between game saves or
-                players.  e.g.:  ``savestock food_settings.dfstock``
+Usage:
 
-:loadstock:     Loads a saved stockpile settings file and applies it to the currently selected
-                stockpile.  e.g.:  ``loadstock food_settings.dfstock``
+``enable stockpiles``
+    Add a hotkey that you can hit to easily save and load settings from
+    stockpiles selected in :kbd:`q` mode.
+``copystock``
+    Copies the parameters of the currently highlighted stockpile to the custom
+    stockpile settings and switches to custom stockpile placement mode,
+    effectively allowing you to copy/paste stockpiles easily.
+``savestock <filename>``
+    Saves the currently highlighted stockpile's settings to a file in your
+    Dwarf Fortress folder. This file can be used to copy settings between game
+    saves or players.
+``loadstock <filename>``
+    Loads a saved stockpile settings file and applies it to the currently
+    selected stockpile.
 
-To use savestock and loadstock, use the :kbd:`q` command to highlight a stockpile.
-Then run savestock giving it a descriptive filename. Then, in a different (or
-the same!) gameworld, you can highlight any stockpile with :kbd:`q` then execute the
-``loadstock`` command passing it the name of that file. The settings will be
-applied to that stockpile.
+Filenames with spaces are not supported. Generated materials, divine metals,
+etc. are not saved as they are different in every world.
 
-Note that files are relative to the DF folder, so put your files there or in a
-subfolder for easy access. Filenames should not have spaces.  Generated materials,
-divine metals, etc are not saved as they are different in every world.
+Examples
+--------
+
+``savestock food_settings.dfstock``
+    Export the stockpile settings for the stockpile currently selected in
+    :kbd:`q` mode to a file named ``food_settings.dfstock``.
+``loadstock food_settings.dfstock``
+    Set the selected stockpile settings to those saved in the
+    ``food_settings.dfstock`` file.
diff --git a/plugins/stockpiles/stockpiles.cpp b/plugins/stockpiles/stockpiles.cpp
index 05e5c9f96..aa36e20bd 100644
--- a/plugins/stockpiles/stockpiles.cpp
+++ b/plugins/stockpiles/stockpiles.cpp
@@ -61,39 +61,21 @@ DFhackCExport command_result plugin_init ( color_ostream &out, std::vector <Plug
 {
     if ( world && ui )
     {
-        commands.push_back (
-            PluginCommand (
-                "copystock", "Copy stockpile under cursor.",
-                copystock, copystock_guard,
-                "  - In 'q' or 't' mode: select a stockpile and invoke in order\n"
-                "    to switch to the 'p' stockpile creation mode, and initialize\n"
-                "    the custom settings from the selected stockpile.\n"
-                "  - In 'p': invoke in order to switch back to 'q'.\n"
-            )
-        );
-        commands.push_back (
-            PluginCommand (
-                "savestock", "Save the active stockpile's settings to a file.",
-                savestock, savestock_guard,
-                "Must be in 'q' mode and have a stockpile selected.\n"
-                "example: 'savestock food.dfstock' will save the settings to 'food.dfstock'\n"
-                "in your stockpile folder.\n"
-                "Omitting the filename will result in text output directly to the console\n\n"
-                " -d, --debug: enable debug output\n"
-                " <filename>     : filename to save stockpile settings to (will be overwritten!)\n"
-            )
-        );
-        commands.push_back (
-            PluginCommand (
-                "loadstock", "Load and apply stockpile settings from a file.",
-                loadstock, loadstock_guard,
-                "Must be in 'q' mode and have a stockpile selected.\n"
-                "example: 'loadstock food.dfstock' will load the settings from 'food.dfstock'\n"
-                "in your stockpile folder and apply them to the selected stockpile.\n"
-                " -d, --debug: enable debug output\n"
-                " <filename>     : filename to load stockpile settings from\n"
-            )
-        );
+        commands.push_back(PluginCommand(
+            "copystock",
+            "Copy stockpile under cursor.",
+            copystock,
+            copystock_guard));
+        commands.push_back(PluginCommand(
+            "savestock",
+            "Save the active stockpile's settings to a file.",
+            savestock,
+            savestock_guard));
+        commands.push_back(PluginCommand(
+            "loadstock",
+            "Load and apply stockpile settings from a file.",
+            loadstock,
+            loadstock_guard));
     }
 
     return CR_OK;

From e1e245b4b41784f0c1f5733938e65a708ac3c84d Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Sun, 31 Jul 2022 13:30:04 -0700
Subject: [PATCH 399/854] update docs for stocks

---
 docs/plugins/stocks.rst | 19 +++++++++++++++++--
 plugins/stocks.cpp      |  8 ++++----
 2 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/docs/plugins/stocks.rst b/docs/plugins/stocks.rst
index 404c96a6d..076f2ab6f 100644
--- a/docs/plugins/stocks.rst
+++ b/docs/plugins/stocks.rst
@@ -1,5 +1,20 @@
 stocks
 ======
-Replaces the DF stocks screen with an improved version.
-
+Tags:
 :dfhack-keybind:`stocks`
+
+Enhanced fortress stock management interface. When the plugin is enabled, two
+new hotkeys become available:
+
+* :kbd:`e` on the vanilla DF stocks screen (:kbd:`z` and then select Stocks)
+  will launch the fortress-wide stock management screen.
+* :kbd:`i` when a stockpile is selected in :kbd:`q` mode will launch the
+  stockpile inventory management screen.
+
+Usage::
+
+    enable stocks
+    stocks show
+
+Running ``stocks show`` will bring you to the fortress-wide stock management
+screen from whereever you are.
diff --git a/plugins/stocks.cpp b/plugins/stocks.cpp
index 7c715d956..62c13dcd5 100644
--- a/plugins/stocks.cpp
+++ b/plugins/stocks.cpp
@@ -1469,10 +1469,10 @@ static command_result stocks_cmd(color_ostream &out, vector <string> & parameter
 
 DFhackCExport command_result plugin_init (color_ostream &out, std::vector <PluginCommand> &commands)
 {
-    commands.push_back(
-        PluginCommand(
-        "stocks", "An improved stocks display screen",
-        stocks_cmd, false, "Run 'stocks show' open the stocks display screen, or 'stocks version' to query the plugin version."));
+    commands.push_back(PluginCommand(
+        "stocks",
+        "An improved stocks management screen.",
+        stocks_cmd));
 
     ViewscreenStocks::reset();
 

From 464f566928b4d6c883176a18f93620ddb63048a2 Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Sun, 31 Jul 2022 13:30:19 -0700
Subject: [PATCH 400/854] update docs for stonesense

---
 conf.py                     |  3 +-
 docs/plugins/stonesense.rst | 81 ++++++++++++++++++++++++++++++++++---
 2 files changed, 77 insertions(+), 7 deletions(-)

diff --git a/conf.py b/conf.py
index b01027a6b..08c2e6bd8 100644
--- a/conf.py
+++ b/conf.py
@@ -183,7 +183,7 @@ def write_tool_docs():
                     mode=0o755, exist_ok=True)
         with write_file_if_changed('docs/tools/{}.rst'.format(k[0])) as outfile:
             outfile.write(header)
-            if k[0] != 'search' and k[0] != 'stonesense':
+            if k[0] != 'search':
                 outfile.write(label)
             outfile.write(include)
 
@@ -315,6 +315,7 @@ exclude_patterns = [
     'docs/pseudoxml/*',
     'docs/xml/*',
     'scripts/docs/*',
+    'plugins/*',
     ]
 
 # The reST default role (used for this markup: `text`) to use for all
diff --git a/docs/plugins/stonesense.rst b/docs/plugins/stonesense.rst
index b6c154e66..59212444b 100644
--- a/docs/plugins/stonesense.rst
+++ b/docs/plugins/stonesense.rst
@@ -1,10 +1,79 @@
-.. _plugin-stonesense:
-
 stonesense
 ==========
-An isometric visualizer that runs in a second window. Usage:
+Tags:
+:dfhack-keybind:`stonesense`
+:dfhack-keybind:`ssense`
+
+A 3D isometric visualizer that runs in a second window.
+
+Usage:
+
+``stonesense`` or ``ssense``
+    Open the visualiser in a new window.
+``ssense overlay``
+    Overlay DF window, replacing the map area.
+
+The viewer window has read-only access to the game, and can follow the game view
+or be moved independently. Configuration for stonesense can be set in the
+``stonesense/init.txt`` file in your DF game directory. If the window refresh
+rate is too low, change ``SEGMENTSIZE_Z`` to ``2`` in this file, and if you are
+unable to see the edges of the map with the overlay active, try decreasing the
+value for ``SEGMENTSIZE_XY`` -- normal values are ``50`` to ``80``, depending
+on your screen resolution.
+
+If you replace the map section of your DF window with ``ssense overlay``, be
+aware that it's not (yet) suitable for use as your only interface. Use DF's
+``[PRINT_MODE:2D]`` init option (in ``data/init/init.txt``) for stability.
+
+.. figure:: ../images/stonesense-roadtruss.jpg
+   :align: center
+   :target: http://www.bay12forums.com/smf/index.php?topic=48172.msg3198664#msg3198664
+
+   The above-ground part of the fortress *Roadtruss*.
+
+Controls
+--------
+Mouse controls are hard-coded and cannot be changed.
+
+:Left click:    Move debug cursor (if available)
+:Right click:   Recenter screen
+:Scrollwheel:   Move up and down
+:Ctrl-Scroll:   Increase/decrease Z depth shown
+
+Follow mode makes the Stonesense view follow the location of the DF
+window. The offset can be adjusted by holding :kbd:`Ctrl` while using the
+keyboard window movement keys. When you turn on cursor follow mode, the
+Stonesense debug cursor will follow the DF cursor when the latter exists.
+
+You can take screenshots with :kbd:`F5`, larger screenshots with
+:kbd:`Ctrl`:kbd:`F5`, and screenshot the whole map at full resolution with
+:kbd:`Ctrl`:kbd:`Shift`:kbd:`F5`.  Screenshots are saved to the DF directory.
+Note that feedback is printed to the DFHack console, and you may need
+to zoom out before taking very large screenshots.
+
+See ``stonesense/keybinds.txt`` to learn or set keybindings, including
+zooming, changing the dimensions of the rendered area, toggling various
+views, fog, and rotation. Here's the important section:
+
+.. include:: ../../plugins/stonesense/resources/keybinds.txt
+   :literal:
+   :end-before: VALID ACTIONS:
+
+Known Issues
+------------
+If Stonesense gives an error saying that it can't load
+:file:`creatures/large_256/*.png`, your video card cannot handle the high
+detail sprites used. Either open :file:`creatures/init.txt` and remove the
+line containing that folder, or :dffd:`use these smaller sprites <6096>`.
 
-:stonesense:        Open the visualiser in a new window.  Alias ``ssense``.
-:ssense overlay:    Overlay DF window, replacing the map area.
+Stonesense requires working graphics acceleration, and we recommend
+at least a dual core CPU to avoid slowing down your game of DF.
 
-For more information, see `the full Stonesense README <stonesense>`.
+Useful links
+------------
+- :forums:`Official Stonesense thread <106497>` for feedback,
+  questions, requests or bug reports
+- :forums:`Screenshots thread <48172>`
+- :wiki:`Main wiki page <Utility:Stonesense>`
+- :wiki:`How to add content <Utility:Stonesense/Adding_Content>`
+- `Stonesense on Github <https://github.com/DFHack/stonesense>`_

From 3d0eab1a9b20f460d6fa26e2ce4d4988d243e3a3 Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Sun, 31 Jul 2022 13:30:33 -0700
Subject: [PATCH 401/854] update docs for strangemood

---
 docs/plugins/strangemood.rst | 56 +++++++++++++++++++++++++-----------
 plugins/strangemood.cpp      | 14 +++------
 2 files changed, 43 insertions(+), 27 deletions(-)

diff --git a/docs/plugins/strangemood.rst b/docs/plugins/strangemood.rst
index 0d578c363..d6065f8eb 100644
--- a/docs/plugins/strangemood.rst
+++ b/docs/plugins/strangemood.rst
@@ -1,19 +1,41 @@
 strangemood
 ===========
-Creates a strange mood job the same way the game itself normally does it.
-
-Options:
-
-:-force:        Ignore normal strange mood preconditions (no recent mood, minimum
-                moodable population, artifact limit not reached).
-:-unit:         Make the strange mood strike the selected unit instead of picking
-                one randomly. Unit eligibility is still enforced.
-:-type <T>:     Force the mood to be of a particular type instead of choosing randomly based on happiness.
-                Valid values for T are "fey", "secretive", "possessed", "fell", and "macabre".
-:-skill S:      Force the mood to use a specific skill instead of choosing the highest moodable skill.
-                Valid values are "miner", "carpenter", "engraver", "mason", "tanner", "weaver",
-                "clothier", "weaponsmith",  "armorsmith", "metalsmith", "gemcutter", "gemsetter",
-                "woodcrafter", "stonecrafter", "metalcrafter", "glassmaker", "leatherworker",
-                "bonecarver", "bowyer", and "mechanic".
-
-Known limitations: if the selected unit is currently performing a job, the mood will not be started.
+Tags:
+:dfhack-keybind:`strangemood`
+
+Triggers a strange mood.
+
+Usage::
+
+    stangemood [<options>]
+
+Examples
+--------
+
+``strangemood -force -unit -type secretive -skill armorsmith``
+    Trigger a strange mood for the selected unit that will cause them to become
+    a legendary armorsmith.
+
+Options
+-------
+
+``-force``
+    Ignore normal strange mood preconditions (no recent mood, minimum moodable
+    population, artifact limit not reached, etc.).
+``-unit``
+    Make the strange mood strike the selected unit instead of picking one
+    randomly. Unit eligibility is still enforced (unless ``-force`` is also
+    specified).
+``-type <type>``
+    Force the mood to be of a particular type instead of choosing randomly based
+    on happiness. Valid values are "fey", "secretive", "possessed", "fell", and
+    "macabre".
+``-skill <skill>``
+    Force the mood to use a specific skill instead of choosing the highest
+    moodable skill. Valid values are "miner", "carpenter", "engraver", "mason",
+    "tanner", "weaver", "clothier", "weaponsmith",  "armorsmith", "metalsmith",
+    "gemcutter", "gemsetter", "woodcrafter", "stonecrafter", "metalcrafter",
+    "glassmaker", "leatherworker", "bonecarver", "bowyer", and "mechanic".
+
+Known limitations: if the selected unit is currently performing a job, the mood
+will not be triggered.
diff --git a/plugins/strangemood.cpp b/plugins/strangemood.cpp
index de7fa426d..a5b8e74a4 100644
--- a/plugins/strangemood.cpp
+++ b/plugins/strangemood.cpp
@@ -1234,16 +1234,10 @@ command_result df_strangemood (color_ostream &out, vector <string> & parameters)
 
 DFhackCExport command_result plugin_init (color_ostream &out, std::vector<PluginCommand> &commands)
 {
-    commands.push_back(PluginCommand("strangemood", "Force a strange mood to happen.", df_strangemood, false,
-        "Options:\n"
-         "  -force         - Ignore standard mood preconditions.\n"
-         "  -unit          - Use the selected unit instead of picking one randomly.\n"
-         "  -type <type>   - Force the mood to be of a specific type.\n"
-         "                   Valid types: fey, secretive, possessed, fell, macabre\n"
-         "  -skill <skill> - Force the mood to use a specific skill.\n"
-         "                   Skill name must be lowercase and without spaces.\n"
-         "                   Example: miner, gemcutter, metalcrafter, bonecarver, mason\n"
-    ));
+    commands.push_back(PluginCommand(
+        "strangemood",
+        "Trigger a strange mood.",
+        df_strangemood));
     rng.init();
 
     return CR_OK;

From b240748684a953d9279667c019a100ce0f698e31 Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Sun, 31 Jul 2022 13:30:46 -0700
Subject: [PATCH 402/854] update docs for tailor

---
 docs/plugins/tailor.rst | 40 +++++++++++++++++++++++++++++++++-------
 plugins/tailor.cpp      | 28 +++++-----------------------
 2 files changed, 38 insertions(+), 30 deletions(-)

diff --git a/docs/plugins/tailor.rst b/docs/plugins/tailor.rst
index ee1567fdb..19574bc3e 100644
--- a/docs/plugins/tailor.rst
+++ b/docs/plugins/tailor.rst
@@ -1,11 +1,37 @@
 tailor
 ======
+Tags:
+:dfhack-keybind:`tailor`
 
-Whenever the bookkeeper updates stockpile records, this plugin will scan every unit in the fort,
-count up the number that are worn, and then order enough more made to replace all worn items.
-If there are enough replacement items in inventory to replace all worn items, the units wearing them
-will have the worn items confiscated (in the same manner as the `cleanowned` plugin) so that they'll
-reeequip with replacement items.
+Automatically keep your dwarves in fresh clothing. Whenever the bookkeeper
+updates stockpile records, this plugin will scan the fort. If there are
+fresh cloths available, dwarves who are wearing tattered clothing will have
+their rags confiscated (in the same manner as the `cleanowned` tool) so that
+they'll reequip with replacement clothes.
 
-Use the `enable` and `disable <disable>` commands to toggle this plugin's status, or run
-``tailor status`` to check its current status.
+If there are not enough clothes available, manager orders will be generated
+to manufacture some more. ``tailor`` will intelligently create orders using
+raw materials that you have on hand in the fort. For example, if you have
+lots of silk, but no cloth, then ``tailor`` will order only silk clothing to
+be made.
+
+Usage::
+
+    enable tailor
+    tailor status
+    tailor materials <material> [<material> ...]
+
+By default, ``tailor`` will prefer using materials in this order::
+
+    silk cloth yarn leather
+
+but you can use the ``tailor materials`` command to restrict which materials
+are used, and in what order.
+
+Example
+-------
+
+``tailor materials silk cloth yarn``
+    Restrict the materials used for automatically manufacturing clothing to
+    silk, cloth, and yarn, preferred in that order. This saves leather for
+    other uses, like making armor.
diff --git a/plugins/tailor.cpp b/plugins/tailor.cpp
index a48bea2c6..bd11988d0 100644
--- a/plugins/tailor.cpp
+++ b/plugins/tailor.cpp
@@ -41,26 +41,6 @@ DFHACK_PLUGIN_IS_ENABLED(enabled);
 REQUIRE_GLOBAL(world);
 REQUIRE_GLOBAL(ui);
 
-const char* tagline = "Allow the bookkeeper to queue jobs to keep dwarfs in adequate clothing.";
-const char* usage = (
-    "  tailor enable\n"
-    "    Enable the plugin.\n"
-    "  tailor disable\n"
-    "    Disable the plugin.\n"
-    "  tailor status\n"
-    "    Display plugin status\n"
-    "  tailor materials ...\n"
-    "      for example: tailor materials silk cloth yarn leather\n"
-    "    Set allowed material list to the specified list.\n"
-    "    The example sets the list to silk, cloth, yarn, leather, in that order, which is the default.\n"
-    "\n"
-    "Whenever the bookkeeper updates stockpile records, this plugin will scan every unit in the fort,\n"
-    "count up the number that are worn, and then order enough more made to replace all worn items.\n"
-    "If there are enough replacement items in inventory to replace all worn items, the units wearing them\n"
-    "will have the worn items confiscated (in the same manner as the _cleanowned_ plugin) so that they'll\n"
-    "reeequip with replacement items.\n"
-    );
-
 class Tailor {
     // ARMOR, SHOES, HELM, GLOVES, PANTS
 
@@ -581,8 +561,7 @@ static command_result tailor_cmd(color_ostream& out, vector <string>& parameters
     }
     else if (parameters.size() == 1 && (parameters[0] == "usage" || parameters[0] == "help" || parameters[0] == "?"))
     {
-        out.print("%s: %s\nUsage:\n%s", plugin_name, tagline, usage);
-        return CR_OK;
+        return CR_WRONG_USAGE;
     }
     else if (parameters.size() == 1 && parameters[0] == "test")
     {
@@ -649,7 +628,10 @@ DFhackCExport command_result plugin_init(color_ostream& out, std::vector <Plugin
         enabled = true;
     }
 
-    commands.push_back(PluginCommand(plugin_name, tagline, tailor_cmd, false, usage));
+    commands.push_back(PluginCommand(
+        plugin_name,
+        "Automatically keep your dwarves in fresh clothing.",
+        tailor_cmd));
     return CR_OK;
 }
 

From 51f79f94643e4ca4bfe83dca1d377292caf07659 Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Sun, 31 Jul 2022 13:30:58 -0700
Subject: [PATCH 403/854] update docs for tiletypes

---
 docs/plugins/tiletypes.rst | 253 +++++++++++++++++++++----------------
 plugins/tiletypes.cpp      |  10 +-
 2 files changed, 146 insertions(+), 117 deletions(-)

diff --git a/docs/plugins/tiletypes.rst b/docs/plugins/tiletypes.rst
index 74af00240..cbdbd6cc5 100644
--- a/docs/plugins/tiletypes.rst
+++ b/docs/plugins/tiletypes.rst
@@ -3,116 +3,149 @@
 
 tiletypes
 =========
-Can be used for painting map tiles and is an interactive command, much like
-`liquids`. Some properties of existing tiles can be looked up with `probe`. If
-something goes wrong, `fixveins` may help.
-
-The tool works with two set of options and a brush. The brush determines which
-tiles will be processed. First set of options is the filter, which can exclude
-some of the tiles from the brush by looking at the tile properties. The second
-set of options is the paint - this determines how the selected tiles are
-changed.
-
-Both paint and filter can have many different properties including things like
-general shape (WALL, FLOOR, etc.), general material (SOIL, STONE, MINERAL,
-etc.), state of 'designated', 'hidden' and 'light' flags.
-
-The properties of filter and paint can be partially defined. This means that
-you can for example turn all stone fortifications into floors, preserving the
-material::
-
-        filter material STONE
-        filter shape FORTIFICATION
-        paint shape FLOOR
-
-Or turn mineral vein floors back into walls::
-
-        filter shape FLOOR
-        filter material MINERAL
-        paint shape WALL
-
-The tool also allows tweaking some tile flags::
-
-        paint hidden 1
-        paint hidden 0
-
-This will hide previously revealed tiles (or show hidden with the 0 option).
-
-More recently, the tool supports changing the base material of the tile to
-an arbitrary stone from the raws, by creating new veins as required. Note
-that this mode paints under ice and constructions, instead of overwriting
-them. To enable, use::
-
-        paint stone MICROCLINE
-
-This mode is incompatible with the regular ``material`` setting, so changing
-it cancels the specific stone selection::
-
-        paint material ANY
-
-Since different vein types have different drop rates, it is possible to choose
-which one to use in painting::
-
-        paint veintype CLUSTER_SMALL
-
-When the chosen type is ``CLUSTER`` (the default), the tool may automatically
-choose to use layer stone or lava stone instead of veins if its material matches
-the desired one.
-
-Any paint or filter option (or the entire paint or filter) can be disabled entirely by using the ANY keyword::
-
-        paint hidden ANY
-        paint shape ANY
-        filter material any
-        filter shape any
-        filter any
-
-You can use several different brushes for painting tiles:
-
-:point:     a single tile
-:range:     a rectangular range
-:column:    a column ranging from current cursor to the first solid tile above
-:block:     a DF map block - 16x16 tiles, in a regular grid
-
-Example::
-
-    range 10 10 1
-
-This will change the brush to a rectangle spanning 10x10 tiles on one z-level.
-The range starts at the position of the cursor and goes to the east, south and
-up.
-
-For more details, use ``tiletypes help``.
-
-tiletypes-command
------------------
-Runs tiletypes commands, separated by ``;``. This makes it possible to change
-tiletypes modes from a hotkey or via dfhack-run.
-
-Example::
-
-    tiletypes-command p any ; p s wall ; p sp normal
-
-This resets the paint filter to unsmoothed walls.
-
-tiletypes-here-point
---------------------
-Apply the current tiletypes options at the in-game cursor position to a single
-tile. Can be used from a hotkey.
-
-This command supports the same options as `tiletypes-here` above.
-
-tiletypes-here
---------------
-Apply the current tiletypes options at the in-game cursor position, including
-the brush. Can be used from a hotkey.
-
-Options:
-
-:``-c``, ``--cursor <x>,<y>,<z>``:
+Tags:
+:dfhack-keybind:`tiletypes`
+:dfhack-keybind:`tiletypes-command`
+:dfhack-keybind:`tiletypes-here`
+:dfhack-keybind:`tiletypes-here-point`
+
+Paints tiles of specified types onto the map. You can use the `probe` command
+to discover properties of existing tiles that you'd like to copy. If you
+accidentally paint over a vein that you want back, `fixveins` may help.
+
+The tool works with a brush, a filter, and a paint specification. The brush
+determines the shape of the area to affect, the filter selects which tiles to
+affect, and the paint specification determines how to affect those tiles.
+
+Both paint and filter can have many different properties, like general shape
+(WALL, FLOOR, etc.), general material (SOIL, STONE, MINERAL, etc.), specific
+materials (MICROCLINE, MARBLE, etc.), state of 'designated', 'hidden', and
+'light' flags, and many others.
+
+Usage:
+
+``tiletypes``
+    Start the interactive terminal prompt where you can iteratively modify
+    the brush, filter, and paint specification and get help on syntax
+    elements. When in the interactive prompt, type ``quit`` to get out.
+``tiletypes-command <command> [; <command> ...]``
+    Run ``tiletypes`` commands from outside the interactive prompt. You can
+    use this form from hotkeys or `dfhack-run` to set specific tiletypes
+    properties. You can run multiple commands on one line by separating them
+    with :literal:`\  ; \ ` -- that's a semicolon with a space on either side.
+    See the Commands_ section below for an overview of commands you can run.
+``tiletypes-here [<options>]``
+    Apply the current options set in ``tiletypes`` and/or ``tiletypes-command``
+    at the in-game cursor position, including the brush.  Can be used from a
+    hotkey.
+``tiletypes-here-point [<options>]``
+    Apply the current options set in ``tiletypes`` and/or ``tiletypes-command``
+    at the in-game cursor position to a single tile (ignoring brush settings).
+    Can be used from a hotkey.
+
+Examples
+--------
+
+``tiletypes-command filter material STONE ; f shape WALL ; paint shape FLOOR``
+    Turn all stone walls into floors, preserving the material.
+``tiletypes-command p any ; p s wall ; p sp normal``
+    Clear the paint specificaiton and set it to unsmoothed walls.
+``tiletypes-command f any ; p stone marble ; p sh wall ; p sp normal ; r 10 10``
+    Prepare to paint a 10x10 area of marble walls, ready for harvesting for
+    flux.
+``tiletypes-command f any ; f designated 1 ; p any ; p hidden 0 ; block ; run``
+    Set the filter to match designated tiles, the paint specification to unhide
+    them, and the brush to cover all tiles in the current block. Then run itThis is useful
+    for unhiding tiles you wish to dig out of an aquifer so the game doesn't
+    pause and undesignate adjacent tiles every time a new damp tile is
+    "discovered".
+
+Options
+-------
+
+``-c``, ``--cursor <x>,<y>,<z>``
     Use the specified map coordinates instead of the current cursor position. If
     this option is specified, then an active game map cursor is not necessary.
-:``-h``, ``--help``:
-    Show command help text.
-:``-q``, ``--quiet``:
+``-q``, ``--quiet``
     Suppress non-error status output.
+
+Commands
+--------
+
+Commands can set the brush or modify the filter or paint options. When at the
+interactive ``tiletypes>`` prompt, the command ``run`` (or hitting enter on an
+empty line) will apply the current filter and paint specification with the
+current brush at the current cursor position. The command ``quit`` will exit.
+
+Brush commands
+``````````````
+
+``p``, ``point``
+    Use the point brush.
+``r``, ``range <width> <height> [<depth>]``
+    Use the range brush with the specified width, height, and depth. If not
+    specified, depth is 1, meaning just the current z-level. The range starts at
+    the position of the cursor and goes to the east, south and up (towards the
+    sky).
+``block``
+    Use the block brush, which includes all tiles in the 16x16 block that
+    includes the cursor.
+``column``
+    Use the column brush, which ranges from the current cursor position to the
+    first solid tile above it. This is useful for filling the empty space in a
+    cavern.
+
+Filter and paint commands
+`````````````````````````
+
+The general forms for modifying the filter or paint specification are:
+
+``f``, ``filter <options>``
+    Modify the filter.
+``p``, ``paint <options>``
+    Modify the paint specification.
+
+The options identify the property of the tile and the value of that property:
+
+``any``
+    Reset to default (no filter/paint).
+``s``, ``sh``, ``shape <shape>``
+    Tile shape information. Run ``:lua @df.tiletype_shape`` to see valid shapes,
+    or use a shape of ``any`` to clear the current setting.
+``m``, ``mat``, ``material <material>``
+    Tile material information. Run ``:lua @df.tiletype_material`` to see valid
+    materials, or use a material of ``any`` to clear the current setting.
+``sp``, ``special <special>``
+    Tile special information. Run ``:lua @df.tiletype_special`` to see valid
+    special values, or use a special value of ``any`` to clear the current
+    setting.
+``v``, ``var``, ``variant <variant>``
+    Tile variant information. Run ``:lua @df.tiletype_variant`` to see valid
+    variant values, or use a variant value of ``any`` to clear the current
+    setting.
+``a``, ``all [<shape>] [<material>] [<special>] [<variant>]``
+    Set values for any or all of shape, material, special, and/or variant, in
+    any order.
+``d``, ``designated 0|1``
+    Only useful for the filter, since you can't "paint" designations.
+``h``, ``hidden 0|1``
+    Whether a tile is hidden. A value of ``0`` means "revealed".
+``l``, ``light 0|1``
+    Whether a tile is marked as "Light". A value of ``0`` means "dark".
+``st``, ``subterranean 0|1``
+    Whether a tile is marked as "Subterranean".
+``sv``, ``skyview 0|1``
+    Whether a tile is marked as "Outside". A value of ``0`` means "inside".
+``aqua``, ``aquifer 0|1``
+    Whether a tile is marked as an aquifer.
+``stone <stone type>``
+    Set a particular type of stone, creating veins as required. To see a list of
+    valid stone types, run: ``:lua for _,mat in ipairs(df.global.world.raws.inorganics) do if mat.material.flags.IS_STONE and not mat.material.flags.NO_STONE_STOCKPILE then print(mat.id) end end``
+    Note that this command paints under ice and constructions, instead of
+    overwriting them. Also note that specifying a specific ``stone`` will cancel
+    out anything you have specified for ``material``, and vice-versa.
+``veintype <vein type>``
+    Set a particular vein type for the ``stone`` option to take advantage of the
+    different boulder drop rates. To see valid vein types, run
+    ``:lua @df.inclusion_type``, or use vein type ``CLUSTER`` to reset to the
+    default.
diff --git a/plugins/tiletypes.cpp b/plugins/tiletypes.cpp
index b8bbc8d04..f3773b0fe 100644
--- a/plugins/tiletypes.cpp
+++ b/plugins/tiletypes.cpp
@@ -85,10 +85,10 @@ command_result df_tiletypes_here_point (color_ostream &out, vector <string> & pa
 DFhackCExport command_result plugin_init ( color_ostream &out, std::vector <PluginCommand> &commands)
 {
     tiletypes_hist.load(HISTORY_FILE);
-    commands.push_back(PluginCommand("tiletypes", "Paint map tiles freely, similar to liquids.", df_tiletypes, true));
+    commands.push_back(PluginCommand("tiletypes", "Paints tiles of specified types onto the map.", df_tiletypes, true));
     commands.push_back(PluginCommand("tiletypes-command", "Run tiletypes commands (seperated by ' ; ')", df_tiletypes_command));
     commands.push_back(PluginCommand("tiletypes-here", "Repeat tiletypes command at cursor (with brush)", df_tiletypes_here));
-    commands.push_back(PluginCommand("tiletypes-here-point", "Repeat tiletypes command at cursor (without brush)", df_tiletypes_here_point));
+    commands.push_back(PluginCommand("tiletypes-here-point", "Repeat tiletypes command at cursor (with single tile brush)", df_tiletypes_here_point));
     return CR_OK;
 }
 
@@ -1000,11 +1000,7 @@ command_result df_tiletypes (color_ostream &out_, vector <string> & parameters)
     {
         if(parameters[i] == "help" || parameters[i] == "?")
         {
-            out_.print("This tool allows painting tiles types with a brush, using an optional filter.\n"
-                       "The tool is interactive, similarly to the liquids tool.\n"
-                       "Further help is available inside.\n"
-            );
-            return CR_OK;
+            return CR_WRONG_USAGE;
         }
     }
 

From 2362d60a3aa9d200a234d5a6c2d330eedc1b9a00 Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Sun, 31 Jul 2022 13:31:15 -0700
Subject: [PATCH 404/854] update docs for title-folder and title-version

---
 docs/plugins/title-folder.rst  | 8 +++++++-
 docs/plugins/title-version.rst | 8 +++++++-
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/docs/plugins/title-folder.rst b/docs/plugins/title-folder.rst
index 4e1ef40ec..3156a9e1c 100644
--- a/docs/plugins/title-folder.rst
+++ b/docs/plugins/title-folder.rst
@@ -1,3 +1,9 @@
 title-folder
 =============
-Displays the DF folder name in the window title bar when enabled.
+Tags:
+
+Displays the DF folder name in the window title bar.
+
+Usage::
+
+    enable title-folder
diff --git a/docs/plugins/title-version.rst b/docs/plugins/title-version.rst
index aed7a02e0..267179f14 100644
--- a/docs/plugins/title-version.rst
+++ b/docs/plugins/title-version.rst
@@ -1,3 +1,9 @@
 title-version
 =============
-Displays the DFHack version on DF's title screen when enabled.
+Tags:
+
+Displays the DFHack version on DF's title screen.
+
+Usage::
+
+    enable title-version

From a6bdd9e3dc20fe0b6d1b9644e3b9eb5118df0b63 Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Sun, 31 Jul 2022 13:31:26 -0700
Subject: [PATCH 405/854] update docs for trackstop

---
 docs/plugins/trackstop.rst | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/docs/plugins/trackstop.rst b/docs/plugins/trackstop.rst
index b012df34d..72466a1bf 100644
--- a/docs/plugins/trackstop.rst
+++ b/docs/plugins/trackstop.rst
@@ -1,5 +1,12 @@
 trackstop
 =========
-Adds a :kbd:`q` menu for track stops, which is completely blank by default.
+Tags:
+
+Adds dynamic configuration options for track stops. When enabled, this plugin
+adds a :kbd:`q` menu for track stops, which is completely blank in vanilla DF.
 This allows you to view and/or change the track stop's friction and dump
 direction settings, using the keybindings from the track stop building interface.
+
+Usage::
+
+    enable trackstop

From a5a57a86312352e150f40dfaae66545971ee933e Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Sun, 31 Jul 2022 13:31:40 -0700
Subject: [PATCH 406/854] update docs for tubefill

---
 docs/plugins/tubefill.rst | 15 +++++++++------
 plugins/tubefill.cpp      |  7 ++++---
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/docs/plugins/tubefill.rst b/docs/plugins/tubefill.rst
index 99c0b76bd..15a9ba2f2 100644
--- a/docs/plugins/tubefill.rst
+++ b/docs/plugins/tubefill.rst
@@ -1,11 +1,14 @@
 tubefill
 ========
-Fills all the adamantine veins again. Veins that were hollow will be left
-alone.
+Tags:
+:dfhack-keybind:`tubefill`
 
-Options:
+Replentishes mined-out adamantine. Veins that were hollow will be left alone.
 
-:hollow:            fill in naturally hollow veins too
+Usage::
 
-Beware that filling in hollow veins will trigger a demon invasion on top of
-your miner when you dig into the region that used to be hollow.
+    tubefill [hollow]
+
+Specify ``hollow`` to fill in naturally hollow veins too, but be aware that this
+will trigger a demon invasion on top of your miner when you dig into the region
+that used to be hollow. You have been warned!
diff --git a/plugins/tubefill.cpp b/plugins/tubefill.cpp
index 1803ed520..f86e77c76 100644
--- a/plugins/tubefill.cpp
+++ b/plugins/tubefill.cpp
@@ -40,9 +40,10 @@ command_result tubefill(color_ostream &out, std::vector<std::string> & params);
 
 DFhackCExport command_result plugin_init ( color_ostream &out, std::vector <PluginCommand> &commands)
 {
-    commands.push_back(PluginCommand("tubefill","Fill in all the adamantine tubes again.",tubefill, false,
-        "Replenishes mined out adamantine but does not fill hollow adamantine tubes.\n"
-        "Specify 'hollow' to fill hollow tubes, but beware glitchy HFS spawns.\n"));
+    commands.push_back(PluginCommand(
+        "tubefill",
+        "Replentishes mined-out adamantine.",
+        tubefill));
     return CR_OK;
 }
 

From e4c5b146701803eede95af8c2f62a1193ba2a32a Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Sun, 31 Jul 2022 13:31:54 -0700
Subject: [PATCH 407/854] update docs for tweak

---
 docs/plugins/tweak.rst  | 208 +++++++++++-------
 plugins/tweak/tweak.cpp | 468 +---------------------------------------
 2 files changed, 130 insertions(+), 546 deletions(-)

diff --git a/docs/plugins/tweak.rst b/docs/plugins/tweak.rst
index 4ce7b6d38..56d465f78 100644
--- a/docs/plugins/tweak.rst
+++ b/docs/plugins/tweak.rst
@@ -1,91 +1,137 @@
 tweak
 =====
+Tags:
+:dfhack-keybind:`tweak`
+
 Contains various tweaks for minor bugs.
 
-One-shot subcommands:
+Usage::
+
+    tweak <command> [disable]
+
+Run the ``tweak`` command to run the tweak or enable its effects. For tweaks
+that have persistent effects, append the ``disable`` keyword to disable them.
+
+One-shot commands:
 
-:clear-missing:  Remove the missing status from the selected unit.
-                 This allows engraving slabs for ghostly, but not yet
-                 found, creatures.
-:clear-ghostly:  Remove the ghostly status from the selected unit and mark
-                 it as dead. This allows getting rid of bugged ghosts
-                 which do not show up in the engraving slab menu at all,
-                 even after using clear-missing. It works, but is
-                 potentially very dangerous - so use with care. Probably
-                 (almost certainly) it does not have the same effects like
-                 a proper burial. You've been warned.
-:fixmigrant:     Remove the resident/merchant flag from the selected unit.
-                 Intended to fix bugged migrants/traders who stay at the
-                 map edge and don't enter your fort. Only works for
-                 dwarves (or generally the player's race in modded games).
-                 Do NOT abuse this for 'real' caravan merchants (if you
-                 really want to kidnap them, use 'tweak makeown' instead,
-                 otherwise they will have their clothes set to forbidden etc).
-:makeown:        Force selected unit to become a member of your fort.
-                 Can be abused to grab caravan merchants and escorts, even if
-                 they don't belong to the player's race. Foreign sentients
-                 (humans, elves) can be put to work, but you can't assign rooms
-                 to them and they don't show up in DwarfTherapist because the
-                 game treats them like pets. Grabbing draft animals from
-                 a caravan can result in weirdness (animals go insane or berserk
-                 and are not flagged as tame), but you are allowed to mark them
-                 for slaughter. Grabbing wagons results in some funny spam, then
-                 they are scuttled.
+``clear-missing``
+    Remove the missing status from the selected unit. This allows engraving
+    slabs for ghostly, but not yet found, creatures.
+``clear-ghostly``
+    Remove the ghostly status from the selected unit and mark it as dead. This
+    allows getting rid of bugged ghosts which do not show up in the engraving
+    slab menu at all, even after using ``clear-missing``. It works, but is
+    potentially very dangerous - so use with care. Probably (almost certainly)
+    it does not have the same effects like a proper burial. You've been warned.
+``fixmigrant``
+    Remove the resident/merchant flag from the selected unit. Intended to fix
+    bugged migrants/traders who stay at the map edge and don't enter your fort.
+    Only works for dwarves (or generally the player's race in modded games).
+    Do NOT abuse this for 'real' caravan merchants (if you really want to kidnap
+    them, use ``tweak makeown`` instead, otherwise they will have their clothes
+    set to forbidden).
+``makeown``
+    Force selected unit to become a member of your fort. Can be abused to grab
+    caravan merchants and escorts, even if they don't belong to the player's
+    race. Foreign sentients (humans, elves) can be put to work, but you can't
+    assign rooms to them and they don't show up in labor management programs
+    (like `manipulator` or Dwarf Therapist) because the game treats them like
+    pets. Grabbing draft animals from a caravan can result in weirdness
+    (animals go insane or berserk and are not flagged as tame), but you are
+    allowed to mark them for slaughter. Grabbing wagons results in some funny
+    spam, then they are scuttled.
 
-Subcommands that persist until disabled or DF quits:
+Commands that persist until disabled or DF quits:
 
-.. comment: sort these alphabetically
+.. comment: please sort these alphabetically
 
-:adamantine-cloth-wear: Prevents adamantine clothing from wearing out while being worn (:bug:`6481`).
-:advmode-contained:     Works around :bug:`6202`, custom reactions with container inputs
-                        in advmode. The issue is that the screen tries to force you to select
-                        the contents separately from the container. This forcefully skips child
-                        reagents.
-:block-labors:          Prevents labors that can't be used from being toggled
-:burrow-name-cancel:    Implements the "back" option when renaming a burrow,
-                        which currently does nothing (:bug:`1518`)
-:cage-butcher:          Adds an option to butcher units when viewing cages with :kbd:`q`
-:civ-view-agreement:    Fixes overlapping text on the "view agreement" screen
-:condition-material:    Fixes a crash in the work order contition material list (:bug:`9905`).
-:craft-age-wear:        Fixes the behavior of crafted items wearing out over time (:bug:`6003`).
-                        With this tweak, items made from cloth and leather will gain a level of
-                        wear  every 20 years.
-:do-job-now:            Adds a job priority toggle to the jobs list
-:embark-profile-name:   Allows the use of lowercase letters when saving embark profiles
-:eggs-fertile:          Displays a fertility indicator on nestboxes
-:farm-plot-select:      Adds "Select all" and "Deselect all" options to farm plot menus
-:fast-heat:             Further improves temperature update performance by ensuring that 1 degree
-                        of item temperature is crossed in no more than specified number of frames
-                        when updating from the environment temperature. This reduces the time it
-                        takes for stable-temp to stop updates again when equilibrium is disturbed.
-:fast-trade:            Makes Shift-Down in the Move Goods to Depot and Trade screens select
-                        the current item (fully, in case of a stack), and scroll down one line.
-:fps-min:               Fixes the in-game minimum FPS setting
-:hide-priority:         Adds an option to hide designation priority indicators
-:hotkey-clear:          Adds an option to clear currently-bound hotkeys (in the :kbd:`H` menu)
-:import-priority-category:
-                        Allows changing the priority of all goods in a
-                        category when discussing an import agreement with the liaison
-:kitchen-prefs-all:     Adds an option to toggle cook/brew for all visible items in kitchen preferences
-:kitchen-prefs-color:   Changes color of enabled items to green in kitchen preferences
-:kitchen-prefs-empty:   Fixes a layout issue with empty kitchen tabs (:bug:`9000`)
-:max-wheelbarrow:       Allows assigning more than 3 wheelbarrows to a stockpile
-:military-color-assigned:
-                        Color squad candidates already assigned to other squads in yellow/green
-                        to make them stand out more in the list.
+``adamantine-cloth-wear``
+    Prevents adamantine clothing from wearing out while being worn
+    (:bug:`6481`).
+``advmode-contained``
+    Fixes custom reactions with container inputs in advmode
+    (:bug:`6202`) in advmode. The issue is that the screen tries to force you to
+    select the contents separately from the container. This forcefully skips
+    child reagents.
+``block-labors``
+    Prevents labors that can't be used from being toggled.
+``burrow-name-cancel``
+    Implements the "back" option when renaming a burrow, which currently does
+    nothing in vanilla DF (:bug:`1518`).
+``cage-butcher``
+    Adds an option to butcher units when viewing cages with :kbd:`q`.
+``civ-view-agreement``
+    Fixes overlapping text on the "view agreement" screen.
+``condition-material`` 
+    Fixes a crash in the work order contition material list (:bug:`9905`).
+``craft-age-wear``
+    Fixes crafted items not wearing out over time (:bug:`6003`). With this
+    tweak, items made from cloth and leather will gain a level of wear every 20
+    years.
+``do-job-now``
+    Adds a job priority toggle to the jobs list.
+``embark-profile-name``
+    Allows the use of lowercase letters when saving embark profiles.
+``eggs-fertile``
+    Displays a fertility indicator on nestboxes.
+``farm-plot-select``
+    Adds "Select all" and "Deselect all" options to farm plot menus.
+``fast-heat``
+    Improves temperature update performance by ensuring that 1 degree of item
+    temperature is crossed in no more than specified number of frames when
+    updating from the environment temperature. This reduces the time it takes
+    for ``tweak stable-temp`` to stop updates again when equilibrium is
+    disturbed.
+``fast-trade``
+    Makes Shift-Down in the Move Goods to Depot and Trade screens toggle the
+    current item (fully, in case of a stack), and scroll down one line. Shift-Up
+    undoes the last Shift-Down by scrolling up one line and then toggle the item.
+``fps-min``
+    Fixes the in-game minimum FPS setting (:bug:`6277`).
+``hide-priority``
+    Adds an option to hide designation priority indicators.
+``hotkey-clear``
+    Adds an option to clear currently-bound hotkeys (in the :kbd:`H` menu).
+``import-priority-category``
+    When meeting with a liaison, makes Shift+Left/Right arrow adjust all items
+    in category when discussing an import agreement with the liaison.
+``kitchen-prefs-all``
+    Adds an option to toggle cook/brew for all visible items in kitchen
+    preferences.
+``kitchen-prefs-color``
+    Changes color of enabled items to green in kitchen preferences.
+``kitchen-prefs-empty``
+    Fixes a layout issue with empty kitchen tabs (:bug:`9000`).
+``max-wheelbarrow``
+    Allows assigning more than 3 wheelbarrows to a stockpile.
+``military-color-assigned``
+    Color squad candidates already assigned to other squads in yellow/green to
+    make them stand out more in the list.
 
-                        .. image:: ../images/tweak-mil-color.png
+                        .. image:``../images/tweak-mil-color.png
 
-:military-stable-assign:
-                        Preserve list order and cursor position when assigning to squad,
-                        i.e. stop the rightmost list of the Positions page of the military
-                        screen from constantly resetting to the top.
-:nestbox-color:         Fixes the color of built nestboxes
-:partial-items:         Displays percentages on partially-consumed items such as hospital cloth
-:reaction-gloves:       Fixes reactions to produce gloves in sets with correct handedness (:bug:`6273`)
-:shift-8-scroll:        Gives Shift-8 (or :kbd:`*`) priority when scrolling menus, instead of scrolling the map
-:stable-cursor:         Saves the exact cursor position between t/q/k/d/b/etc menus of fortress mode, if the
-                        map view is near enough to its previous position.
-:stone-status-all:      Adds an option to toggle the economic status of all stones
-:title-start-rename:    Adds a safe rename option to the title screen "Start Playing" menu
-:tradereq-pet-gender:   Displays pet genders on the trade request screen
+``military-stable-assign``
+    Preserve list order and cursor position when assigning to squad, i.e. stop
+    the rightmost list of the Positions page of the military screen from
+    constantly resetting to the top.
+``nestbox-color``
+    Makes built nestboxes use the color of their material.
+``partial-items``
+    Displays percentages on partially-consumed items such as hospital cloth.
+``pausing-fps-counter``
+    Replace fortress mode FPS counter with one that stops counting when paused.
+``reaction-gloves``
+    Fixes reactions to produce gloves in sets with correct handedness
+    (:bug:`6273`).
+``shift-8-scroll``
+    Gives Shift-8 (or :kbd:`*`) priority when scrolling menus, instead of
+    scrolling the map.
+``stable-cursor``
+    Saves the exact cursor position between t/q/k/d/b/etc menus of fortress
+    mode, if the map view is near enough to its previous position.
+``stone-status-all``
+    Adds an option to toggle the economic status of all stones.
+``title-start-rename``
+    Adds a safe rename option to the title screen "Start Playing" menu.
+``tradereq-pet-gender``
+    Displays pet genders on the trade request screen.
diff --git a/plugins/tweak/tweak.cpp b/plugins/tweak/tweak.cpp
index 38ece6970..6d2a46fa8 100644
--- a/plugins/tweak/tweak.cpp
+++ b/plugins/tweak/tweak.cpp
@@ -23,7 +23,6 @@
 #include "../uicommon.h"
 #include "df/ui.h"
 #include "df/world.h"
-#include "df/squad.h"
 #include "df/unit.h"
 #include "df/unit_soul.h"
 #include "df/historical_entity.h"
@@ -37,7 +36,6 @@
 #include "df/viewscreen_dwarfmodest.h"
 #include "df/viewscreen_kitchenprefst.h"
 #include "df/viewscreen_layer_unit_actionst.h"
-#include "df/squad_order_trainst.h"
 #include "df/ui_build_selector.h"
 #include "df/ui_sidebar_menus.h"
 #include "df/building_trapst.h"
@@ -67,17 +65,10 @@
 #include "df/viewscreen_layer_assigntradest.h"
 #include "df/viewscreen_tradegoodsst.h"
 #include "df/viewscreen_layer_militaryst.h"
-#include "df/squad_position.h"
 #include "df/job.h"
 #include "df/general_ref_building_holderst.h"
 #include "df/unit_health_info.h"
 #include "df/caste_body_info.h"
-#include "df/activity_entry.h"
-#include "df/activity_event_combat_trainingst.h"
-#include "df/activity_event_individual_skill_drillst.h"
-#include "df/activity_event_skill_demonstrationst.h"
-#include "df/activity_event_sparringst.h"
-//#include "df/building_hivest.h"
 
 #include <stdlib.h>
 #include <unordered_map>
@@ -162,113 +153,9 @@ DFhackCExport command_result plugin_init (color_ostream &out, std::vector <Plugi
 {
     is_enabled = true; // Allow plugin_onupdate to work (subcommands are enabled individually)
     commands.push_back(PluginCommand(
-        "tweak", "Various tweaks for minor bugs.", tweak, false,
-        "  tweak clear-missing\n"
-        "    Remove the missing status from the selected unit.\n"
-        "  tweak clear-ghostly\n"
-        "    Remove the ghostly status from the selected unit.\n"
-        "    Intended to fix the case where you can't engrave memorials for ghosts.\n"
-        "    Note that this is very dirty and possibly dangerous!\n"
-        "    Most probably does not have the positive effect of a proper burial.\n"
-        "  tweak fixmigrant\n"
-        "    Remove the resident/merchant flag from the selected unit.\n"
-        "    Intended to fix bugged migrants/traders who stay at the\n"
-        "    map edge and don't enter your fort. Only works for\n"
-        "    dwarves (or generally the player's race in modded games).\n"
-        "  tweak makeown\n"
-        "    Force selected unit to become a member of your fort.\n"
-        "    Can be abused to grab caravan merchants and escorts, even if\n"
-        "    they don't belong to the player's race. Foreign sentients\n"
-        "    (humans, elves) can be put to work, but you can't assign rooms\n"
-        "    to them and they don't show up in DwarfTherapist because the\n"
-        "    game treats them like pets.\n"
-        "  tweak stable-cursor [disable]\n"
-        "    Keeps exact position of dwarfmode cursor during exits to main menu.\n"
-        "    E.g. allows switching between t/q/k/d without losing position.\n"
-        /*"  tweak fix-dimensions [disable]\n"
-        "    Fixes subtracting small amount of thread/cloth/liquid from a stack\n"
-        "    by splitting the stack and subtracting from the remaining single item.\n"*/
-        // sort these alphabetically
-        "  tweak adamantine-cloth-wear [disable]\n"
-        "    Stops adamantine clothing from wearing out while being worn (bug 6481).\n"
-        "  tweak advmode-contained [disable]\n"
-        "    Fixes custom reactions with container inputs in advmode. The issue is\n"
-        "    that the screen tries to force you to select the contents separately\n"
-        "    from the container. This forcefully skips child reagents.\n"
-        "  tweak burrow-name-cancel [disable]\n"
-        "    Implements the \"back\" option when renaming a burrow.\n"
-        "  tweak block-labors [disable]\n"
-        "    Prevents labors that can't be used from being toggled.\n"
-        "  tweak cage-butcher [disable]\n"
-        "    Adds an option to butcher units when viewing cages.\n"
-        "  tweak civ-view-agreement\n"
-        "    Fixes overlapping text on the \"view agreement\" screen\n"
-        "  tweak condition-material\n"
-        "    Fixes a crash in the work order contition material list (bug 9905).\n"
-        "  tweak craft-age-wear [disable]\n"
-        "    Makes cloth and leather items wear out at the correct rate (bug 6003).\n"
-        "  tweak do-job-now [disable]\n"
-        "    Adds a job priority toggle to the jobs list.\n"
-        "  tweak embark-profile-name [disable]\n"
-        "    Allows the use of lowercase letters when saving embark profiles\n"
-        "  tweak eggs-fertile [disable]\n"
-        "    Displays a fertile/infertile indicator on nestboxes\n"
-        "  tweak farm-plot-select [disable]\n"
-        "    Adds \"Select all\" and \"Deselect all\" options to farm plot menus\n"
-        "  tweak fast-heat <max-ticks>\n"
-        "    Further improves temperature updates by ensuring that 1 degree of\n"
-        "    item temperature is crossed in no more than specified number of frames\n"
-        "    when updating from the environment temperature. Use 0 to disable.\n"
-        "  tweak fast-trade [disable]\n"
-        "    Makes Shift-Enter in the Move Goods to Depot and Trade screens select\n"
-        "    the current item (fully, in case of a stack), and scroll down one line.\n"
-        "  tweak fps-min [disable]\n"
-        "    Fixes the in-game minimum FPS setting (bug 6277)\n"
-        "  tweak hide-priority [disable]\n"
-        "    Adds an option to hide designation priority indicators\n"
-        "  tweak hotkey-clear [disable] \n"
-        "    Adds an option to clear currently-bound hotkeys\n"
-        "  tweak import-priority-category [disable]\n"
-        "    When meeting with a liaison, makes Shift+Left/Right arrow adjust\n"
-        "    the priority of an entire category of imports.\n"
-        "  tweak kitchen-prefs-all [disable]\n"
-        "    Adds an option to toggle cook/brew for all visible items in\n"
-        "    kitchen preferences\n"
-        "  tweak kitchen-prefs-color [disable]\n"
-        "    Changes color of enabled items to green in kitchen preferences\n"
-        "  tweak kitchen-prefs-empty [disable]\n"
-        "    Fixes a layout issue with empty kitchen tabs (bug 9000)\n"
-        "  tweak max-wheelbarrow [disable]\n"
-        "    Allows assigning more than 3 wheelbarrows to a stockpile\n"
-        "  tweak nestbox-color [disable]\n"
-        "    Makes built nestboxes use the color of their material\n"
-        "  tweak military-color-assigned [disable]\n"
-        "    Color squad candidates already assigned to other squads in brown/green\n"
-        "    to make them stand out more in the list.\n"
-        "  tweak military-stable-assign [disable]\n"
-        "    Preserve list order and cursor position when assigning to squad,\n"
-        "    i.e. stop the rightmost list of the Positions page of the military\n"
-        "    screen from constantly jumping to the top.\n"
-        "  tweak partial-items [disable]\n"
-        "    Displays percentages on partially-consumed items such as hospital cloth\n"
-        "  tweak pausing-fps-counter [disable]\n"
-        "    Replace fortress mode FPS counter with one that stops counting \n"
-        "    when paused.\n"
-        "  tweak reaction-gloves [disable]\n"
-        "    Changes custom reactions to produce gloves in sets with correct handedness\n"
-        "  tweak shift-8-scroll [disable]\n"
-        "    Gives Shift+8 (or *) priority when scrolling menus, instead of \n"
-        "    scrolling the map\n"
-        "  tweak stone-status-all [disable]\n"
-        "    Adds an option to toggle the economic status of all stones\n"
-        "  tweak title-start-rename [disable]\n"
-        "    Adds a safe rename option to the title screen \"Start Playing\" menu\n"
-        "  tweak tradereq-pet-gender [disable]\n"
-        "    Displays the gender of pets in the trade request list\n"
-        // sort these alphabetically
-//        "  tweak military-training [disable]\n"
-//        "    Speed up melee squad training, removing inverse dependency on unit count.\n"
-    ));
+        "tweak",
+        "Various tweaks for minor bugs.",
+        tweak));
 
     TWEAK_HOOK("adamantine-cloth-wear", adamantine_cloth_wear_armor_hook, incWearTimer);
     TWEAK_HOOK("adamantine-cloth-wear", adamantine_cloth_wear_helm_hook, incWearTimer);
@@ -438,339 +325,6 @@ command_result fix_clothing_ownership(color_ostream &out, df::unit* unit)
     return CR_OK;
 }
 
-static void correct_dimension(df::item_actual *self, int32_t &delta, int32_t dim)
-{
-    // Zero dimension or remainder?
-    if (dim <= 0 || self->stack_size <= 1) return;
-    int rem = delta % dim;
-    if (rem == 0) return;
-    // If destroys, pass through
-    int intv = delta / dim;
-    if (intv >= self->stack_size) return;
-    // Subtract int part
-    delta = rem;
-    self->stack_size -= intv;
-    if (self->stack_size <= 1) return;
-
-    // If kills the item or cannot split, round up.
-    if (!self->flags.bits.in_inventory || !Items::getContainer(self))
-    {
-        delta = dim;
-        return;
-    }
-
-    // Otherwise split the stack
-    color_ostream_proxy out(Core::getInstance().getConsole());
-    out.print("fix-dimensions: splitting stack #%d for delta %d.\n", self->id, delta);
-
-    auto copy = self->splitStack(self->stack_size-1, true);
-    if (copy) copy->categorize(true);
-}
-
-struct dimension_liquid_hook : df::item_liquid_miscst {
-    typedef df::item_liquid_miscst interpose_base;
-
-    DEFINE_VMETHOD_INTERPOSE(bool, subtractDimension, (int32_t delta))
-    {
-        correct_dimension(this, delta, dimension);
-        return INTERPOSE_NEXT(subtractDimension)(delta);
-    }
-};
-
-IMPLEMENT_VMETHOD_INTERPOSE(dimension_liquid_hook, subtractDimension);
-
-struct dimension_powder_hook : df::item_powder_miscst {
-    typedef df::item_powder_miscst interpose_base;
-
-    DEFINE_VMETHOD_INTERPOSE(bool, subtractDimension, (int32_t delta))
-    {
-        correct_dimension(this, delta, dimension);
-        return INTERPOSE_NEXT(subtractDimension)(delta);
-    }
-};
-
-IMPLEMENT_VMETHOD_INTERPOSE(dimension_powder_hook, subtractDimension);
-
-struct dimension_bar_hook : df::item_barst {
-    typedef df::item_barst interpose_base;
-
-    DEFINE_VMETHOD_INTERPOSE(bool, subtractDimension, (int32_t delta))
-    {
-        correct_dimension(this, delta, dimension);
-        return INTERPOSE_NEXT(subtractDimension)(delta);
-    }
-};
-
-IMPLEMENT_VMETHOD_INTERPOSE(dimension_bar_hook, subtractDimension);
-
-struct dimension_thread_hook : df::item_threadst {
-    typedef df::item_threadst interpose_base;
-
-    DEFINE_VMETHOD_INTERPOSE(bool, subtractDimension, (int32_t delta))
-    {
-        correct_dimension(this, delta, dimension);
-        return INTERPOSE_NEXT(subtractDimension)(delta);
-    }
-};
-
-IMPLEMENT_VMETHOD_INTERPOSE(dimension_thread_hook, subtractDimension);
-
-struct dimension_cloth_hook : df::item_clothst {
-    typedef df::item_clothst interpose_base;
-
-    DEFINE_VMETHOD_INTERPOSE(bool, subtractDimension, (int32_t delta))
-    {
-        correct_dimension(this, delta, dimension);
-        return INTERPOSE_NEXT(subtractDimension)(delta);
-    }
-};
-
-IMPLEMENT_VMETHOD_INTERPOSE(dimension_cloth_hook, subtractDimension);
-
-/*
-// Unit updates are executed based on an action divisor variable,
-// which is computed from the alive unit count and has range 10-100.
-static int adjust_unit_divisor(int value) {
-    return value*10/DF_GLOBAL_FIELD(ui, unit_action_divisor, 10);
-}
-
-static bool can_spar(df::unit *unit) {
-    return unit->counters2.exhaustion <= 2000 && // actually 4000, but leave a gap
-           (unit->status2.limbs_grasp_count > 0 || unit->status2.limbs_grasp_max == 0) &&
-           (!unit->health || (unit->health->flags.whole&0x7FF) == 0) &&
-           (!unit->job.current_job || unit->job.current_job->job_type != job_type::Rest);
-}
-
-static bool has_spar_inventory(df::unit *unit, df::job_skill skill)
-{
-    using namespace df::enums::job_skill;
-
-    auto type = ENUM_ATTR(job_skill, type, skill);
-
-    if (type == job_skill_class::MilitaryWeapon)
-    {
-        for (size_t i = 0; i < unit->inventory.size(); i++)
-        {
-            auto item = unit->inventory[i];
-            if (item->mode == df::unit_inventory_item::Weapon &&
-                item->item->getMeleeSkill() == skill)
-                return true;
-        }
-
-        return false;
-    }
-
-    switch (skill) {
-        case THROW:
-        case RANGED_COMBAT:
-            return false;
-
-        case SHIELD:
-            for (size_t i = 0; i < unit->inventory.size(); i++)
-            {
-                auto item = unit->inventory[i];
-                if (item->mode == df::unit_inventory_item::Weapon &&
-                    item->item->getType() == item_type::SHIELD)
-                    return true;
-            }
-            return false;
-
-        case ARMOR:
-            for (size_t i = 0; i < unit->inventory.size(); i++)
-            {
-                auto item = unit->inventory[i];
-                if (item->mode == df::unit_inventory_item::Worn &&
-                    item->item->isArmorNotClothing())
-                    return true;
-            }
-            return false;
-
-        default:
-            return true;
-    }
-}
-
-struct military_training_ct_hook : df::activity_event_combat_trainingst {
-    typedef df::activity_event_combat_trainingst interpose_base;
-
-    DEFINE_VMETHOD_INTERPOSE(void, process, (df::unit *unit))
-    {
-        auto act = df::activity_entry::find(activity_id);
-        int cur_neid = act ? act->next_event_id : 0;
-        int cur_oc = organize_counter;
-
-        INTERPOSE_NEXT(process)(unit);
-
-        // Shorten the time it takes to organize stuff, so that in
-        // reality it remains the same instead of growing proportionally
-        // to the unit count.
-        if (organize_counter > cur_oc && organize_counter > 0)
-            organize_counter = adjust_unit_divisor(organize_counter);
-
-        if (act && act->next_event_id > cur_neid)
-        {
-            // New events were added. Check them.
-            for (size_t i = 0; i < act->events.size(); i++)
-            {
-                auto event = act->events[i];
-                if (event->flags.bits.dismissed || event->event_id < cur_neid)
-                    continue;
-
-                if (auto sp = strict_virtual_cast<df::activity_event_sparringst>(event))
-                {
-                    // Sparring has a problem in that all of its participants decrement
-                    // the countdown variable. Fix this by multiplying it by the member count.
-                    sp->countdown = sp->countdown * sp->participants.units.size();
-                }
-                else if (auto sd = strict_virtual_cast<df::activity_event_skill_demonstrationst>(event))
-                {
-                    // Adjust initial counter values
-                    sd->train_countdown = adjust_unit_divisor(sd->train_countdown);
-                    sd->wait_countdown = adjust_unit_divisor(sd->wait_countdown);
-
-                    // Check if the game selected the most skilled unit as the teacher
-                    auto &units = sd->participants.units;
-                    int maxv = -1, cur_xp = -1, minv = 0;
-                    int best = -1;
-                    size_t spar = 0;
-
-                    for (size_t j = 0; j < units.size(); j++)
-                    {
-                        auto unit = df::unit::find(units[j]);
-                        if (!unit) continue;
-                        int xp = Units::getExperience(unit, sd->skill, true);
-                        if (units[j] == sd->unit_id)
-                            cur_xp = xp;
-                        if (j == 0 || xp < minv)
-                            minv = xp;
-                        if (xp > maxv) {
-                            maxv = xp;
-                            best = j;
-                        }
-                        if (can_spar(unit) && has_spar_inventory(unit, sd->skill))
-                            spar++;
-                    }
-
-#if 0
-                    color_ostream_proxy out(Core::getInstance().getConsole());
-#endif
-
-                    // If the xp gap is low, sometimes replace with sparring
-                    if ((maxv - minv) < 64*15 && spar == units.size() &&
-                        random_int(45) >= 30 + (maxv-minv)/64)
-                    {
-#if 0
-                        out.print("Replacing %s demonstration (xp %d-%d, gap %d) with sparring.\n",
-                                  ENUM_KEY_STR(job_skill, sd->skill).c_str(), minv, maxv, maxv-minv);
-#endif
-
-                        if (auto spar = df::allocate<df::activity_event_sparringst>())
-                        {
-                            spar->event_id = sd->event_id;
-                            spar->activity_id = sd->activity_id;
-                            spar->parent_event_id = sd->parent_event_id;
-                            spar->flags = sd->flags;
-                            spar->participants = sd->participants;
-                            spar->building_id = sd->building_id;
-                            spar->countdown = 300*units.size();
-
-                            delete sd;
-                            act->events[i] = spar;
-
-                            continue;
-                        }
-                    }
-
-                    // If the teacher has less xp than somebody else, switch
-                    if (best >= 0 && maxv > cur_xp)
-                    {
-#if 0
-                        out.print("Replacing %s teacher %d (%d xp) with %d (%d xp); xp gap %d.\n",
-                                  ENUM_KEY_STR(job_skill, sd->skill).c_str(),
-                                  sd->unit_id, cur_xp, units[best], maxv, maxv-minv);
-#endif
-
-                        sd->hist_figure_id = sd->participants.histfigs[best];
-                        sd->unit_id = units[best];
-                    }
-                    else
-                    {
-#if 0
-                        out.print("Not changing %s demonstration (xp %d-%d, gap %d).\n",
-                                  ENUM_KEY_STR(job_skill, sd->skill).c_str(),
-                                  minv, maxv, maxv-minv);
-#endif
-                    }
-                }
-            }
-        }
-    }
-};
-*/
-
-/*
-IMPLEMENT_VMETHOD_INTERPOSE(military_training_ct_hook, process);
-
-struct military_training_sd_hook : df::activity_event_skill_demonstrationst {
-    typedef df::activity_event_skill_demonstrationst interpose_base;
-
-    DEFINE_VMETHOD_INTERPOSE(void, process, (df::unit *unit))
-    {
-        int cur_oc = organize_counter;
-        int cur_tc = train_countdown;
-
-        INTERPOSE_NEXT(process)(unit);
-
-        // Shorten the counters if they changed
-        if (organize_counter > cur_oc && organize_counter > 0)
-            organize_counter = adjust_unit_divisor(organize_counter);
-        if (train_countdown > cur_tc)
-            train_countdown = adjust_unit_divisor(train_countdown);
-    }
-};
-
-IMPLEMENT_VMETHOD_INTERPOSE(military_training_sd_hook, process);
-
-template<class T>
-bool is_done(T *event, df::unit *unit)
-{
-    return event->flags.bits.dismissed ||
-           binsearch_index(event->participants.units, unit->id) < 0;
-}
-
-struct military_training_sp_hook : df::activity_event_sparringst {
-    typedef df::activity_event_sparringst interpose_base;
-
-    DEFINE_VMETHOD_INTERPOSE(void, process, (df::unit *unit))
-    {
-        INTERPOSE_NEXT(process)(unit);
-
-        // Since there are no counters to fix, repeat the call
-        int cnt = (DF_GLOBAL_FIELD(ui, unit_action_divisor, 10)+5) / 10;
-        for (int i = 1; i < cnt && !is_done(this, unit); i++)
-            INTERPOSE_NEXT(process)(unit);
-    }
-};
-
-IMPLEMENT_VMETHOD_INTERPOSE(military_training_sp_hook, process);
-
-struct military_training_id_hook : df::activity_event_individual_skill_drillst {
-    typedef df::activity_event_individual_skill_drillst interpose_base;
-
-    DEFINE_VMETHOD_INTERPOSE(void, process, (df::unit *unit))
-    {
-        INTERPOSE_NEXT(process)(unit);
-
-        // Since there are no counters to fix, repeat the call
-        int cnt = (DF_GLOBAL_FIELD(ui, unit_action_divisor, 10)+5) / 10;
-        for (int i = 1; i < cnt && !is_done(this, unit); i++)
-            INTERPOSE_NEXT(process)(unit);
-    }
-};
-
-IMPLEMENT_VMETHOD_INTERPOSE(military_training_id_hook, process);
-*/
-
 static void enable_hook(color_ostream &out, VMethodInterposeLinkBase &hook, vector <string> &parameters)
 {
     if (vector_get(parameters, 1) == "disable")
@@ -931,22 +485,6 @@ static command_result tweak(color_ostream &out, vector <string> &parameters)
         enable_tweak(cmd, out, parameters);
         return CR_OK;
     }
-    /*else if (cmd == "fix-dimensions")
-    {
-        enable_hook(out, INTERPOSE_HOOK(dimension_liquid_hook, subtractDimension), parameters);
-        enable_hook(out, INTERPOSE_HOOK(dimension_powder_hook, subtractDimension), parameters);
-        enable_hook(out, INTERPOSE_HOOK(dimension_bar_hook, subtractDimension), parameters);
-        enable_hook(out, INTERPOSE_HOOK(dimension_thread_hook, subtractDimension), parameters);
-        enable_hook(out, INTERPOSE_HOOK(dimension_cloth_hook, subtractDimension), parameters);
-    }*/
-/*
-    else if (cmd == "military-training")
-    {
-        enable_hook(out, INTERPOSE_HOOK(military_training_ct_hook, process), parameters);
-        enable_hook(out, INTERPOSE_HOOK(military_training_sd_hook, process), parameters);
-        enable_hook(out, INTERPOSE_HOOK(military_training_sp_hook, process), parameters);
-        enable_hook(out, INTERPOSE_HOOK(military_training_id_hook, process), parameters);
-    }*/
     else
     {
         return enable_tweak(cmd, out, parameters);

From 6686f703aeeae31d43c6c548e5860a6bbbf7831c Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Sun, 31 Jul 2022 13:32:06 -0700
Subject: [PATCH 408/854] update docs for workNow

---
 docs/plugins/workNow.rst | 23 +++++++++++++++--------
 plugins/workNow.cpp      | 14 ++++----------
 2 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/docs/plugins/workNow.rst b/docs/plugins/workNow.rst
index bacecf612..dda3fea5c 100644
--- a/docs/plugins/workNow.rst
+++ b/docs/plugins/workNow.rst
@@ -1,12 +1,19 @@
 workNow
 =======
-Don't allow dwarves to idle if any jobs are available.
+Tags:
+:dfhack-keybind:`workNow`
 
-When workNow is active, every time the game pauses, DF will make dwarves
-perform any appropriate available jobs.  This includes when you one step
-through the game using the pause menu.  Usage:
+Reduce the time that dwarves idle after completing a job. After finishing a job,
+dwarves will wander away for a while before picking up a new job. This plugin
+will automatically poke the game to assign dwarves to new tasks.
 
-:workNow:       print workNow status
-:workNow 0:     deactivate workNow
-:workNow 1:     activate workNow (look for jobs on pause, and only then)
-:workNow 2:     make dwarves look for jobs whenever a job completes
+Usage:
+
+``workNow``
+    Print current plugin status.
+``workNow 0``
+    Stop monitoring and poking.
+``workNow 1``
+    Poke the game to assign dwarves to tasks whenever the game is paused.
+``workNow 2``
+    Poke the game to assign dwarves to tasks whenever a dwarf finishes a job.
diff --git a/plugins/workNow.cpp b/plugins/workNow.cpp
index ae76b09f3..2286fee7e 100644
--- a/plugins/workNow.cpp
+++ b/plugins/workNow.cpp
@@ -29,16 +29,10 @@ DFhackCExport command_result plugin_init(color_ostream& out, std::vector<PluginC
     if (!process_jobs || !process_dig)
         return CR_FAILURE;
 
-    commands.push_back(PluginCommand("workNow", "Don't allow dwarves to idle if any jobs are available", workNow, false, "When workNow is active, every time the game pauses, DF will make dwarves perform any appropriate available jobs. This includes when you one step through the game using the pause menu. When workNow is in mode 2, it will make dwarves look for jobs every time a job completes.\n"
-                "workNow\n"
-                "  print workNow status\n"
-                "workNow 0\n"
-                "  deactivate workNow\n"
-                "workNow 1\n"
-                "  activate workNow (look for jobs on pause, and only then)\n"
-                "workNow 2\n"
-                "  make dwarves look for jobs whenever a job completes\n"
-    ));
+    commands.push_back(PluginCommand(
+        "workNow",
+        "Reduce the time that dwarves idle after completing a job.",
+        workNow));
 
     return CR_OK;
 }

From d8f3e203e0aa22f2e362303d3834cd882eb20b4c Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Sun, 31 Jul 2022 13:38:25 -0700
Subject: [PATCH 409/854] add image for stonesense

---
 docs/images/stonesense-roadtruss.jpg | Bin 0 -> 614174 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 docs/images/stonesense-roadtruss.jpg

diff --git a/docs/images/stonesense-roadtruss.jpg b/docs/images/stonesense-roadtruss.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..19e71dd704f0a4edb0dbe6bdaa41d6c5ed282fec
GIT binary patch
literal 614174
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%0AgS%wD)iisT{uLQXBx$mXkP&38Fc`UG>Jc
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
T?!^;=nvyy*e4tiI8`S>-{k`RF

literal 0
HcmV?d00001


From d3f83eca44027870bfc441b41c75e2065b546889 Mon Sep 17 00:00:00 2001
From: DFHack-Urist via GitHub Actions
 <63161697+DFHack-Urist@users.noreply.github.com>
Date: Tue, 2 Aug 2022 07:19:34 +0000
Subject: [PATCH 410/854] Auto-update submodules

scripts: master
---
 scripts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts b/scripts
index b9d49dfc3..3aac1b07b 160000
--- a/scripts
+++ b/scripts
@@ -1 +1 @@
-Subproject commit b9d49dfc36dae9b8b1bf91c2a8e8179ca554abdc
+Subproject commit 3aac1b07be05b58217c2ebfecafff908dadb2044

From 2c9537b98e1186323f381f24e57aa104fdb04180 Mon Sep 17 00:00:00 2001
From: "pre-commit-ci[bot]"
 <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Date: Mon, 1 Aug 2022 21:29:09 +0000
Subject: [PATCH 411/854] [pre-commit.ci] pre-commit autoupdate
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

updates:
- [github.com/python-jsonschema/check-jsonschema: 0.16.2 → 0.17.1](https://github.com/python-jsonschema/check-jsonschema/compare/0.16.2...0.17.1)
- [github.com/Lucas-C/pre-commit-hooks: v1.2.0 → v1.3.0](https://github.com/Lucas-C/pre-commit-hooks/compare/v1.2.0...v1.3.0)
---
 .pre-commit-config.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 25601d8b8..125b1e931 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -20,11 +20,11 @@ repos:
       args: ['--fix=lf']
     - id: trailing-whitespace
 - repo: https://github.com/python-jsonschema/check-jsonschema
-  rev: 0.16.2
+  rev: 0.17.1
   hooks:
     - id: check-github-workflows
 - repo: https://github.com/Lucas-C/pre-commit-hooks
-  rev: v1.2.0
+  rev: v1.3.0
   hooks:
     - id: forbid-tabs
       exclude_types:

From 391a4d8883c5d92053df59a15cb82c4318fbc680 Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Sat, 23 Jul 2022 22:12:34 -0700
Subject: [PATCH 412/854] use dfhack-config/lua.history instead of lua.history

---
 library/LuaTools.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/library/LuaTools.cpp b/library/LuaTools.cpp
index cef46c053..fea90b394 100644
--- a/library/LuaTools.cpp
+++ b/library/LuaTools.cpp
@@ -1145,7 +1145,7 @@ bool DFHack::Lua::InterpreterLoop(color_ostream &out, lua_State *state,
         return false;
 
     if (!hfile)
-        hfile = "lua.history";
+        hfile = "dfhack-config/lua.history";
     if (!prompt)
         prompt = "lua";
 

From 98f8fcd0688e77a685194375842e9c207897ea14 Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Sat, 23 Jul 2022 22:12:58 -0700
Subject: [PATCH 413/854] move liquids.history to dfhack-config/liquids.history

---
 plugins/liquids.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/plugins/liquids.cpp b/plugins/liquids.cpp
index 5dd64812f..76c098c8a 100644
--- a/plugins/liquids.cpp
+++ b/plugins/liquids.cpp
@@ -55,6 +55,7 @@ using namespace df::enums;
 DFHACK_PLUGIN("liquids");
 REQUIRE_GLOBAL(world);
 
+static const char * HISTORY_FILE = "dfhack-config/liquids.history";
 CommandHistory liquids_hist;
 
 command_result df_liquids (color_ostream &out, vector <string> & parameters);
@@ -62,7 +63,7 @@ command_result df_liquids_here (color_ostream &out, vector <string> & parameters
 
 DFhackCExport command_result plugin_init ( color_ostream &out, std::vector <PluginCommand> &commands)
 {
-    liquids_hist.load("liquids.history");
+    liquids_hist.load(HISTORY_FILE);
     commands.push_back(PluginCommand(
         "liquids", "Place magma, water or obsidian.",
         df_liquids, true,
@@ -80,7 +81,7 @@ DFhackCExport command_result plugin_init ( color_ostream &out, std::vector <Plug
 
 DFhackCExport command_result plugin_shutdown ( color_ostream &out )
 {
-    liquids_hist.save("liquids.history");
+    liquids_hist.save(HISTORY_FILE);
     return CR_OK;
 }
 

From 612cd154df91b5fdd8b0c35ae3f0cbcdbf7ef584 Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Sat, 23 Jul 2022 22:13:19 -0700
Subject: [PATCH 414/854] move tiletypes.history to
 dfhack-config/tiletypes.history

---
 plugins/tiletypes.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/plugins/tiletypes.cpp b/plugins/tiletypes.cpp
index 7f39ddd4e..b8bbc8d04 100644
--- a/plugins/tiletypes.cpp
+++ b/plugins/tiletypes.cpp
@@ -74,7 +74,7 @@ static const struct_field_info tiletypes_options_fields[] = {
 };
 struct_identity tiletypes_options::_identity(sizeof(tiletypes_options), &df::allocator_fn<tiletypes_options>, NULL, "tiletypes_options", NULL, tiletypes_options_fields);
 
-
+static const char * HISTORY_FILE = "dfhack-config/tiletypes.history";
 CommandHistory tiletypes_hist;
 
 command_result df_tiletypes (color_ostream &out, vector <string> & parameters);
@@ -84,7 +84,7 @@ command_result df_tiletypes_here_point (color_ostream &out, vector <string> & pa
 
 DFhackCExport command_result plugin_init ( color_ostream &out, std::vector <PluginCommand> &commands)
 {
-    tiletypes_hist.load("tiletypes.history");
+    tiletypes_hist.load(HISTORY_FILE);
     commands.push_back(PluginCommand("tiletypes", "Paint map tiles freely, similar to liquids.", df_tiletypes, true));
     commands.push_back(PluginCommand("tiletypes-command", "Run tiletypes commands (seperated by ' ; ')", df_tiletypes_command));
     commands.push_back(PluginCommand("tiletypes-here", "Repeat tiletypes command at cursor (with brush)", df_tiletypes_here));
@@ -94,7 +94,7 @@ DFhackCExport command_result plugin_init ( color_ostream &out, std::vector <Plug
 
 DFhackCExport command_result plugin_shutdown ( color_ostream &out )
 {
-    tiletypes_hist.save("tiletypes.history");
+    tiletypes_hist.save(HISTORY_FILE);
     return CR_OK;
 }
 

From 56e7a154593d36f6b4a6ae98e11febc8b3b023c3 Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Tue, 26 Jul 2022 10:21:09 -0700
Subject: [PATCH 415/854] move dfhack.history to dfhack-config/dfhack.history

---
 library/Core.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/library/Core.cpp b/library/Core.cpp
index 12faa9f7c..1cd00d3aa 100644
--- a/library/Core.cpp
+++ b/library/Core.cpp
@@ -1469,12 +1469,14 @@ void fInitthread(void * iodata)
 // A thread function... for the interactive console.
 void fIOthread(void * iodata)
 {
+    static const char * HISTORY_FILE = "dfhack-config/dfhack.history";
+
     IODATA * iod = ((IODATA*) iodata);
     Core * core = iod->core;
     PluginManager * plug_mgr = ((IODATA*) iodata)->plug_mgr;
 
     CommandHistory main_history;
-    main_history.load("dfhack.history");
+    main_history.load(HISTORY_FILE);
 
     Console & con = core->getConsole();
     if (plug_mgr == 0)
@@ -1515,7 +1517,7 @@ void fIOthread(void * iodata)
         {
             // a proper, non-empty command was entered
             main_history.add(command);
-            main_history.save("dfhack.history");
+            main_history.save(HISTORY_FILE);
         }
 
         auto rv = core->runCommand(con, command);

From 7e3acc410e5030883f5d2aea06c0f2abfe9b4b45 Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Tue, 26 Jul 2022 10:40:10 -0700
Subject: [PATCH 416/854] update changelog

---
 docs/changelog.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/changelog.txt b/docs/changelog.txt
index 242ec37da..ce61d31d3 100644
--- a/docs/changelog.txt
+++ b/docs/changelog.txt
@@ -42,6 +42,7 @@ changelog.txt uses a syntax similar to RST, with a few special sequences:
 
 ## Misc Improvements
 - Init scripts: ``dfhack.init`` and other init scripts have moved to ``dfhack-config/init/``. If you have customized your ``dfhack.init`` file and want to keep your changes, please move the part that you have customized to the new location at ``dfhack-config/init/dfhack.init``. If you do not have changes that you want to keep, do not copy anything, and the new defaults will be used automatically.
+- History files: ``dfhack.history``, ``tiletypes.history``, ``lua.history``, and ``liquids.history`` have moved to the ``dfhack-config`` directory. If you'd like to keep the contents of your current history files, please move them to ``dfhack-config``.
 - `keybinding`: support backquote (\`) as a hotkey
 - `manipulator`: add a library of useful default professions
 - `manipulator`: move professions configuration from ``professions/`` to ``dfhack-config/professions/`` to keep it together with other dfhack configuration. If you have saved professions that you would like to keep, please manually move them to the new folder.

From 5b26d3361bee3e24ae95840f6be65f8eced5e7d9 Mon Sep 17 00:00:00 2001
From: DFHack-Urist via GitHub Actions
 <63161697+DFHack-Urist@users.noreply.github.com>
Date: Wed, 3 Aug 2022 07:17:28 +0000
Subject: [PATCH 417/854] Auto-update submodules

library/xml: master
scripts: master
---
 library/xml | 2 +-
 scripts     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/library/xml b/library/xml
index a04727cc4..dc118c5e9 160000
--- a/library/xml
+++ b/library/xml
@@ -1 +1 @@
-Subproject commit a04727cc4ec350399ce4d2ded4425f33c50cea50
+Subproject commit dc118c5e90aea6181a290e4bbf40e7f2974fb053
diff --git a/scripts b/scripts
index 3aac1b07b..6a66be4fa 160000
--- a/scripts
+++ b/scripts
@@ -1 +1 @@
-Subproject commit 3aac1b07be05b58217c2ebfecafff908dadb2044
+Subproject commit 6a66be4facd1d5a7b3ab4cb61c34c678d19e0795

From 0096f7c88279e71af9e6ac23149de7534692a9e3 Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Sun, 31 Jul 2022 23:42:59 -0700
Subject: [PATCH 418/854] split autonestbox out from zone

---
 plugins/CMakeLists.txt      |   1 +
 plugins/autonestbox.cpp     | 418 ++++++++++++++++++++++++++++++++++++
 plugins/lua/autonestbox.lua |  51 +++++
 plugins/zone.cpp            | 234 +-------------------
 4 files changed, 472 insertions(+), 232 deletions(-)
 create mode 100644 plugins/autonestbox.cpp
 create mode 100644 plugins/lua/autonestbox.lua

diff --git a/plugins/CMakeLists.txt b/plugins/CMakeLists.txt
index 4a4b74eaa..6ef5b59db 100644
--- a/plugins/CMakeLists.txt
+++ b/plugins/CMakeLists.txt
@@ -92,6 +92,7 @@ if(BUILD_SUPPORTED)
     dfhack_plugin(autolabor autolabor.cpp)
     dfhack_plugin(automaterial automaterial.cpp LINK_LIBRARIES lua)
     dfhack_plugin(automelt automelt.cpp)
+    dfhack_plugin(autonestbox autonestbox.cpp LINK_LIBRARIES lua)
     dfhack_plugin(autotrade autotrade.cpp)
     dfhack_plugin(blueprint blueprint.cpp LINK_LIBRARIES lua)
     dfhack_plugin(burrows burrows.cpp LINK_LIBRARIES lua)
diff --git a/plugins/autonestbox.cpp b/plugins/autonestbox.cpp
new file mode 100644
index 000000000..6c878806c
--- /dev/null
+++ b/plugins/autonestbox.cpp
@@ -0,0 +1,418 @@
+// - full automation of handling mini-pastures over nestboxes:
+//   go through all pens, check if they are empty and placed over a nestbox
+//   find female tame egg-layer who is not assigned to another pen and assign it to nestbox pasture
+//   maybe check for minimum age? it's not that useful to fill nestboxes with freshly hatched birds
+//   state and sleep setting is saved the first time autonestbox is started (to avoid writing stuff if the plugin is never used)
+
+#include "df/building_cagest.h"
+#include "df/building_civzonest.h"
+#include "df/building_nest_boxst.h"
+#include "df/general_ref_building_civzone_assignedst.h"
+#include "df/world.h"
+
+#include "Debug.h"
+#include "LuaTools.h"
+#include "PluginManager.h"
+
+#include "modules/Buildings.h"
+#include "modules/Gui.h"
+#include "modules/Maps.h"
+#include "modules/Persistence.h"
+#include "modules/Units.h"
+#include "modules/World.h"
+
+using std::string;
+using std::vector;
+
+using namespace DFHack;
+
+DFHACK_PLUGIN("autonestbox");
+DFHACK_PLUGIN_IS_ENABLED(is_enabled);
+
+REQUIRE_GLOBAL(world);
+
+static const string autonestbox_help =
+    "Assigns unpastured female egg-layers to nestbox zones.\n"
+    "Requires that you create pen/pasture zones above nestboxes.\n"
+    "If the pen is bigger than 1x1 the nestbox must be in the top left corner.\n"
+    "Only 1 unit will be assigned per pen, regardless of the size.\n"
+    "The age of the units is currently not checked, most birds grow up quite fast.\n"
+    "When called without options autonestbox will instantly run once.\n"
+    "Usage:\n"
+    "\n"
+    "enable autonestbox\n"
+    "   Start checking for unpastured egg-layers and assigning them to nestbox zones.\n"
+    "autonestbox now\n"
+    "   Run a scan and assignment cycle right now. Does not require that the plugin is enabled.\n"
+    "autonestbox ticks <ticks>\n"
+    "   Change the number of ticks between scan and assignment cycles when the plugin is enabled.\n"
+    "   The default is 6000 (about 8 days)\n";
+
+namespace DFHack {
+    DBG_DECLARE(autonestbox, status);
+    DBG_DECLARE(autonestbox, cycle);
+}
+
+static const string CONFIG_KEY = "autonestbox/config";
+static PersistentDataItem config;
+enum ConfigValues {
+    IS_ENABLED = 0,
+    CYCLE_TICKS = 1,
+};
+static int get_config_val(int index) {
+    if (!config.isValid())
+        return -1;
+    return config.ival(index);
+}
+static bool set_config_val(int index, int value) {
+    if (!config.isValid())
+        return false;
+    config.ival(index) = value;
+    return true;
+}
+
+static bool did_complain = false; // avoids message spam
+static size_t cycle_counter = 0;  // how many ticks since the last cycle
+
+struct autonestbox_options {
+    // whether to display help
+    bool help = false;
+
+    // whether to run a cycle right now
+    bool now = false;
+
+    // how many ticks to wait between automatic cycles, -1 means unset
+    int32_t ticks = -1;
+
+    static struct_identity _identity;
+};
+static const struct_field_info autonestbox_options_fields[] = {
+    { struct_field_info::PRIMITIVE, "help",  offsetof(autonestbox_options, help),  &df::identity_traits<bool>::identity,    0, 0 },
+    { struct_field_info::PRIMITIVE, "now",   offsetof(autonestbox_options, now),   &df::identity_traits<bool>::identity,    0, 0 },
+    { struct_field_info::PRIMITIVE, "ticks", offsetof(autonestbox_options, ticks), &df::identity_traits<int32_t>::identity, 0, 0 },
+    { struct_field_info::END }
+};
+struct_identity autonestbox_options::_identity(sizeof(autonestbox_options), &df::allocator_fn<autonestbox_options>, NULL, "autonestbox_options", NULL, autonestbox_options_fields);
+
+static command_result df_autonestbox(color_ostream &out, vector<string> &parameters);
+static void autonestbox_cycle(color_ostream &out);
+
+static void init_autonestbox(color_ostream &out) {
+    config = World::GetPersistentData(CONFIG_KEY);
+    
+    if (!config.isValid())
+        config = World::AddPersistentData(CONFIG_KEY);
+
+    if (get_config_val(IS_ENABLED) == -1) {
+        set_config_val(IS_ENABLED, 0);
+        set_config_val(CYCLE_TICKS, 6000);
+    }
+
+    if (is_enabled)
+        set_config_val(IS_ENABLED, 1);
+    else
+        is_enabled = (get_config_val(IS_ENABLED) == 1);
+    did_complain = false;
+}
+
+static void cleanup_autonestbox(color_ostream &out) {
+    is_enabled = false;
+}
+
+DFhackCExport command_result plugin_init(color_ostream &out, std::vector <PluginCommand> &commands) {
+    commands.push_back(PluginCommand(
+        "autonestbox",
+        "Auto-assign egg-laying female pets to nestbox zones.",
+        df_autonestbox,
+        false,
+        autonestbox_help.c_str()));
+
+    init_autonestbox(out);
+    return CR_OK;
+}
+
+DFhackCExport command_result plugin_enable(color_ostream &out, bool enable) {
+    if (!Maps::IsValid()) {
+        out.printerr("Cannot run autonestbox without a loaded map.\n");
+        return CR_FAILURE;
+    }
+
+    if (enable != is_enabled) {
+        is_enabled = enable;
+        if (is_enabled)
+            init_autonestbox(out);
+        else
+            cleanup_autonestbox(out);
+    }
+    return CR_OK;
+}
+
+DFhackCExport command_result plugin_shutdown (color_ostream &out) {
+    cleanup_autonestbox(out);
+    return CR_OK;
+}
+
+DFhackCExport command_result plugin_onstatechange(color_ostream &out, state_change_event event) {
+    switch (event) {
+    case DFHack::SC_MAP_LOADED:
+        init_autonestbox(out);
+        break;
+    case DFHack::SC_MAP_UNLOADED:
+        cleanup_autonestbox(out);
+        break;
+    default:
+        break;
+    }
+    return CR_OK;
+}
+
+DFhackCExport command_result plugin_onupdate(color_ostream &out) {
+    if (is_enabled && ++cycle_counter >= (size_t)get_config_val(CYCLE_TICKS))
+        autonestbox_cycle(out);
+    return CR_OK;
+}
+
+static bool get_options(color_ostream &out,
+                        autonestbox_options &opts,
+                        const vector<string> &parameters)
+{
+    auto L = Lua::Core::State;
+    Lua::StackUnwinder top(L);
+
+    if (!lua_checkstack(L, parameters.size() + 2) ||
+        !Lua::PushModulePublic(
+            out, L, "plugins.autonestbox", "parse_commandline")) {
+        out.printerr("Failed to load autonestbox Lua code\n");
+        return false;
+    }
+
+    Lua::Push(L, &opts);
+    for (const string &param : parameters)
+        Lua::Push(L, param);
+
+    if (!Lua::SafeCall(out, L, parameters.size() + 1, 0))
+        return false;
+
+    return true;
+}
+
+static command_result df_autonestbox(color_ostream &out, vector<string> &parameters) {
+    CoreSuspender suspend;
+
+    if (!Maps::IsValid()) {
+        out.printerr("Cannot run autonestbox without a loaded map.\n");
+        return CR_FAILURE;
+    }
+
+    autonestbox_options opts;
+    if (!get_options(out, opts, parameters) || opts.help)
+        return CR_WRONG_USAGE;
+
+    if (opts.ticks > -1) {
+        set_config_val(CYCLE_TICKS, opts.ticks);
+        INFO(status,out).print("New cycle timer: %d ticks.\n", opts.ticks);
+    }
+    else if (opts.now) {
+        autonestbox_cycle(out);
+    }
+    return CR_OK;
+}
+
+/////////////////////////////////////////////////////
+// autonestbox cycle logic
+//
+
+static bool isEmptyPasture(df::building *building) {
+    if (!Buildings::isPenPasture(building))
+        return false;
+    df::building_civzonest *civ = (df::building_civzonest *)building;
+    return (civ->assigned_units.size() == 0);
+}
+
+static bool isFreeNestboxAtPos(int32_t x, int32_t y, int32_t z) {
+    for (auto building : world->buildings.all) {
+        if (building->getType() == df::building_type::NestBox
+                && building->x1 == x
+                && building->y1 == y
+                && building->z  == z) {
+            df::building_nest_boxst *nestbox = (df::building_nest_boxst *)building;
+            if (nestbox->claimed_by == -1 && nestbox->contained_items.size() == 1) {
+                return true;
+            }
+        }
+    }
+    return false;
+}
+
+static df::building* findFreeNestboxZone() {
+    for (auto building : world->buildings.all) {
+        if (isEmptyPasture(building) &&
+                Buildings::isActive(building) &&
+                isFreeNestboxAtPos(building->x1, building->y1, building->z)) {
+            return building;
+        }
+    }
+    return NULL;
+}
+
+static bool isInBuiltCage(df::unit *unit) {
+    for (auto building : world->buildings.all) {
+        if (building->getType() == df::building_type::Cage) {
+            df::building_cagest* cage = (df::building_cagest *)building;
+            for (auto unitid : cage->assigned_units) {
+                if (unitid == unit->id)
+                    return true;
+            }
+        }
+    }
+    return false;
+}
+
+// check if assigned to pen, pit, (built) cage or chain
+// note: BUILDING_CAGED is not set for animals (maybe it's used for dwarves who get caged as sentence)
+// animals in cages (no matter if built or on stockpile) get the ref CONTAINED_IN_ITEM instead
+// removing them from cages on stockpiles is no problem even without clearing the ref
+// and usually it will be desired behavior to do so.
+static bool isAssigned(df::unit *unit) {
+    for (auto ref : unit->general_refs) {
+        auto rtype = ref->getType();
+        if(rtype == df::general_ref_type::BUILDING_CIVZONE_ASSIGNED
+                || rtype == df::general_ref_type::BUILDING_CAGED
+                || rtype == df::general_ref_type::BUILDING_CHAIN
+                || (rtype == df::general_ref_type::CONTAINED_IN_ITEM && isInBuiltCage(unit))) {
+            return true;
+        }
+    }
+    return false;
+}
+
+static bool isFreeEgglayer(df::unit *unit)
+{
+    return Units::isActive(unit) && !Units::isUndead(unit)
+        && Units::isFemale(unit)
+        && Units::isTame(unit)
+        && Units::isOwnCiv(unit)
+        && Units::isEggLayer(unit)
+        && !isAssigned(unit)
+        && !Units::isGrazer(unit) // exclude grazing birds because they're messy
+        && !Units::isMerchant(unit) // don't steal merchant mounts
+        && !Units::isForest(unit);  // don't steal birds from traders, they hate that
+}
+
+static df::unit * findFreeEgglayer() {
+    for (auto unit : world->units.all) {
+        if (isFreeEgglayer(unit))
+            return unit;
+    }
+    return NULL;
+}
+
+static df::general_ref_building_civzone_assignedst * createCivzoneRef() {
+    static bool vt_initialized = false;
+
+    // after having run successfully for the first time it's safe to simply create the object
+    if (vt_initialized) {
+        return (df::general_ref_building_civzone_assignedst *)
+            df::general_ref_building_civzone_assignedst::_identity.instantiate();
+    }
+
+    // being called for the first time, need to initialize the vtable
+    for (auto creature : world->units.all) {
+        for (auto ref : creature->general_refs) {
+            if (ref->getType() == df::general_ref_type::BUILDING_CIVZONE_ASSIGNED) {
+                if (strict_virtual_cast<df::general_ref_building_civzone_assignedst>(ref)) {
+                    vt_initialized = true;
+                    // !! calling new() doesn't work, need _identity.instantiate() instead !!
+                    return (df::general_ref_building_civzone_assignedst *)
+                        df::general_ref_building_civzone_assignedst::_identity.instantiate();
+                }
+            }
+        }
+    }
+    return NULL;
+}
+
+static bool assignUnitToZone(color_ostream &out, df::unit *unit, df::building *building) {
+    // try to get a fresh civzone ref
+    df::general_ref_building_civzone_assignedst *ref = createCivzoneRef();
+    if (!ref) {
+        ERR(cycle,out).print("Could not find a clonable activity zone reference!"
+            " You need to pen/pasture/pit at least one creature"
+            " before autonestbox can function.\n");
+        return false;
+    }
+
+    ref->building_id = building->id;
+    unit->general_refs.push_back(ref);
+
+    df::building_civzonest *civz = (df::building_civzonest *)building;
+    civz->assigned_units.push_back(unit->id);
+
+    INFO(cycle,out).print("Unit %d (%s) assigned to nestbox zone %d (%s)\n",
+        unit->id, Units::getRaceName(unit).c_str(),
+        building->id, building->name.c_str());
+
+    return true;
+}
+
+static size_t countFreeEgglayers() {
+    size_t count = 0;
+    for (auto unit : world->units.all) {
+        if (isFreeEgglayer(unit))
+            ++count;
+    }
+    return count;
+}
+
+static size_t assign_nestboxes(color_ostream &out) {
+    size_t processed = 0;
+    df::building *free_building = NULL;
+    df::unit *free_unit = NULL;
+    do {
+        free_building = findFreeNestboxZone();
+        free_unit = findFreeEgglayer();
+        if (free_building && free_unit) {
+            if (!assignUnitToZone(out, free_unit, free_building)) {
+                DEBUG(cycle,out).print("Failed to assign unit to building.\n");
+                return processed;
+            }
+            ++processed;
+        }
+    } while (free_unit && free_building);
+
+    if (free_unit && !free_building) {
+        static size_t old_count = 0;
+        size_t freeEgglayers = countFreeEgglayers();
+        // avoid spamming the same message
+        if (old_count != freeEgglayers)
+            did_complain = false;
+        old_count = freeEgglayers;
+        if (!did_complain) {
+            stringstream ss;
+            ss << freeEgglayers;
+            string announce = "Not enough free nestbox zones found! You need " + ss.str() + " more.";
+            Gui::showAnnouncement(announce, 6, true);
+            out << announce << endl;
+            did_complain = true;
+        }
+    }
+    return processed;
+}
+
+static void autonestbox_cycle(color_ostream &out) {
+    // mark that we have recently run
+    cycle_counter = 0;
+
+    size_t processed = assign_nestboxes(out);
+    if (processed > 0) {
+        stringstream ss;
+        ss << processed << " nestboxes were assigned.";
+        string announce = ss.str();
+        Gui::showAnnouncement(announce, 2, false);
+        out << announce << endl;
+        // can complain again
+        // (might lead to spamming the same message twice, but catches the case
+        // where for example 2 new egglayers hatched right after 2 zones were created and assigned)
+        did_complain = false;
+    }
+}
diff --git a/plugins/lua/autonestbox.lua b/plugins/lua/autonestbox.lua
new file mode 100644
index 000000000..f7140b0b7
--- /dev/null
+++ b/plugins/lua/autonestbox.lua
@@ -0,0 +1,51 @@
+local _ENV = mkmodule('plugins.autonestbox')
+
+local argparse = require('argparse')
+
+local function is_int(val)
+    return val and val == math.floor(val)
+end
+
+local function is_positive_int(val)
+    return is_int(val) and val > 0
+end
+
+local function process_args(opts, args)
+    if args[1] == 'help' then
+        opts.help = true
+        return
+    end
+
+    return argparse.processArgsGetopt(args, {
+            {'h', 'help', handler=function() opts.help = true end},
+        })
+end
+
+function parse_commandline(opts, ...)
+    local positionals = process_args(opts, {...})
+
+    if opts.help then return end
+
+    local in_ticks = false
+    for _,arg in ipairs(positionals) do
+        if in_ticks then
+            arg = tonumber(arg)
+            if not is_positive_int(arg) then
+                qerror('number of ticks must be a positive integer: ' .. arg)
+            else
+                opts.ticks = arg
+            end
+            in_ticks = false
+        elseif arg == 'ticks' then
+            in_ticks = true
+        elseif arg == 'now' then
+            opts.now = true
+        end
+    end
+
+    if in_ticks then
+        qerror('missing number of ticks')
+    end
+end
+
+return _ENV
diff --git a/plugins/zone.cpp b/plugins/zone.cpp
index 385d79728..6353bfd35 100644
--- a/plugins/zone.cpp
+++ b/plugins/zone.cpp
@@ -112,7 +112,6 @@ REQUIRE_GLOBAL(ui_menu_width);
 using namespace DFHack::Gui;
 
 command_result df_zone (color_ostream &out, vector <string> & parameters);
-command_result df_autonestbox (color_ostream &out, vector <string> & parameters);
 command_result df_autobutcher(color_ostream &out, vector <string> & parameters);
 
 DFhackCExport command_result plugin_enable ( color_ostream &out, bool enable);
@@ -201,19 +200,6 @@ const string zone_help_examples =
     "  well, unless you have a mod with egg-laying male elves who give milk...\n";
 
 
-const string autonestbox_help =
-    "Assigns unpastured female egg-layers to nestbox zones.\n"
-    "Requires that you create pen/pasture zones above nestboxes.\n"
-    "If the pen is bigger than 1x1 the nestbox must be in the top left corner.\n"
-    "Only 1 unit will be assigned per pen, regardless of the size.\n"
-    "The age of the units is currently not checked, most birds grow up quite fast.\n"
-    "When called without options autonestbox will instantly run once.\n"
-    "Options:\n"
-    "  start        - run every X frames (df simulation ticks)\n"
-    "                 default: X=6000  (~60 seconds at 100fps)\n"
-    "  stop         - stop running automatically\n"
-    "  sleep X      - change timer to sleep X frames between runs.\n";
-
 const string autobutcher_help =
     "Assigns your lifestock for slaughter once it reaches a specific count. Requires\n"
     "that you add the target race(s) to a watch list. Only tame units will be\n"
@@ -277,27 +263,19 @@ command_result init_autobutcher(color_ostream &out);
 command_result cleanup_autobutcher(color_ostream &out);
 command_result start_autobutcher(color_ostream &out);
 
-command_result init_autonestbox(color_ostream &out);
-command_result cleanup_autonestbox(color_ostream &out);
-command_result start_autonestbox(color_ostream &out);
-
 
 ///////////////
-// stuff for autonestbox and autobutcher
+// stuff for autobutcher
 // should be moved to own plugin once the tool methods it shares with the zone plugin are moved to Unit.h / Building.h
 
 command_result autoNestbox( color_ostream &out, bool verbose );
 command_result autoButcher( color_ostream &out, bool verbose );
 
-static bool enable_autonestbox = false;
 static bool enable_autobutcher = false;
 static bool enable_autobutcher_autowatch = false;
-static size_t sleep_autonestbox = 6000;
 static size_t sleep_autobutcher = 6000;
-static bool autonestbox_did_complain = false; // avoids message spam
 
 static PersistentDataItem config_autobutcher;
-static PersistentDataItem config_autonestbox;
 
 DFhackCExport command_result plugin_onstatechange(color_ostream &out, state_change_event event)
 {
@@ -306,14 +284,11 @@ DFhackCExport command_result plugin_onstatechange(color_ostream &out, state_chan
     case DFHack::SC_MAP_LOADED:
         // initialize from the world just loaded
         init_autobutcher(out);
-        init_autonestbox(out);
         break;
     case DFHack::SC_MAP_UNLOADED:
-        enable_autonestbox = false;
         enable_autobutcher = false;
         // cleanup
         cleanup_autobutcher(out);
-        cleanup_autonestbox(out);
         break;
     default:
         break;
@@ -323,18 +298,8 @@ DFhackCExport command_result plugin_onstatechange(color_ostream &out, state_chan
 
 DFhackCExport command_result plugin_onupdate ( color_ostream &out )
 {
-    static size_t ticks_autonestbox = 0;
     static size_t ticks_autobutcher = 0;
 
-    if(enable_autonestbox)
-    {
-        if(++ticks_autonestbox >= sleep_autonestbox)
-        {
-            ticks_autonestbox = 0;
-            autoNestbox(out, false);
-        }
-    }
-
     if(enable_autobutcher)
     {
         if(++ticks_autobutcher >= sleep_autobutcher)
@@ -2242,138 +2207,6 @@ command_result df_zone (color_ostream &out, vector <string> & parameters)
     return CR_OK;
 }
 
-////////////////////
-// autonestbox stuff
-
-command_result df_autonestbox(color_ostream &out, vector <string> & parameters)
-{
-    CoreSuspender suspend;
-
-    bool verbose = false;
-
-    for (size_t i = 0; i < parameters.size(); i++)
-    {
-        string & p = parameters[i];
-
-        if (p == "help" || p == "?")
-        {
-            out << autonestbox_help << endl;
-            return CR_OK;
-        }
-        if (p == "start")
-        {
-            autonestbox_did_complain = false;
-            start_autonestbox(out);
-            return autoNestbox(out, verbose);
-        }
-        if (p == "stop")
-        {
-            enable_autonestbox = false;
-            if(config_autonestbox.isValid())
-                config_autonestbox.ival(0) = 0;
-            out << "Autonestbox stopped." << endl;
-            return CR_OK;
-        }
-        else if(p == "verbose")
-        {
-            verbose = true;
-        }
-        else if(p == "sleep")
-        {
-            if(i == parameters.size()-1)
-            {
-                out.printerr("No duration specified!\n");
-                return CR_WRONG_USAGE;
-            }
-            else
-            {
-                size_t ticks = 0;
-                stringstream ss(parameters[i+1]);
-                i++;
-                ss >> ticks;
-                if(ticks <= 0)
-                {
-                    out.printerr("Invalid duration specified (must be > 0)!\n");
-                    return CR_WRONG_USAGE;
-                }
-                sleep_autonestbox = ticks;
-                if(config_autonestbox.isValid())
-                    config_autonestbox.ival(1) = sleep_autonestbox;
-                out << "New sleep timer for autonestbox: " << ticks << " ticks." << endl;
-                return CR_OK;
-            }
-        }
-        else
-        {
-            out << "Unknown command: " << p << endl;
-            return CR_WRONG_USAGE;
-        }
-    }
-    return autoNestbox(out, verbose);
-}
-
-command_result autoNestbox( color_ostream &out, bool verbose = false )
-{
-    bool stop = false;
-    size_t processed = 0;
-
-    if (!Maps::IsValid())
-    {
-        out.printerr("Map is not available!\n");
-        enable_autonestbox = false;
-        return CR_FAILURE;
-    }
-
-    do
-    {
-        df::building * free_building = findFreeNestboxZone();
-        df::unit * free_unit = findFreeEgglayer();
-        if(free_building && free_unit)
-        {
-            command_result result = assignUnitToBuilding(out, free_unit, free_building, verbose);
-            if(result != CR_OK)
-                return result;
-            processed ++;
-        }
-        else
-        {
-            stop = true;
-            if(free_unit && !free_building)
-            {
-                static size_t old_count = 0;
-                size_t freeEgglayers = countFreeEgglayers();
-                // avoid spamming the same message
-                if(old_count != freeEgglayers)
-                    autonestbox_did_complain = false;
-                old_count = freeEgglayers;
-                if(!autonestbox_did_complain)
-                {
-                    stringstream ss;
-                    ss << freeEgglayers;
-                    string announce = "Not enough free nestbox zones found! You need " + ss.str() + " more.";
-                    Gui::showAnnouncement(announce, 6, true);
-                    out << announce << endl;
-                    autonestbox_did_complain = true;
-                }
-            }
-        }
-    } while (!stop);
-    if(processed > 0)
-    {
-        stringstream ss;
-        ss << processed;
-        string announce;
-        announce = ss.str() + " nestboxes were assigned.";
-        Gui::showAnnouncement(announce, 2, false);
-        out << announce << endl;
-        // can complain again
-        // (might lead to spamming the same message twice, but catches the case
-        // where for example 2 new egglayers hatched right after 2 zones were created and assigned)
-        autonestbox_did_complain = false;
-    }
-    return CR_OK;
-}
-
 ////////////////////
 // autobutcher stuff
 
@@ -3129,7 +2962,7 @@ command_result autoButcher( color_ostream &out, bool verbose = false )
 }
 
 ////////////////////////////////////////////////////
-// autobutcher and autonestbox start/init/cleanup
+// autobutcher start/init/cleanup
 
 command_result start_autobutcher(color_ostream &out)
 {
@@ -3227,62 +3060,6 @@ command_result cleanup_autobutcher(color_ostream &out)
     return CR_OK;
 }
 
-command_result start_autonestbox(color_ostream &out)
-{
-    plugin_enable(out, true);
-    enable_autonestbox = true;
-
-    if (!config_autonestbox.isValid())
-    {
-        config_autonestbox = World::AddPersistentData("autonestbox/config");
-
-        if (!config_autonestbox.isValid())
-        {
-            out << "Cannot enable autonestbox without a world!" << endl;
-            return CR_OK;
-        }
-
-        config_autonestbox.ival(1) = sleep_autonestbox;
-    }
-
-    config_autonestbox.ival(0) = enable_autonestbox;
-
-    out << "Starting autonestbox." << endl;
-    init_autonestbox(out);
-    return CR_OK;
-}
-
-command_result init_autonestbox(color_ostream &out)
-{
-    cleanup_autonestbox(out);
-
-    config_autonestbox = World::GetPersistentData("autonestbox/config");
-    if(config_autonestbox.isValid())
-    {
-        if (config_autonestbox.ival(0) == -1)
-        {
-            config_autonestbox.ival(0) = enable_autonestbox;
-            config_autonestbox.ival(1) = sleep_autonestbox;
-            out << "Autonestbox's persistent config object was invalid!" << endl;
-        }
-        else
-        {
-            enable_autonestbox = config_autonestbox.ival(0);
-            sleep_autonestbox = config_autonestbox.ival(1);
-        }
-    }
-    if (enable_autonestbox)
-        plugin_enable(out, true);
-    return CR_OK;
-}
-
-command_result cleanup_autonestbox(color_ostream &out)
-{
-    // nothing to cleanup currently
-    // (future version of autonestbox could store info about cages for useless male kids)
-    return CR_OK;
-}
-
 // abuse WatchedRace struct for counting stocks (since it sorts by gender and age)
 // calling method must delete pointer!
 WatchedRace * checkRaceStocksTotal(int race)
@@ -4121,24 +3898,17 @@ DFhackCExport command_result plugin_init ( color_ostream &out, std::vector <Plug
         df_zone, false,
         zone_help.c_str()
         ));
-    commands.push_back(PluginCommand(
-        "autonestbox", "auto-assign nestbox zones.",
-        df_autonestbox, false,
-        autonestbox_help.c_str()
-        ));
     commands.push_back(PluginCommand(
         "autobutcher", "auto-assign lifestock for butchering.",
         df_autobutcher, false,
         autobutcher_help.c_str()
         ));
     init_autobutcher(out);
-    init_autonestbox(out);
     return CR_OK;
 }
 
 DFhackCExport command_result plugin_shutdown ( color_ostream &out )
 {
     cleanup_autobutcher(out);
-    cleanup_autonestbox(out);
     return CR_OK;
 }

From 3f61e2302c63862d09631ac50908efdc0a512195 Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Tue, 2 Aug 2022 01:07:13 -0700
Subject: [PATCH 419/854] split autobutcher out from zone

---
 plugins/CMakeLists.txt      |    3 +-
 plugins/autobutcher.cpp     | 1166 +++++++++++++++++++++
 plugins/lua/autobutcher.lua |   89 ++
 plugins/lua/zone.lua        |   12 -
 plugins/zone.cpp            | 1965 ++++-------------------------------
 5 files changed, 1437 insertions(+), 1798 deletions(-)
 create mode 100644 plugins/autobutcher.cpp
 create mode 100644 plugins/lua/autobutcher.lua
 delete mode 100644 plugins/lua/zone.lua

diff --git a/plugins/CMakeLists.txt b/plugins/CMakeLists.txt
index 6ef5b59db..338db4ab9 100644
--- a/plugins/CMakeLists.txt
+++ b/plugins/CMakeLists.txt
@@ -83,6 +83,7 @@ if(BUILD_SUPPORTED)
     dfhack_plugin(3dveins 3dveins.cpp)
     dfhack_plugin(add-spatter add-spatter.cpp)
     # dfhack_plugin(advtools advtools.cpp)
+    dfhack_plugin(autobutcher autobutcher.cpp LINK_LIBRARIES lua)
     dfhack_plugin(autochop autochop.cpp)
     dfhack_plugin(autoclothing autoclothing.cpp)
     dfhack_plugin(autodump autodump.cpp)
@@ -178,7 +179,7 @@ if(BUILD_SUPPORTED)
     dfhack_plugin(workflow workflow.cpp LINK_LIBRARIES lua)
     dfhack_plugin(workNow workNow.cpp)
     dfhack_plugin(xlsxreader xlsxreader.cpp LINK_LIBRARIES lua xlsxio_read_STATIC zip expat)
-    dfhack_plugin(zone zone.cpp LINK_LIBRARIES lua)
+    dfhack_plugin(zone zone.cpp)
 
     # If you are adding a plugin that you do not intend to commit to the DFHack repo,
     # see instructions for adding "external" plugins at the end of this file.
diff --git a/plugins/autobutcher.cpp b/plugins/autobutcher.cpp
new file mode 100644
index 000000000..0d7a9c632
--- /dev/null
+++ b/plugins/autobutcher.cpp
@@ -0,0 +1,1166 @@
+// - full automation of marking live-stock for slaughtering
+//   races can be added to a watchlist and it can be set how many male/female kids/adults are left alive
+//   adding to the watchlist can be automated as well.
+//   config for autobutcher (state and sleep setting) is saved the first time autobutcher is started
+//   config for watchlist entries is saved when they are created or modified
+
+#include <unordered_map>
+#include <unordered_set>
+
+#include "df/building_cagest.h"
+#include "df/creature_raw.h"
+#include "df/world.h"
+
+#include "Debug.h"
+#include "LuaTools.h"
+#include "PluginManager.h"
+
+#include "modules/Gui.h"
+#include "modules/Maps.h"
+#include "modules/Persistence.h"
+#include "modules/Units.h"
+#include "modules/World.h"
+
+using std::string;
+using std::unordered_map;
+using std::unordered_set;
+using std::vector;
+
+using namespace DFHack;
+
+DFHACK_PLUGIN("autobutcher");
+DFHACK_PLUGIN_IS_ENABLED(is_enabled);
+
+REQUIRE_GLOBAL(world);
+
+const string autobutcher_help =
+    "Assigns your lifestock for slaughter once it reaches a specific count. Requires\n"
+    "that you add the target race(s) to a watch list. Only tame units will be\n"
+    "processed. Named units will be completely ignored (you can give animals\n"
+    "nicknames with the tool 'rename unit' to protect them from getting slaughtered\n"
+    "automatically. Trained war or hunting pets will be ignored.\n"
+    "Once you have too much adults, the oldest will be butchered first.\n"
+    "Once you have too much kids, the youngest will be butchered first.\n"
+    "If you don't set a target count the following default will be used:\n"
+    "1 male kid, 5 female kids, 1 male adult, 5 female adults.\n"
+    "Options:\n"
+    "  start        - run every X frames (df simulation ticks)\n"
+    "                 default: X=6000  (~60 seconds at 100fps)\n"
+    "  stop         - stop running automatically\n"
+    "  sleep X      - change timer to sleep X frames between runs.\n"
+    "  watch R      - start watching race(s)\n"
+    "                 R = valid race RAW id (ALPACA, BIRD_TURKEY, etc)\n"
+    "                 or a list of RAW ids seperated by spaces\n"
+    "                 or the keyword 'all' which affects your whole current watchlist.\n"
+    "  unwatch R    - stop watching race(s)\n"
+    "                 the current target settings will be remembered\n"
+    "  forget R     - unwatch race(s) and forget target settings for it/them\n"
+    "  autowatch    - automatically adds all new races (animals you buy\n"
+    "                 from merchants, tame yourself or get from migrants)\n"
+    "                 to the watch list using default target count\n"
+    "  noautowatch  - stop auto-adding new races to the watch list\n"
+    "  list         - print status and watchlist\n"
+    "  list_export  - print status and watchlist in batchfile format\n"
+    "                 can be used to copy settings into another savegame\n"
+    "                 usage: 'dfhack-run autobutcher list_export > xyz.bat' \n"
+    "  target fk mk fa ma R\n"
+    "               - set target count for specified race:\n"
+    "                 fk = number of female kids\n"
+    "                 mk = number of male kids\n"
+    "                 fa = number of female adults\n"
+    "                 ma = number of female adults\n"
+    "                 R = 'all' sets count for all races on the current watchlist\n"
+    "                 including the races which are currenly set to 'unwatched'\n"
+    "                 and sets the new default for future watch commands\n"
+    "                 R = 'new' sets the new default for future watch commands\n"
+    "                 without changing your current watchlist\n"
+    "  example      - print some usage examples\n";
+
+const string autobutcher_help_example =
+    "Examples:\n"
+    "  autobutcher target 4 3 2 1 ALPACA BIRD_TURKEY\n"
+    "  autobutcher watch ALPACA BIRD_TURKEY\n"
+    "  autobutcher start\n"
+    "    This means you want to have max 7 kids (4 female, 3 male) and max 3 adults\n"
+    "    (2 female, 1 male) of the races alpaca and turkey. Once the kids grow up the\n"
+    "    oldest adults will get slaughtered. Excess kids will get slaughtered starting\n"
+    "    the the youngest to allow that the older ones grow into adults.\n"
+    "  autobutcher target 0 0 0 0 new\n"
+    "  autobutcher autowatch\n"
+    "  autobutcher start\n"
+    "    This tells autobutcher to automatically put all new races onto the watchlist\n"
+    "    and mark unnamed tame units for slaughter as soon as they arrive in your\n"
+    "    fortress. Settings already made for some races will be left untouched.\n";
+
+namespace DFHack {
+    DBG_DECLARE(autobutcher, status);
+    DBG_DECLARE(autobutcher, cycle);
+}
+
+static const string CONFIG_KEY = "autobutcher/config";
+static const string WATCHLIST_CONFIG_KEY_PREFIX = "autobutcher/watchlist/";
+
+static PersistentDataItem config;
+enum ConfigValues {
+    CONFIG_IS_ENABLED  = 0,
+    CONFIG_CYCLE_TICKS = 1,
+    CONFIG_AUTOWATCH   = 2,
+    CONFIG_DEFAULT_FK  = 3,
+    CONFIG_DEFAULT_MK  = 4,
+    CONFIG_DEFAULT_FA  = 5,
+    CONFIG_DEFAULT_MA  = 6,
+};
+static int get_config_val(int index) {
+    if (!config.isValid())
+        return -1;
+    return config.ival(index);
+}
+static bool get_config_bool(int index) {
+    return get_config_val(index) == 1;
+}
+static void set_config_val(int index, int value) {
+    if (config.isValid())
+        config.ival(index) = value;
+}
+static void set_config_bool(int index, bool value) {
+    set_config_val(index, value ? 1 : 0);
+}
+
+static unordered_map<string, int> race_to_id;
+static size_t cycle_counter = 0;  // how many ticks since the last cycle
+
+static size_t DEFAULT_CYCLE_TICKS = 6000;
+
+struct autobutcher_options {
+    // whether to display help
+    bool help = false;
+
+    // the command to run.
+    string command;
+
+    // the set of (unverified) races that the command should affect, and whether
+    // "all" or "new" was specified as the race
+    vector<string*> races;
+    bool races_all = false;
+    bool races_new = false;
+
+    // params for the "target" command
+    int32_t fk = -1;
+    int32_t mk = -1;
+    int32_t fa = -1;
+    int32_t ma = -1;
+
+    // how many ticks to wait between automatic cycles, -1 means unset
+    int32_t ticks = -1;
+
+    static struct_identity _identity;
+
+    // non-virtual destructor so offsetof() still works for the fields
+    ~autobutcher_options() {
+        for (auto str : races)
+            delete str;
+    }
+};
+static const struct_field_info autobutcher_options_fields[] = {
+    { struct_field_info::PRIMITIVE,      "help",      offsetof(autobutcher_options, help),      &df::identity_traits<bool>::identity,    0, 0 },
+    { struct_field_info::PRIMITIVE,      "command",   offsetof(autobutcher_options, command),    df::identity_traits<string>::get(),     0, 0 },
+    { struct_field_info::STL_VECTOR_PTR, "races",     offsetof(autobutcher_options, races),      df::identity_traits<string>::get(),     0, 0 },
+    { struct_field_info::PRIMITIVE,      "races_all", offsetof(autobutcher_options, races_all), &df::identity_traits<bool>::identity,    0, 0 },
+    { struct_field_info::PRIMITIVE,      "races_new", offsetof(autobutcher_options, races_new), &df::identity_traits<bool>::identity,    0, 0 },
+    { struct_field_info::PRIMITIVE,      "fk",        offsetof(autobutcher_options, fk),        &df::identity_traits<int32_t>::identity, 0, 0 },
+    { struct_field_info::PRIMITIVE,      "mk",        offsetof(autobutcher_options, mk),        &df::identity_traits<int32_t>::identity, 0, 0 },
+    { struct_field_info::PRIMITIVE,      "fa",        offsetof(autobutcher_options, fa),        &df::identity_traits<int32_t>::identity, 0, 0 },
+    { struct_field_info::PRIMITIVE,      "ma",        offsetof(autobutcher_options, ma),        &df::identity_traits<int32_t>::identity, 0, 0 },
+    { struct_field_info::PRIMITIVE,      "ticks",     offsetof(autobutcher_options, ticks),     &df::identity_traits<int32_t>::identity, 0, 0 },
+    { struct_field_info::END }
+};
+struct_identity autobutcher_options::_identity(sizeof(autobutcher_options), &df::allocator_fn<autobutcher_options>, NULL, "autobutcher_options", NULL, autobutcher_options_fields);
+
+static void init_autobutcher(color_ostream &out);
+static void cleanup_autobutcher(color_ostream &out);
+static command_result df_autobutcher(color_ostream &out, vector<string> &parameters);
+static void autobutcher_cycle(color_ostream &out);
+
+DFhackCExport command_result plugin_init(color_ostream &out, std::vector <PluginCommand> &commands) {
+    commands.push_back(PluginCommand(
+        "autobutcher",
+        "Automatically butcher excess livestock.",
+        df_autobutcher,
+        false,
+        autobutcher_help.c_str()));
+
+    init_autobutcher(out);
+    return CR_OK;
+}
+
+DFhackCExport command_result plugin_enable(color_ostream &out, bool enable) {
+    if (!Maps::IsValid()) {
+        out.printerr("Cannot run autobutcher without a loaded map.\n");
+        return CR_FAILURE;
+    }
+
+    if (enable != is_enabled) {
+        is_enabled = enable;
+        if (is_enabled)
+            init_autobutcher(out);
+        else
+            cleanup_autobutcher(out);
+    }
+    return CR_OK;
+}
+
+DFhackCExport command_result plugin_shutdown (color_ostream &out) {
+    cleanup_autobutcher(out);
+    return CR_OK;
+}
+
+DFhackCExport command_result plugin_onstatechange(color_ostream &out, state_change_event event) {
+    switch (event) {
+    case DFHack::SC_MAP_LOADED:
+        init_autobutcher(out);
+        break;
+    case DFHack::SC_MAP_UNLOADED:
+        cleanup_autobutcher(out);
+        break;
+    default:
+        break;
+    }
+    return CR_OK;
+}
+
+DFhackCExport command_result plugin_onupdate(color_ostream &out) {
+    if (is_enabled && ++cycle_counter >= (size_t)get_config_val(CONFIG_CYCLE_TICKS))
+        autobutcher_cycle(out);
+    return CR_OK;
+}
+
+/////////////////////////////////////////////////////
+// autobutcher config logic
+//
+
+static void doMarkForSlaughter(df::unit *unit) {
+    unit->flags2.bits.slaughter = 1;
+}
+
+// getUnitAge() returns 0 if born in current year, therefore the look at birth_time in that case
+// (assuming that the value from there indicates in which tick of the current year the unit was born)
+static bool compareUnitAgesYounger(df::unit *i, df::unit *j) {
+    int32_t age_i = (int32_t)Units::getAge(i, true);
+    int32_t age_j = (int32_t)Units::getAge(j, true);
+    if (age_i == 0 && age_j == 0) {
+        age_i = i->birth_time;
+        age_j = j->birth_time;
+    }
+    return age_i < age_j;
+}
+
+static bool compareUnitAgesOlder(df::unit* i, df::unit* j) {
+    int32_t age_i = (int32_t)Units::getAge(i, true);
+    int32_t age_j = (int32_t)Units::getAge(j, true);
+    if(age_i == 0 && age_j == 0) {
+        age_i = i->birth_time;
+        age_j = j->birth_time;
+    }
+    return age_i > age_j;
+}
+
+enum unit_ptr_index {
+ fk_index = 0,
+ mk_index = 1,
+ fa_index = 2,
+ ma_index = 3
+};
+
+struct WatchedRace {
+public:
+    PersistentDataItem rconfig;
+
+    int raceId;
+    bool isWatched; // if true, autobutcher will process this race
+
+    // target amounts
+    unsigned fk; // max female kids
+    unsigned mk; // max male kids
+    unsigned fa; // max female adults
+    unsigned ma; // max male adults
+
+    // amounts of protected (not butcherable) units
+    unsigned fk_prot;
+    unsigned fa_prot;
+    unsigned mk_prot;
+    unsigned ma_prot;
+
+    // butcherable units
+    vector<df::unit*> unit_ptr[4];
+
+    // priority butcherable units
+    vector<df::unit*> prot_ptr[4];
+
+    WatchedRace(color_ostream &out, int id, bool watch, unsigned _fk, unsigned _mk, unsigned _fa, unsigned _ma) {
+        raceId = id;
+        isWatched = watch;
+        fk = _fk;
+        mk = _mk;
+        fa = _fa;
+        ma = _ma;
+        fk_prot = fa_prot = mk_prot = ma_prot = 0;
+
+        DEBUG(status,out).print("creating new WatchedRace: id=%d, watched=%s, fk=%u, mk=%u, fa=%u, ma=%u\n",
+                id, watch ? "true" : "false", fk, mk, fa, ma);
+    }
+
+    WatchedRace(color_ostream &out, const PersistentDataItem &p)
+        : WatchedRace(out, p.ival(0), p.ival(1), p.ival(2), p.ival(3), p.ival(4), p.ival(5)) {
+        rconfig = p;
+    }
+
+    ~WatchedRace() {
+        ClearUnits();
+    }
+
+    void UpdateConfig(color_ostream &out) {
+        if(!rconfig.isValid()) {
+            string keyname = WATCHLIST_CONFIG_KEY_PREFIX + Units::getRaceNameById(raceId);
+            rconfig = World::GetPersistentData(keyname, NULL);
+        }
+        if(rconfig.isValid()) {
+            rconfig.ival(0) = raceId;
+            rconfig.ival(1) = isWatched;
+            rconfig.ival(2) = fk;
+            rconfig.ival(3) = mk;
+            rconfig.ival(4) = fa;
+            rconfig.ival(5) = ma;
+        }
+        else {
+            ERR(status,out).print("could not create persistent key for race: %s",
+                                  Units::getRaceNameById(raceId).c_str());
+        }
+    }
+
+    void RemoveConfig(color_ostream &out) {
+        if(!rconfig.isValid())
+            return;
+        World::DeletePersistentData(rconfig);
+    }
+
+    void SortUnitsByAge() {
+        sort(unit_ptr[fk_index].begin(), unit_ptr[fk_index].end(), compareUnitAgesOlder);
+        sort(unit_ptr[mk_index].begin(), unit_ptr[mk_index].end(), compareUnitAgesOlder);
+        sort(unit_ptr[fa_index].begin(), unit_ptr[fa_index].end(), compareUnitAgesYounger);
+        sort(unit_ptr[ma_index].begin(), unit_ptr[ma_index].end(), compareUnitAgesYounger);
+        sort(prot_ptr[fk_index].begin(), prot_ptr[fk_index].end(), compareUnitAgesOlder);
+        sort(prot_ptr[mk_index].begin(), prot_ptr[mk_index].end(), compareUnitAgesOlder);
+        sort(prot_ptr[fa_index].begin(), prot_ptr[fa_index].end(), compareUnitAgesYounger);
+        sort(prot_ptr[ma_index].begin(), prot_ptr[ma_index].end(), compareUnitAgesYounger);
+    }
+
+    void PushUnit(df::unit *unit) {
+        if(Units::isFemale(unit)) {
+            if(Units::isBaby(unit) || Units::isChild(unit))
+                unit_ptr[fk_index].push_back(unit);
+            else
+                unit_ptr[fa_index].push_back(unit);
+        }
+        else //treat sex n/a like it was male
+        {
+            if(Units::isBaby(unit) || Units::isChild(unit))
+                unit_ptr[mk_index].push_back(unit);
+            else
+                unit_ptr[ma_index].push_back(unit);
+        }
+    }
+
+    void PushPriorityUnit(df::unit *unit) {
+        if(Units::isFemale(unit)) {
+            if(Units::isBaby(unit) || Units::isChild(unit))
+                prot_ptr[fk_index].push_back(unit);
+            else
+                prot_ptr[fa_index].push_back(unit);
+        }
+        else {
+            if(Units::isBaby(unit) || Units::isChild(unit))
+                prot_ptr[mk_index].push_back(unit);
+            else
+                prot_ptr[ma_index].push_back(unit);
+        }
+    }
+
+    void PushProtectedUnit(df::unit *unit) {
+        if(Units::isFemale(unit)) {
+            if(Units::isBaby(unit) || Units::isChild(unit))
+                fk_prot++;
+            else
+                fa_prot++;
+        }
+        else {  //treat sex n/a like it was male
+            if(Units::isBaby(unit) || Units::isChild(unit))
+                mk_prot++;
+            else
+                ma_prot++;
+        }
+    }
+
+    void ClearUnits() {
+        fk_prot = fa_prot = mk_prot = ma_prot = 0;
+        for (size_t i = 0; i < 4; i++) {
+            unit_ptr[i].clear();
+            prot_ptr[i].clear();
+        }
+    }
+
+    int ProcessUnits(vector<df::unit*>& unit_ptr, vector<df::unit*>& unit_pri_ptr, unsigned prot, unsigned goal) {
+        int subcount = 0;
+        while (unit_pri_ptr.size() && (unit_ptr.size() + unit_pri_ptr.size() + prot > goal)) {
+            df::unit *unit = unit_pri_ptr.back();
+            doMarkForSlaughter(unit);
+            unit_pri_ptr.pop_back();
+            subcount++;
+        }
+        while (unit_ptr.size() && (unit_ptr.size() + prot > goal)) {
+            df::unit *unit = unit_ptr.back();
+            doMarkForSlaughter(unit);
+            unit_ptr.pop_back();
+            subcount++;
+        }
+        return subcount;
+    }
+
+    int ProcessUnits() {
+        SortUnitsByAge();
+        int slaughter_count = 0;
+        slaughter_count += ProcessUnits(unit_ptr[fk_index], prot_ptr[fk_index], fk_prot, fk);
+        slaughter_count += ProcessUnits(unit_ptr[mk_index], prot_ptr[mk_index], mk_prot, mk);
+        slaughter_count += ProcessUnits(unit_ptr[fa_index], prot_ptr[fa_index], fa_prot, fa);
+        slaughter_count += ProcessUnits(unit_ptr[ma_index], prot_ptr[ma_index], ma_prot, ma);
+        ClearUnits();
+        return slaughter_count;
+    }
+};
+
+// vector of races handled by autobutcher
+// the name is a bit misleading since entries can be set to 'unwatched'
+// to ignore them for a while but still keep the target count settings
+static unordered_map<int, WatchedRace*> watched_races;
+
+static void init_autobutcher(color_ostream &out) {
+    config = World::GetPersistentData(CONFIG_KEY);
+
+    if (!config.isValid())
+        config = World::AddPersistentData(CONFIG_KEY);
+
+    if (get_config_val(CONFIG_IS_ENABLED) == -1) {
+        set_config_bool(CONFIG_IS_ENABLED, false);
+        set_config_val(CONFIG_CYCLE_TICKS, DEFAULT_CYCLE_TICKS);
+        set_config_bool(CONFIG_AUTOWATCH, false);
+        set_config_val(CONFIG_DEFAULT_FK, 5);
+        set_config_val(CONFIG_DEFAULT_MK, 1);
+        set_config_val(CONFIG_DEFAULT_FA, 5);
+        set_config_val(CONFIG_DEFAULT_MA, 1);
+    }
+
+    if (is_enabled)
+        set_config_bool(CONFIG_IS_ENABLED, true);
+    else
+        is_enabled = (get_config_val(CONFIG_IS_ENABLED) == 1);
+
+    if (!config.isValid())
+        return;
+
+    if (!race_to_id.size()) {
+        const size_t num_races = world->raws.creatures.all.size();
+        for(size_t i = 0; i < num_races; ++i)
+            race_to_id.emplace(Units::getRaceNameById(i), i);
+    }
+
+    std::vector<PersistentDataItem> watchlist;
+    World::GetPersistentData(&watchlist, WATCHLIST_CONFIG_KEY_PREFIX, true);
+    for (auto & p : watchlist) {
+        DEBUG(status,out).print("Reading from save: %s\n", p.key().c_str());
+        WatchedRace *w = new WatchedRace(out, p);
+        watched_races.emplace(w->raceId, w);
+    }
+}
+
+static void cleanup_autobutcher(color_ostream &out) {
+    is_enabled = false;
+    race_to_id.clear();
+    for (auto w : watched_races)
+        delete w.second;
+    watched_races.clear();
+}
+
+static bool get_options(color_ostream &out,
+                        autobutcher_options &opts,
+                        const vector<string> &parameters)
+{
+    auto L = Lua::Core::State;
+    Lua::StackUnwinder top(L);
+
+    if (!lua_checkstack(L, parameters.size() + 2) ||
+        !Lua::PushModulePublic(
+            out, L, "plugins.autobutcher", "parse_commandline")) {
+        out.printerr("Failed to load autobutcher Lua code\n");
+        return false;
+    }
+
+    Lua::Push(L, &opts);
+    for (const string &param : parameters)
+        Lua::Push(L, param);
+
+    if (!Lua::SafeCall(out, L, parameters.size() + 1, 0))
+        return false;
+
+    return true;
+}
+
+static void autobutcher_export(color_ostream &out);
+static void autobutcher_status(color_ostream &out);
+static void autobutcher_target(color_ostream &out, const autobutcher_options &opts);
+static void autobutcher_modify_watchlist(color_ostream &out, const autobutcher_options &opts);
+
+static command_result df_autobutcher(color_ostream &out, vector<string> &parameters) {
+    CoreSuspender suspend;
+
+    if (!Maps::IsValid()) {
+        out.printerr("Cannot run autobutcher without a loaded map.\n");
+        return CR_FAILURE;
+    }
+
+    autobutcher_options opts;
+    if (!get_options(out, opts, parameters) || opts.help)
+        return CR_WRONG_USAGE;
+
+    if (opts.command == "now") {
+        autobutcher_cycle(out);
+    }
+    else if (opts.command == "autowatch") {
+        set_config_bool(CONFIG_AUTOWATCH, true);
+    }
+    else if (opts.command == "noautowatch") {
+        set_config_bool(CONFIG_AUTOWATCH, false);
+    }
+    else if (opts.command == "list_export") {
+        autobutcher_export(out);
+    }
+    else if (opts.command == "target") {
+        autobutcher_target(out, opts);
+    }
+    else if (opts.command == "watch" ||
+            opts.command == "unwatch" ||
+            opts.command == "forget") {
+        autobutcher_modify_watchlist(out, opts);
+    }
+    else if (opts.command == "ticks") {
+        set_config_val(CONFIG_CYCLE_TICKS, opts.ticks);
+        INFO(status,out).print("New cycle timer: %d ticks.\n", opts.ticks);
+    }
+    else {
+        autobutcher_status(out);
+    }
+
+    return CR_OK;
+}
+
+// helper for sorting the watchlist alphabetically
+static bool compareRaceNames(WatchedRace* i, WatchedRace* j) {
+    string name_i = Units::getRaceNamePluralById(i->raceId);
+    string name_j = Units::getRaceNamePluralById(j->raceId);
+
+    return name_i < name_j;
+}
+
+// sort watchlist alphabetically
+static vector<WatchedRace *> getSortedWatchList() {
+    vector<WatchedRace *> list;
+    for (auto w : watched_races) {
+        list.push_back(w.second);
+    }
+    sort(list.begin(), list.end(), compareRaceNames);
+    return list;
+}
+
+static void autobutcher_export(color_ostream &out) {
+    out << "enable autobutcher" << endl;
+    out << "autobutcher ticks " << get_config_val(CONFIG_CYCLE_TICKS) << endl;
+    out << "autobutcher " << (get_config_bool(CONFIG_AUTOWATCH) ? "" : "no")
+        << "autowatch" << endl;
+    out << "autobutcher target"
+        << " " << get_config_val(CONFIG_DEFAULT_FK)
+        << " " << get_config_val(CONFIG_DEFAULT_MK)
+        << " " << get_config_val(CONFIG_DEFAULT_FA)
+        << " " << get_config_val(CONFIG_DEFAULT_MA)
+        << " new" << endl;
+
+    for (auto w : getSortedWatchList()) {
+        df::creature_raw *raw = world->raws.creatures.all[w->raceId];
+        string name = raw->creature_id;
+        out << "autobutcher target"
+            << " " << w->fk
+            << " " << w->mk
+            << " " << w->fa
+            << " " << w->ma
+            << " " << name << endl;
+        if (w->isWatched)
+            out << "autobutcher watch " << name << endl;
+    }
+}
+
+static void autobutcher_status(color_ostream &out) {
+    out << "autobutcher is " << (is_enabled ? "" : "not ") << "enabled\n";
+    if (is_enabled)
+        out << "  running every " << get_config_val(CONFIG_CYCLE_TICKS) << " game ticks\n";
+    out << "  " << (get_config_bool(CONFIG_AUTOWATCH) ? "" : "not ") << "autowatching for new races\n";
+
+    out << "\ndefault setting for new races:"
+        << " fk=" << get_config_val(CONFIG_DEFAULT_FK)
+        << " mk=" << get_config_val(CONFIG_DEFAULT_MK)
+        << " fa=" << get_config_val(CONFIG_DEFAULT_FA)
+        << " ma=" << get_config_val(CONFIG_DEFAULT_MA)
+        << endl << endl;
+
+    if (!watched_races.size()) {
+        out << "not currently watching any races. to find out how to add some, run:\n  help autobutcher" << endl;
+        return;
+    }
+
+    out << "monitoring races: " << endl;
+    for (auto w : getSortedWatchList()) {
+        df::creature_raw *raw = world->raws.creatures.all[w->raceId];
+        out << "  " << Units::getRaceNamePluralById(w->raceId) << "  \t";
+        out << "(" << raw->creature_id;
+        out << " fk=" << w->fk
+            << " mk=" << w->mk
+            << " fa=" << w->fa
+            << " ma=" << w->ma;
+        if (!w->isWatched)
+            out << "; autobutchering is paused";
+        out << ")" << endl;
+    }
+}
+
+static void autobutcher_target(color_ostream &out, const autobutcher_options &opts) {
+    if (opts.races_new) {
+        DEBUG(status,out).print("setting targets for new races\n");
+        set_config_val(CONFIG_DEFAULT_FK, opts.fk);
+        set_config_val(CONFIG_DEFAULT_MK, opts.mk);
+        set_config_val(CONFIG_DEFAULT_FA, opts.fa);
+        set_config_val(CONFIG_DEFAULT_MA, opts.ma);
+    }
+
+    if (opts.races_all) {
+        DEBUG(status,out).print("setting targets for all races on watchlist\n");
+        for (auto w : watched_races) {
+            w.second->fk = opts.fk;
+            w.second->mk = opts.mk;
+            w.second->fa = opts.fa;
+            w.second->ma = opts.ma;
+            w.second->UpdateConfig(out);
+        }
+    }
+
+    for (auto race : opts.races) {
+        if (!race_to_id.count(*race)) {
+            out.printerr("race not found: '%s'", race->c_str());
+            continue;
+        }
+        int id = race_to_id[*race];
+        WatchedRace *w;
+        if (!watched_races.count(id)) {
+            DEBUG(status,out).print("adding new targets for %s\n", race->c_str());
+            w = new WatchedRace(out, id, true, opts.fk, opts.mk, opts.fa, opts.ma);
+            watched_races.emplace(id, w);
+        } else {
+            w = watched_races[id];
+            w->fk = opts.fk;
+            w->mk = opts.mk;
+            w->fa = opts.fa;
+            w->ma = opts.ma;
+        }
+        w->UpdateConfig(out);
+    }
+}
+
+static void autobutcher_modify_watchlist(color_ostream &out, const autobutcher_options &opts) {
+    unordered_set<int> ids;
+
+    if (opts.races_all) {
+        DEBUG(status,out).print("modifying all races on watchlist: %s\n",
+                                opts.command.c_str());
+        for (auto w : watched_races)
+            ids.emplace(w.first);
+    }
+
+    for (auto race : opts.races) {
+        if (!race_to_id.count(*race)) {
+            out.printerr("race not found: '%s'", race->c_str());
+            continue;
+        }
+        ids.emplace(race_to_id[*race]);
+    }
+
+    for (int id : ids) {
+        if (opts.command == "watch")
+            watched_races[id]->isWatched = true;
+        else if (opts.command == "unwatch")
+            watched_races[id]->isWatched = false;
+        else if (opts.command == "forget") {
+            watched_races[id]->RemoveConfig(out);
+            watched_races.erase(id);
+            continue;
+        }
+        watched_races[id]->UpdateConfig(out);
+    }
+}
+
+/////////////////////////////////////////////////////
+// autobutcher cycle logic
+//
+
+// check if contained in item (e.g. animals in cages)
+static bool isContainedInItem(df::unit *unit) {
+    for (auto gref : unit->general_refs) {
+        if (gref->getType() == df::general_ref_type::CONTAINED_IN_ITEM) {
+            return true;
+        }
+    }
+    return false;
+}
+
+// found a unit with weird position values on one of my maps (negative and in the thousands)
+// it didn't appear in the animal stocks screen, but looked completely fine otherwise (alive, tame, own, etc)
+// maybe a rare bug, but better avoid assigning such units to zones or slaughter etc.
+static bool hasValidMapPos(df::unit *unit) {
+    return unit->pos.x >= 0 && unit->pos.y >= 0 && unit->pos.z >= 0
+        && unit->pos.x < world->map.x_count
+        && unit->pos.y < world->map.y_count
+        && unit->pos.z < world->map.z_count;
+}
+
+// built cage defined as room (supposed to detect zoo cages)
+static bool isInBuiltCageRoom(df::unit *unit) {
+    for (auto building : world->buildings.all) {
+        // !!! building->isRoom() returns true if the building can be made a room but currently isn't
+        // !!! except for coffins/tombs which always return false
+        // !!! using the bool is_room however gives the correct state/value
+        if (!building->is_room || building->getType() != df::building_type::Cage)
+            continue;
+
+        df::building_cagest* cage = (df::building_cagest*)building;
+        for (auto cu : cage->assigned_units)
+            if (cu == unit->id) return true;
+    }
+    return false;
+}
+
+static void autobutcher_cycle(color_ostream &out) {
+    DEBUG(cycle,out).print("running autobutcher_cycle\n");
+
+    // check if there is anything to watch before walking through units vector
+    if (!get_config_bool(CONFIG_AUTOWATCH)) {
+        bool watching = false;
+        for (auto w : watched_races) {
+            if (w.second->isWatched) {
+                watching = true;
+                break;
+            }
+        }
+        if (!watching)
+            return;
+    }
+
+    for (auto unit : world->units.all) {
+        // this check is now divided into two steps, squeezed autowatch into the middle
+        // first one ignores completely inappropriate units (dead, undead, not belonging to the fort, ...)
+        // then let autowatch add units to the watchlist which will probably start breeding (owned pets, war animals, ...)
+        // then process units counting those which can't be butchered (war animals, named pets, ...)
+        // so that they are treated as "own stock" as well and count towards the target quota
+        if (   !Units::isActive(unit)
+            || Units::isUndead(unit)
+            || Units::isMarkedForSlaughter(unit)
+            || Units::isMerchant(unit) // ignore merchants' draft animals
+            || Units::isForest(unit) // ignore merchants' caged animals
+            || !Units::isOwnCiv(unit)
+            || !Units::isTame(unit)
+            )
+            continue;
+
+        // found a bugged unit which had invalid coordinates but was not in a cage.
+        // marking it for slaughter didn't seem to have negative effects, but you never know...
+        if(!isContainedInItem(unit) && !hasValidMapPos(unit))
+            continue;
+
+        WatchedRace *w;
+        if (watched_races.count(unit->race)) {
+            w = watched_races[unit->race];
+        }
+        else if (!get_config_bool(CONFIG_AUTOWATCH)) {
+            continue;
+        }
+        else {
+            w = new WatchedRace(out, unit->race, true, get_config_val(CONFIG_DEFAULT_FK),
+                get_config_val(CONFIG_DEFAULT_MK), get_config_val(CONFIG_DEFAULT_FA),
+                get_config_val(CONFIG_DEFAULT_MA));
+            w->UpdateConfig(out);
+            watched_races.emplace(unit->race, w);
+
+            string announce = "New race added to autobutcher watchlist: " + Units::getRaceNamePluralById(unit->race);
+            Gui::showAnnouncement(announce, 2, false);
+        }
+
+        if (w->isWatched) {
+            // don't butcher protected units, but count them as stock as well
+            // this way they count towards target quota, so if you order that you want 1 female adult cat
+            // and have 2 cats, one of them being a pet, the other gets butchered
+            if(    Units::isWar(unit)    // ignore war dogs etc
+                || Units::isHunter(unit) // ignore hunting dogs etc
+                // ignore creatures in built cages which are defined as rooms to leave zoos alone
+                // (TODO: better solution would be to allow some kind of slaughter cages which you can place near the butcher)
+                || (isContainedInItem(unit) && isInBuiltCageRoom(unit))  // !!! see comments in isBuiltCageRoom()
+                || Units::isAvailableForAdoption(unit)
+                || unit->name.has_name)
+                w->PushProtectedUnit(unit);
+            else if (   Units::isGay(unit)
+                     || Units::isGelded(unit))
+                w->PushPriorityUnit(unit);
+            else
+                w->PushUnit(unit);
+        }
+    }
+
+    int slaughter_count = 0;
+    for (auto w : watched_races) {
+        int slaughter_subcount = w.second->ProcessUnits();
+        slaughter_count += slaughter_subcount;
+        if (slaughter_subcount) {
+            stringstream ss;
+            ss << slaughter_subcount;
+            string announce = Units::getRaceNamePluralById(w.first) + " marked for slaughter: " + ss.str();
+            Gui::showAnnouncement(announce, 2, false);
+        }
+    }
+}
+
+/////////////////////////////////////
+// API functions to control autobutcher with a lua script
+
+// abuse WatchedRace struct for counting stocks (since it sorts by gender and age)
+// calling method must delete pointer!
+static WatchedRace * checkRaceStocksTotal(color_ostream &out, int race) {
+    WatchedRace * w = new WatchedRace(out, race, true, 0, 0, 0, 0);
+    for (auto unit : world->units.all) {
+        if (unit->race != race)
+            continue;
+
+        if (   !Units::isActive(unit)
+            || Units::isUndead(unit)
+            || Units::isMerchant(unit) // ignore merchants' draft animals
+            || Units::isForest(unit) // ignore merchants' caged animals
+            || !Units::isOwnCiv(unit)
+            )
+            continue;
+
+        if(!isContainedInItem(unit) && !hasValidMapPos(unit))
+            continue;
+
+        w->PushUnit(unit);
+    }
+    return w;
+}
+
+WatchedRace * checkRaceStocksProtected(color_ostream &out, int race) {
+    WatchedRace * w = new WatchedRace(out, race, true, 0, 0, 0, 0);
+    for (auto unit : world->units.all) {
+        if (unit->race != race)
+            continue;
+
+        if (   !Units::isActive(unit)
+            || Units::isUndead(unit)
+            || Units::isMerchant(unit) // ignore merchants' draft animals
+            || Units::isForest(unit) // ignore merchants' caged animals
+            || !Units::isOwnCiv(unit)
+            )
+            continue;
+
+        // found a bugged unit which had invalid coordinates but was not in a cage.
+        // marking it for slaughter didn't seem to have negative effects, but you never know...
+        if (!isContainedInItem(unit) && !hasValidMapPos(unit))
+            continue;
+
+        if (  !Units::isTame(unit)
+           || Units::isWar(unit) // ignore war dogs etc
+           || Units::isHunter(unit) // ignore hunting dogs etc
+            // ignore creatures in built cages which are defined as rooms to leave zoos alone
+            // (TODO: better solution would be to allow some kind of slaughter cages which you can place near the butcher)
+            || (isContainedInItem(unit) && isInBuiltCageRoom(unit))  // !!! see comments in isBuiltCageRoom()
+            || Units::isAvailableForAdoption(unit)
+            || unit->name.has_name )
+            w->PushUnit(unit);
+    }
+    return w;
+}
+
+WatchedRace * checkRaceStocksButcherable(color_ostream &out, int race) {
+    WatchedRace * w = new WatchedRace(out, race, true, 0, 0, 0, 0);
+    for (auto unit : world->units.all) {
+        if (unit->race != race)
+            continue;
+
+        if (   !Units::isActive(unit)
+            || Units::isUndead(unit)
+            || Units::isMerchant(unit) // ignore merchants' draft animals
+            || Units::isForest(unit) // ignore merchants' caged animals
+            || !Units::isOwnCiv(unit)
+            || !Units::isTame(unit)
+            || Units::isWar(unit) // ignore war dogs etc
+            || Units::isHunter(unit) // ignore hunting dogs etc
+            // ignore creatures in built cages which are defined as rooms to leave zoos alone
+            // (TODO: better solution would be to allow some kind of slaughter cages which you can place near the butcher)
+            || (isContainedInItem(unit) && isInBuiltCageRoom(unit))  // !!! see comments in isBuiltCageRoom()
+            || Units::isAvailableForAdoption(unit)
+            || unit->name.has_name
+            )
+            continue;
+
+        if (!isContainedInItem(unit) && !hasValidMapPos(unit))
+            continue;
+
+        w->PushUnit(unit);
+    }
+    return w;
+}
+
+WatchedRace * checkRaceStocksButcherFlag(color_ostream &out, int race) {
+    WatchedRace * w = new WatchedRace(out, race, true, 0, 0, 0, 0);
+    for (auto unit : world->units.all) {
+        if(unit->race != race)
+            continue;
+
+        if (   !Units::isActive(unit)
+            || Units::isUndead(unit)
+            || Units::isMerchant(unit) // ignore merchants' draft animals
+            || Units::isForest(unit) // ignore merchants' caged animals
+            || !Units::isOwnCiv(unit)
+            )
+            continue;
+
+        if (!isContainedInItem(unit) && !hasValidMapPos(unit))
+            continue;
+
+        if (Units::isMarkedForSlaughter(unit))
+            w->PushUnit(unit);
+    }
+    return w;
+}
+
+static bool autowatch_isEnabled() {
+    return get_config_bool(CONFIG_AUTOWATCH);
+}
+
+static unsigned autobutcher_getSleep(color_ostream &out) {
+    return get_config_val(CONFIG_CYCLE_TICKS);
+}
+
+static void autobutcher_setSleep(color_ostream &out, unsigned ticks) {
+
+    set_config_val(CONFIG_CYCLE_TICKS, ticks);
+}
+
+static void autowatch_setEnabled(color_ostream &out, bool enable) {
+    DEBUG(status,out).print("auto-adding to watchlist %s\n", enable ? "started" : "stopped");
+    set_config_bool(CONFIG_AUTOWATCH, enable);
+}
+
+// set all data for a watchlist race in one go
+// if race is not already on watchlist it will be added
+// params: (id, fk, mk, fa, ma, watched)
+static void autobutcher_setWatchListRace(color_ostream &out, unsigned id, unsigned fk, unsigned mk, unsigned fa, unsigned ma, bool watched) {
+    if (watched_races.count(id)) {
+        DEBUG(status,out).print("updating watchlist entry\n");
+        WatchedRace * w = watched_races[id];
+        w->fk = fk;
+        w->mk = mk;
+        w->fa = fa;
+        w->ma = ma;
+        w->isWatched = watched;
+        w->UpdateConfig(out);
+        return;
+    }
+
+    DEBUG(status,out).print("creating new watchlist entry\n");
+    WatchedRace * w = new WatchedRace(out, id, watched, fk, mk, fa, ma);
+    w->UpdateConfig(out);
+    watched_races.emplace(id, w);
+
+    string announce;
+    announce = "New race added to autobutcher watchlist: " + Units::getRaceNamePluralById(id);
+    Gui::showAnnouncement(announce, 2, false);
+}
+
+// remove entry from watchlist
+static void autobutcher_removeFromWatchList(color_ostream &out, unsigned id) {
+    if (watched_races.count(id)) {
+        DEBUG(status,out).print("removing watchlist entry\n");
+        WatchedRace * w = watched_races[id];
+        w->RemoveConfig(out);
+        watched_races.erase(id);
+    }
+}
+
+// set default target values for new races
+static void autobutcher_setDefaultTargetNew(color_ostream &out, unsigned fk, unsigned mk, unsigned fa, unsigned ma) {
+    set_config_val(CONFIG_DEFAULT_FK, fk);
+    set_config_val(CONFIG_DEFAULT_MK, mk);
+    set_config_val(CONFIG_DEFAULT_FA, fa);
+    set_config_val(CONFIG_DEFAULT_MA, ma);
+}
+
+// set default target values for ALL races (update watchlist and set new default)
+static void autobutcher_setDefaultTargetAll(color_ostream &out, unsigned fk, unsigned mk, unsigned fa, unsigned ma) {
+    for (auto w : watched_races) {
+        w.second->fk = fk;
+        w.second->mk = mk;
+        w.second->fa = fa;
+        w.second->ma = ma;
+        w.second->UpdateConfig(out);
+    }
+    autobutcher_setDefaultTargetNew(out, fk, mk, fa, ma);
+}
+
+static void autobutcher_butcherRace(color_ostream &out, int id) {
+    for (auto unit : world->units.all) {
+        if(unit->race != id)
+            continue;
+
+        if(    !Units::isActive(unit)
+            || Units::isUndead(unit)
+            || Units::isMerchant(unit) // ignore merchants' draught animals
+            || Units::isForest(unit) // ignore merchants' caged animals
+            || !Units::isOwnCiv(unit)
+            || !Units::isTame(unit)
+            || Units::isWar(unit) // ignore war dogs etc
+            || Units::isHunter(unit) // ignore hunting dogs etc
+            // ignore creatures in built cages which are defined as rooms to leave zoos alone
+            // (TODO: better solution would be to allow some kind of slaughter cages which you can place near the butcher)
+            || (isContainedInItem(unit) && isInBuiltCageRoom(unit))  // !!! see comments in isBuiltCageRoom()
+            || Units::isAvailableForAdoption(unit)
+            || unit->name.has_name
+            )
+            continue;
+
+        // found a bugged unit which had invalid coordinates but was not in a cage.
+        // marking it for slaughter didn't seem to have negative effects, but you never know...
+        if(!isContainedInItem(unit) && !hasValidMapPos(unit))
+            continue;
+
+        doMarkForSlaughter(unit);
+    }
+}
+
+// remove butcher flag for all units of a given race
+static void autobutcher_unbutcherRace(color_ostream &out, int id) {
+    for (auto unit : world->units.all) {
+        if(unit->race != id)
+            continue;
+
+        if(    !Units::isActive(unit)
+            || Units::isUndead(unit)
+            || !Units::isMarkedForSlaughter(unit)
+            )
+            continue;
+
+        if(!isContainedInItem(unit) && !hasValidMapPos(unit))
+            continue;
+
+        unit->flags2.bits.slaughter = 0;
+    }
+}
+
+// push autobutcher settings on lua stack
+static int autobutcher_getSettings(lua_State *L) {
+    lua_newtable(L);
+    int ctable = lua_gettop(L);
+    Lua::SetField(L, get_config_bool(CONFIG_IS_ENABLED), ctable, "enable_autobutcher");
+    Lua::SetField(L, get_config_bool(CONFIG_AUTOWATCH), ctable, "enable_autowatch");
+    Lua::SetField(L, get_config_val(CONFIG_DEFAULT_FK), ctable, "fk");
+    Lua::SetField(L, get_config_val(CONFIG_DEFAULT_MK), ctable, "mk");
+    Lua::SetField(L, get_config_val(CONFIG_DEFAULT_FA), ctable, "fa");
+    Lua::SetField(L, get_config_val(CONFIG_DEFAULT_MA), ctable, "ma");
+    Lua::SetField(L, get_config_val(CONFIG_CYCLE_TICKS), ctable, "sleep");
+    return 1;
+}
+
+// push the watchlist vector as nested table on the lua stack
+static int autobutcher_getWatchList(lua_State *L) {
+    color_ostream *out = Lua::GetOutput(L);
+    if (!out)
+        out = &Core::getInstance().getConsole();
+
+    lua_newtable(L);
+    int entry_index = 0;
+    for (auto wr : watched_races) {
+        lua_newtable(L);
+        int ctable = lua_gettop(L);
+
+        WatchedRace * w = wr.second;
+        int id = w->raceId;
+        Lua::SetField(L, id, ctable, "id");
+        Lua::SetField(L, w->isWatched, ctable, "watched");
+        Lua::SetField(L, Units::getRaceNamePluralById(id), ctable, "name");
+        Lua::SetField(L, w->fk, ctable, "fk");
+        Lua::SetField(L, w->mk, ctable, "mk");
+        Lua::SetField(L, w->fa, ctable, "fa");
+        Lua::SetField(L, w->ma, ctable, "ma");
+
+        WatchedRace *tally = checkRaceStocksTotal(*out, id);
+        Lua::SetField(L, tally->unit_ptr[fk_index].size(), ctable, "fk_total");
+        Lua::SetField(L, tally->unit_ptr[mk_index].size(), ctable, "mk_total");
+        Lua::SetField(L, tally->unit_ptr[fa_index].size(), ctable, "fa_total");
+        Lua::SetField(L, tally->unit_ptr[ma_index].size(), ctable, "ma_total");
+        delete tally;
+
+        tally = checkRaceStocksProtected(*out, id);
+        Lua::SetField(L, tally->unit_ptr[fk_index].size(), ctable, "fk_protected");
+        Lua::SetField(L, tally->unit_ptr[mk_index].size(), ctable, "mk_protected");
+        Lua::SetField(L, tally->unit_ptr[fa_index].size(), ctable, "fa_protected");
+        Lua::SetField(L, tally->unit_ptr[ma_index].size(), ctable, "ma_protected");
+        delete tally;
+
+        tally = checkRaceStocksButcherable(*out, id);
+        Lua::SetField(L, tally->unit_ptr[fk_index].size(), ctable, "fk_butcherable");
+        Lua::SetField(L, tally->unit_ptr[mk_index].size(), ctable, "mk_butcherable");
+        Lua::SetField(L, tally->unit_ptr[fa_index].size(), ctable, "fa_butcherable");
+        Lua::SetField(L, tally->unit_ptr[ma_index].size(), ctable, "ma_butcherable");
+        delete tally;
+
+        tally = checkRaceStocksButcherFlag(*out, id);
+        Lua::SetField(L, tally->unit_ptr[fk_index].size(), ctable, "fk_butcherflag");
+        Lua::SetField(L, tally->unit_ptr[mk_index].size(), ctable, "mk_butcherflag");
+        Lua::SetField(L, tally->unit_ptr[fa_index].size(), ctable, "fa_butcherflag");
+        Lua::SetField(L, tally->unit_ptr[ma_index].size(), ctable, "ma_butcherflag");
+        delete tally;
+
+        lua_rawseti(L, -2, ++entry_index);
+    }
+
+    return 1;
+}
+
+DFHACK_PLUGIN_LUA_FUNCTIONS {
+    DFHACK_LUA_FUNCTION(autowatch_isEnabled),
+    DFHACK_LUA_FUNCTION(autowatch_setEnabled),
+    DFHACK_LUA_FUNCTION(autobutcher_getSleep),
+    DFHACK_LUA_FUNCTION(autobutcher_setSleep),
+    DFHACK_LUA_FUNCTION(autobutcher_setWatchListRace),
+    DFHACK_LUA_FUNCTION(autobutcher_setDefaultTargetNew),
+    DFHACK_LUA_FUNCTION(autobutcher_setDefaultTargetAll),
+    DFHACK_LUA_FUNCTION(autobutcher_butcherRace),
+    DFHACK_LUA_FUNCTION(autobutcher_unbutcherRace),
+    DFHACK_LUA_FUNCTION(autobutcher_removeFromWatchList),
+    DFHACK_LUA_END
+};
+
+DFHACK_PLUGIN_LUA_COMMANDS {
+    DFHACK_LUA_COMMAND(autobutcher_getSettings),
+    DFHACK_LUA_COMMAND(autobutcher_getWatchList),
+    DFHACK_LUA_END
+};
diff --git a/plugins/lua/autobutcher.lua b/plugins/lua/autobutcher.lua
new file mode 100644
index 000000000..ab334896c
--- /dev/null
+++ b/plugins/lua/autobutcher.lua
@@ -0,0 +1,89 @@
+local _ENV = mkmodule('plugins.autobutcher')
+
+--[[
+
+ Native functions:
+
+ * autobutcher_isEnabled()
+ * autowatch_isEnabled()
+
+--]]
+
+local argparse = require('argparse')
+
+local function is_int(val)
+    return val and val == math.floor(val)
+end
+
+local function is_positive_int(val)
+    return is_int(val) and val > 0
+end
+
+local function check_nonnegative_int(str)
+    local val = tonumber(str)
+    if is_positive_int(val) or val == 0 then return val end
+    qerror('expecting a non-negative integer, but got: '..tostring(str))
+end
+
+local function process_args(opts, args)
+    if args[1] == 'help' then
+        opts.help = true
+        return
+    end
+
+    return argparse.processArgsGetopt(args, {
+            {'h', 'help', handler=function() opts.help = true end},
+        })
+end
+
+local function process_races(opts, races, start_idx)
+    if #races < start_idx then
+        qerror('missing list of races (or "all" or "new" keywords)')
+    end
+    for i=start_idx,#races do
+        local race = races[i]
+        if race == 'all' then
+            opts.races_all = true
+        elseif race == 'new' then
+            opts.races_new = true
+        else
+            local str = df.new('string')
+            str.value = race
+            opts.races:insert('#', str)
+        end
+    end
+end
+
+function parse_commandline(opts, ...)
+    local positionals = process_args(opts, {...})
+
+    local command = positionals[1]
+    if command then opts.command = command end
+
+    if opts.help or not command or command == 'now' or
+            command == 'autowatch' or command == 'noautowatch' or
+            command == 'list' or command == 'list_export' then
+        return
+    end
+
+    if command == 'watch' or command == 'unwatch' or command == 'forget' then
+        process_races(opts, positionals, 2)
+    elseif command == 'target' then
+        opts.fk = check_nonnegative_int(positionals[2])
+        opts.mk = check_nonnegative_int(positionals[3])
+        opts.fa = check_nonnegative_int(positionals[4])
+        opts.ma = check_nonnegative_int(positionals[5])
+        process_races(opts, positionals, 6)
+    elseif command == 'ticks' then
+        local ticks = tonumber(positionals[2])
+        if not is_positive_int(arg) then
+            qerror('number of ticks must be a positive integer: ' .. ticks)
+        else
+            opts.ticks = ticks
+        end
+    else
+        qerror(('unrecognized command: "%s"'):format(command))
+    end
+end
+
+return _ENV
diff --git a/plugins/lua/zone.lua b/plugins/lua/zone.lua
deleted file mode 100644
index 75c9feec8..000000000
--- a/plugins/lua/zone.lua
+++ /dev/null
@@ -1,12 +0,0 @@
-local _ENV = mkmodule('plugins.zone')
-
---[[
-
- Native functions:
-
- * autobutcher_isEnabled()
- * autowatch_isEnabled()
-
---]]
-
-return _ENV
diff --git a/plugins/zone.cpp b/plugins/zone.cpp
index 6353bfd35..60f1f2b61 100644
--- a/plugins/zone.cpp
+++ b/plugins/zone.cpp
@@ -14,107 +14,59 @@
 // - mass-assign creatures using filters
 // - unassign single creature under cursor from current zone
 // - pitting own dwarves :)
-// - full automation of handling mini-pastures over nestboxes:
-//   go through all pens, check if they are empty and placed over a nestbox
-//   find female tame egg-layer who is not assigned to another pen and assign it to nestbox pasture
-//   maybe check for minimum age? it's not that useful to fill nestboxes with freshly hatched birds
-//   state and sleep setting is saved the first time autonestbox is started (to avoid writing stuff if the plugin is never used)
-// - full automation of marking live-stock for slaughtering
-//   races can be added to a watchlist and it can be set how many male/female kids/adults are left alive
-//   adding to the watchlist can be automated as well.
-//   config for autobutcher (state and sleep setting) is saved the first time autobutcher is started
-//   config for watchlist entries is saved when they are created or modified
-
-#include <iostream>
-#include <iomanip>
-#include <climits>
-#include <vector>
-#include <algorithm>
-#include <unordered_map>
-#include <unordered_set>
+
 #include <functional>
-#include <string>
-#include <sstream>
 #include <stdexcept>
-#include <ctime>
-#include <cstdio>
-#include <cstdint>
-
-#include "Core.h"
-#include "Console.h"
-#include "Export.h"
-#include "PluginManager.h"
-#include "MiscUtils.h"
-#include "uicommon.h"
-
-#include "LuaTools.h"
-#include "DataFuncs.h"
-
-#include "modules/Units.h"
-#include "modules/Maps.h"
-#include "modules/Gui.h"
-#include "modules/Materials.h"
-#include "modules/MapCache.h"
-#include "modules/Buildings.h"
-#include "modules/World.h"
-#include "modules/Screen.h"
-#include "MiscUtils.h"
-#include <VTableInterpose.h>
+#include <unordered_map>
+#include <unordered_set>
 
-#include "df/ui.h"
-#include "df/world.h"
-#include "df/world_raws.h"
-#include "df/building_def.h"
-#include "df/building_civzonest.h"
 #include "df/building_cagest.h"
 #include "df/building_chainst.h"
-#include "df/building_nest_boxst.h"
+#include "df/building_civzonest.h"
 #include "df/general_ref_building_civzone_assignedst.h"
-#include <df/creature_raw.h>
-#include <df/caste_raw.h>
+#include "df/ui.h"
+#include "df/unit.h"
 #include "df/unit_relationship_type.h"
-#include "df/unit_soul.h"
-#include "df/unit_wound.h"
 #include "df/viewscreen_dwarfmodest.h"
+#include "df/world.h"
+
+#include "PluginManager.h"
+#include "uicommon.h"
+#include "VTableInterpose.h"
+
+#include "modules/Buildings.h"
+#include "modules/Gui.h"
+#include "modules/Units.h"
 #include "modules/Translation.h"
 
+using std::function;
 using std::make_pair;
+using std::ostringstream;
+using std::pair;
+using std::runtime_error;
 using std::string;
 using std::unordered_map;
 using std::unordered_set;
 using std::vector;
 
 using namespace DFHack;
-using namespace DFHack::Units;
-using namespace DFHack::Buildings;
-using namespace df::enums;
 
 DFHACK_PLUGIN("zone");
 DFHACK_PLUGIN_IS_ENABLED(is_enabled);
 
-REQUIRE_GLOBAL(world);
 REQUIRE_GLOBAL(cursor);
-REQUIRE_GLOBAL(ui);
-REQUIRE_GLOBAL(ui_build_selector);
 REQUIRE_GLOBAL(gps);
-REQUIRE_GLOBAL(cur_year);
-REQUIRE_GLOBAL(cur_year_tick);
-
+REQUIRE_GLOBAL(ui);
 REQUIRE_GLOBAL(ui_building_item_cursor);
 REQUIRE_GLOBAL(ui_building_assign_type);
 REQUIRE_GLOBAL(ui_building_assign_is_marked);
 REQUIRE_GLOBAL(ui_building_assign_units);
 REQUIRE_GLOBAL(ui_building_assign_items);
 REQUIRE_GLOBAL(ui_building_in_assign);
-
 REQUIRE_GLOBAL(ui_menu_width);
+REQUIRE_GLOBAL(world);
 
-using namespace DFHack::Gui;
-
-command_result df_zone (color_ostream &out, vector <string> & parameters);
-command_result df_autobutcher(color_ostream &out, vector <string> & parameters);
-
-DFhackCExport command_result plugin_enable ( color_ostream &out, bool enable);
+static command_result df_zone (color_ostream &out, vector <string> & parameters);
 
 const string zone_help =
     "Allows easier management of pens/pastures, pits and cages.\n"
@@ -200,134 +152,20 @@ const string zone_help_examples =
     "  well, unless you have a mod with egg-laying male elves who give milk...\n";
 
 
-const string autobutcher_help =
-    "Assigns your lifestock for slaughter once it reaches a specific count. Requires\n"
-    "that you add the target race(s) to a watch list. Only tame units will be\n"
-    "processed. Named units will be completely ignored (you can give animals\n"
-    "nicknames with the tool 'rename unit' to protect them from getting slaughtered\n"
-    "automatically. Trained war or hunting pets will be ignored.\n"
-    "Once you have too much adults, the oldest will be butchered first.\n"
-    "Once you have too much kids, the youngest will be butchered first.\n"
-    "If you don't set a target count the following default will be used:\n"
-    "1 male kid, 5 female kids, 1 male adult, 5 female adults.\n"
-    "Options:\n"
-    "  start        - run every X frames (df simulation ticks)\n"
-    "                 default: X=6000  (~60 seconds at 100fps)\n"
-    "  stop         - stop running automatically\n"
-    "  sleep X      - change timer to sleep X frames between runs.\n"
-    "  watch R      - start watching race(s)\n"
-    "                 R = valid race RAW id (ALPACA, BIRD_TURKEY, etc)\n"
-    "                 or a list of RAW ids seperated by spaces\n"
-    "                 or the keyword 'all' which affects your whole current watchlist.\n"
-    "  unwatch R    - stop watching race(s)\n"
-    "                 the current target settings will be remembered\n"
-    "  forget R     - unwatch race(s) and forget target settings for it/them\n"
-    "  autowatch    - automatically adds all new races (animals you buy\n"
-    "                 from merchants, tame yourself or get from migrants)\n"
-    "                 to the watch list using default target count\n"
-    "  noautowatch  - stop auto-adding new races to the watch list\n"
-    "  list         - print status and watchlist\n"
-    "  list_export  - print status and watchlist in batchfile format\n"
-    "                 can be used to copy settings into another savegame\n"
-    "                 usage: 'dfhack-run autobutcher list_export > xyz.bat' \n"
-    "  target fk mk fa ma R\n"
-    "               - set target count for specified race:\n"
-    "                 fk = number of female kids\n"
-    "                 mk = number of male kids\n"
-    "                 fa = number of female adults\n"
-    "                 ma = number of female adults\n"
-    "                 R = 'all' sets count for all races on the current watchlist\n"
-    "                 including the races which are currenly set to 'unwatched'\n"
-    "                 and sets the new default for future watch commands\n"
-    "                 R = 'new' sets the new default for future watch commands\n"
-    "                 without changing your current watchlist\n"
-    "  example      - print some usage examples\n";
-
-const string autobutcher_help_example =
-    "Examples:\n"
-    "  autobutcher target 4 3 2 1 ALPACA BIRD_TURKEY\n"
-    "  autobutcher watch ALPACA BIRD_TURKEY\n"
-    "  autobutcher start\n"
-    "    This means you want to have max 7 kids (4 female, 3 male) and max 3 adults\n"
-    "    (2 female, 1 male) of the races alpaca and turkey. Once the kids grow up the\n"
-    "    oldest adults will get slaughtered. Excess kids will get slaughtered starting\n"
-    "    the the youngest to allow that the older ones grow into adults.\n"
-    "  autobutcher target 0 0 0 0 new\n"
-    "  autobutcher autowatch\n"
-    "  autobutcher start\n"
-    "    This tells autobutcher to automatically put all new races onto the watchlist\n"
-    "    and mark unnamed tame units for slaughter as soon as they arrive in your\n"
-    "    fortress. Settings already made for some races will be left untouched.\n";
-
-command_result init_autobutcher(color_ostream &out);
-command_result cleanup_autobutcher(color_ostream &out);
-command_result start_autobutcher(color_ostream &out);
-
-
-///////////////
-// stuff for autobutcher
-// should be moved to own plugin once the tool methods it shares with the zone plugin are moved to Unit.h / Building.h
-
-command_result autoNestbox( color_ostream &out, bool verbose );
-command_result autoButcher( color_ostream &out, bool verbose );
-
-static bool enable_autobutcher = false;
-static bool enable_autobutcher_autowatch = false;
-static size_t sleep_autobutcher = 6000;
-
-static PersistentDataItem config_autobutcher;
-
-DFhackCExport command_result plugin_onstatechange(color_ostream &out, state_change_event event)
-{
-    switch (event)
-    {
-    case DFHack::SC_MAP_LOADED:
-        // initialize from the world just loaded
-        init_autobutcher(out);
-        break;
-    case DFHack::SC_MAP_UNLOADED:
-        enable_autobutcher = false;
-        // cleanup
-        cleanup_autobutcher(out);
-        break;
-    default:
-        break;
-    }
-    return CR_OK;
-}
-
-DFhackCExport command_result plugin_onupdate ( color_ostream &out )
-{
-    static size_t ticks_autobutcher = 0;
-
-    if(enable_autobutcher)
-    {
-        if(++ticks_autobutcher >= sleep_autobutcher)
-        {
-            ticks_autobutcher= 0;
-            autoButcher(out, false);
-        }
-    }
-
-    return CR_OK;
-}
-
-
 ///////////////
 // Various small tool functions
 // probably many of these should be moved to Unit.h and Building.h sometime later...
 
-df::general_ref_building_civzone_assignedst * createCivzoneRef();
-bool unassignUnitFromBuilding(df::unit* unit);
-command_result assignUnitToZone(color_ostream& out, df::unit* unit, df::building* building, bool verbose);
-void unitInfo(color_ostream & out, df::unit* creature, bool verbose);
-void zoneInfo(color_ostream & out, df::building* building, bool verbose);
-void cageInfo(color_ostream & out, df::building* building, bool verbose);
-void chainInfo(color_ostream & out, df::building* building, bool verbose);
-bool isBuiltCageAtPos(df::coord pos);
-bool isInBuiltCageRoom(df::unit*);
-
-void doMarkForSlaughter(df::unit* unit)
+// static df::general_ref_building_civzone_assignedst * createCivzoneRef();
+// static bool unassignUnitFromBuilding(df::unit* unit);
+// static command_result assignUnitToZone(color_ostream& out, df::unit* unit, df::building* building, bool verbose);
+// static void unitInfo(color_ostream & out, df::unit* creature, bool verbose);
+// static void zoneInfo(color_ostream & out, df::building* building, bool verbose);
+// static void cageInfo(color_ostream & out, df::building* building, bool verbose);
+// static void chainInfo(color_ostream & out, df::building* building, bool verbose);
+static bool isInBuiltCageRoom(df::unit*);
+
+static void doMarkForSlaughter(df::unit* unit)
 {
     unit->flags2.bits.slaughter = 1;
 }
@@ -335,7 +173,7 @@ void doMarkForSlaughter(df::unit* unit)
 // found a unit with weird position values on one of my maps (negative and in the thousands)
 // it didn't appear in the animal stocks screen, but looked completely fine otherwise (alive, tame, own, etc)
 // maybe a rare bug, but better avoid assigning such units to zones or slaughter etc.
-bool hasValidMapPos(df::unit* unit)
+static bool hasValidMapPos(df::unit* unit)
 {
     if(    unit->pos.x >=0 && unit->pos.y >= 0 && unit->pos.z >= 0
         && unit->pos.x < world->map.x_count
@@ -347,7 +185,7 @@ bool hasValidMapPos(df::unit* unit)
 }
 
 // dump some unit info
-void unitInfo(color_ostream & out, df::unit* unit, bool verbose = false)
+static void unitInfo(color_ostream & out, df::unit* unit, bool verbose = false)
 {
     out.print("Unit %d ", unit->id); //race %d, civ %d,", creature->race, creature->civ_id
     if(unit->name.has_name)
@@ -364,11 +202,11 @@ void unitInfo(color_ostream & out, df::unit* unit, bool verbose = false)
         out << ", ";
     }
 
-    if(isAdult(unit))
+    if(Units::isAdult(unit))
         out << "adult";
-    else if(isBaby(unit))
+    else if(Units::isBaby(unit))
         out << "baby";
-    else if(isChild(unit))
+    else if(Units::isChild(unit))
         out << "child";
     out << " ";
     // sometimes empty even in vanilla RAWS, sometimes contains full race name (e.g. baby alpaca)
@@ -376,7 +214,7 @@ void unitInfo(color_ostream & out, df::unit* unit, bool verbose = false)
     //out << getRaceBabyName(unit);
     //out << getRaceChildName(unit);
 
-    out << getRaceName(unit) << " (";
+    out << Units::getRaceName(unit) << " (";
     switch(unit->sex)
     {
     case 0:
@@ -391,26 +229,26 @@ void unitInfo(color_ostream & out, df::unit* unit, bool verbose = false)
         break;
     }
     out << ")";
-    out << ", age: " << getAge(unit, true);
+    out << ", age: " << Units::getAge(unit, true);
 
 
-    if(isTame(unit))
+    if(Units::isTame(unit))
         out << ", tame";
-    if(isOwnCiv(unit))
+    if(Units::isOwnCiv(unit))
         out << ", owned";
-    if(isWar(unit))
+    if(Units::isWar(unit))
         out << ", war";
-    if(isHunter(unit))
+    if(Units::isHunter(unit))
         out << ", hunter";
-    if(isMerchant(unit))
+    if(Units::isMerchant(unit))
         out << ", merchant";
-    if(isForest(unit))
+    if(Units::isForest(unit))
         out << ", forest";
-    if(isEggLayer(unit))
+    if(Units::isEggLayer(unit))
         out << ", egglayer";
-    if(isGrazer(unit))
+    if(Units::isGrazer(unit))
         out << ", grazer";
-    if(isMilkable(unit))
+    if(Units::isMilkable(unit))
         out << ", milkable";
     if(unit->flags2.bits.slaughter)
         out << ", slaughter";
@@ -418,7 +256,7 @@ void unitInfo(color_ostream & out, df::unit* unit, bool verbose = false)
     if(verbose)
     {
         out << ". Pos: ("<<unit->pos.x << "/"<< unit->pos.y << "/" << unit->pos.z << ") " << endl;
-        out << "index in units vector: " << findIndexById(unit->id) << endl;
+        out << "index in units vector: " << Units::findIndexById(unit->id) << endl;
     }
     out << endl;
 
@@ -461,17 +299,17 @@ void unitInfo(color_ostream & out, df::unit* unit, bool verbose = false)
     }
 }
 
-bool isCage(df::building * building)
+static bool isCage(df::building * building)
 {
-    return building && (building->getType() == building_type::Cage);
+    return building && (building->getType() == df::building_type::Cage);
 }
 
-bool isChain(df::building * building)
+static bool isChain(df::building * building)
 {
-    return building && (building->getType() == building_type::Chain);
+    return building && (building->getType() == df::building_type::Chain);
 }
 
-df::general_ref_building_civzone_assignedst * createCivzoneRef()
+static df::general_ref_building_civzone_assignedst * createCivzoneRef()
 {
     static bool vt_initialized = false;
     df::general_ref_building_civzone_assignedst* newref = NULL;
@@ -510,14 +348,14 @@ df::general_ref_building_civzone_assignedst * createCivzoneRef()
     return newref;
 }
 
-bool isInBuiltCage(df::unit* unit);
+static bool isInBuiltCage(df::unit* unit);
 
 // check if assigned to pen, pit, (built) cage or chain
 // note: BUILDING_CAGED is not set for animals (maybe it's used for dwarves who get caged as sentence)
 // animals in cages (no matter if built or on stockpile) get the ref CONTAINED_IN_ITEM instead
 // removing them from cages on stockpiles is no problem even without clearing the ref
 // and usually it will be desired behavior to do so.
-bool isAssigned(df::unit* unit)
+static bool isAssigned(df::unit* unit)
 {
     bool assigned = false;
     for (size_t r=0; r < unit->general_refs.size(); r++)
@@ -537,7 +375,7 @@ bool isAssigned(df::unit* unit)
     return assigned;
 }
 
-bool isAssignedToZone(df::unit* unit)
+static bool isAssignedToZone(df::unit* unit)
 {
     bool assigned = false;
     for (size_t r=0; r < unit->general_refs.size(); r++)
@@ -553,26 +391,8 @@ bool isAssignedToZone(df::unit* unit)
     return assigned;
 }
 
-// check if assigned to a chain or built cage
-// (need to check if the ref needs to be removed, until then touching them is forbidden)
-bool isChained(df::unit* unit)
-{
-    bool contained = false;
-    for (size_t r=0; r < unit->general_refs.size(); r++)
-    {
-        df::general_ref * ref = unit->general_refs[r];
-        auto rtype = ref->getType();
-        if(rtype == df::general_ref_type::BUILDING_CHAIN)
-        {
-            contained = true;
-            break;
-        }
-    }
-    return contained;
-}
-
 // check if contained in item (e.g. animals in cages)
-bool isContainedInItem(df::unit* unit)
+static bool isContainedInItem(df::unit* unit)
 {
     bool contained = false;
     for (size_t r=0; r < unit->general_refs.size(); r++)
@@ -588,13 +408,13 @@ bool isContainedInItem(df::unit* unit)
     return contained;
 }
 
-bool isInBuiltCage(df::unit* unit)
+static bool isInBuiltCage(df::unit* unit)
 {
     bool caged = false;
     for (size_t b=0; b < world->buildings.all.size(); b++)
     {
         df::building* building = world->buildings.all[b];
-        if( building->getType() == building_type::Cage)
+        if( building->getType() == df::building_type::Cage)
         {
             df::building_cagest* cage = (df::building_cagest*) building;
             for(size_t c=0; c<cage->assigned_units.size(); c++)
@@ -613,7 +433,7 @@ bool isInBuiltCage(df::unit* unit)
 }
 
 // built cage defined as room (supposed to detect zoo cages)
-bool isInBuiltCageRoom(df::unit* unit)
+static bool isInBuiltCageRoom(df::unit* unit)
 {
     bool caged_room = false;
     for (size_t b=0; b < world->buildings.all.size(); b++)
@@ -626,7 +446,7 @@ bool isInBuiltCageRoom(df::unit* unit)
         if(!building->is_room)
             continue;
 
-        if(building->getType() == building_type::Cage)
+        if(building->getType() == df::building_type::Cage)
         {
             df::building_cagest* cage = (df::building_cagest*) building;
             for(size_t c=0; c<cage->assigned_units.size(); c++)
@@ -644,35 +464,13 @@ bool isInBuiltCageRoom(df::unit* unit)
     return caged_room;
 }
 
-// check a map position for a built cage
-// animals in cages are CONTAINED_IN_ITEM, no matter if they are on a stockpile or inside a built cage
-// if they are on animal stockpiles they should count as unassigned to allow pasturing them
-// if they are inside built cages they should be ignored in case the cage is a zoo or linked to a lever or whatever
-bool isBuiltCageAtPos(df::coord pos)
-{
-    bool cage = false;
-    for (size_t b=0; b < world->buildings.all.size(); b++)
-    {
-        df::building* building = world->buildings.all[b];
-        if( building->getType() == building_type::Cage
-            && building->x1 == pos.x
-            && building->y1 == pos.y
-            && building->z  == pos.z )
-        {
-            cage = true;
-            break;
-        }
-    }
-    return cage;
-}
-
-df::building * getBuiltCageAtPos(df::coord pos)
+static df::building * getBuiltCageAtPos(df::coord pos)
 {
     df::building* cage = NULL;
     for (size_t b=0; b < world->buildings.all.size(); b++)
     {
         df::building* building = world->buildings.all[b];
-        if( building->getType() == building_type::Cage
+        if( building->getType() == df::building_type::Cage
             && building->x1 == pos.x
             && building->y1 == pos.y
             && building->z  == pos.z )
@@ -688,120 +486,12 @@ df::building * getBuiltCageAtPos(df::coord pos)
     return cage;
 }
 
-bool isNestboxAtPos(int32_t x, int32_t y, int32_t z)
-{
-    bool found = false;
-    for (size_t b=0; b < world->buildings.all.size(); b++)
-    {
-        df::building* building = world->buildings.all[b];
-        if( building->getType() == building_type::NestBox
-            && building->x1 == x
-            && building->y1 == y
-            && building->z  == z )
-        {
-            found = true;
-            break;
-        }
-    }
-    return found;
-}
-
-bool isFreeNestboxAtPos(int32_t x, int32_t y, int32_t z)
-{
-    bool found = false;
-    for (size_t b=0; b < world->buildings.all.size(); b++)
-    {
-        df::building* building = world->buildings.all[b];
-        if( building->getType() == building_type::NestBox
-            && building->x1 == x
-            && building->y1 == y
-            && building->z  == z )
-        {
-            df::building_nest_boxst* nestbox = (df::building_nest_boxst*) building;
-            if(nestbox->claimed_by == -1 && nestbox->contained_items.size() == 1)
-            {
-                found = true;
-                break;
-            }
-        }
-    }
-    return found;
-}
-
-bool isEmptyPasture(df::building* building)
-{
-    if(!isPenPasture(building))
-        return false;
-    df::building_civzonest * civ = (df::building_civzonest *) building;
-    if(civ->assigned_units.size() == 0)
-        return true;
-    else
-        return false;
-}
-
-df::building* findFreeNestboxZone()
-{
-    df::building * free_building = NULL;
-    for (size_t b=0; b < world->buildings.all.size(); b++)
-    {
-        df::building* building = world->buildings.all[b];
-        if( isEmptyPasture(building) &&
-            isActive(building) &&
-            isFreeNestboxAtPos(building->x1, building->y1, building->z))
-        {
-            free_building = building;
-            break;
-        }
-    }
-    return free_building;
-}
-
-bool isFreeEgglayer(df::unit * unit)
-{
-    return isActive(unit) && !isUndead(unit)
-        && isFemale(unit)
-        && isTame(unit)
-        && isOwnCiv(unit)
-        && isEggLayer(unit)
-        && !isAssigned(unit)
-        && !isGrazer(unit) // exclude grazing birds because they're messy
-        && !isMerchant(unit) // don't steal merchant mounts
-        && !isForest(unit);  // don't steal birds from traders, they hate that
-}
-
-df::unit * findFreeEgglayer()
-{
-    df::unit* free_unit = NULL;
-    for (size_t i=0; i < world->units.all.size(); i++)
-    {
-        df::unit* unit = world->units.all[i];
-        if(isFreeEgglayer(unit))
-        {
-            free_unit = unit;
-            break;
-        }
-    }
-    return free_unit;
-}
-
-size_t countFreeEgglayers()
-{
-    size_t count = 0;
-    for (size_t i=0; i < world->units.all.size(); i++)
-    {
-        df::unit* unit = world->units.all[i];
-        if(isFreeEgglayer(unit))
-            count ++;
-    }
-    return count;
-}
-
 // check if unit is already assigned to a zone, remove that ref from unit and old zone
 // check if unit is already assigned to a cage, remove that ref from the cage
 // returns false if no cage or pasture information was found
 // helps as workaround for http://www.bay12games.com/dwarves/mantisbt/view.php?id=4475 by the way
 // (pastured animals assigned to chains will get hauled back and forth because the pasture ref is not deleted)
-bool unassignUnitFromBuilding(df::unit* unit)
+static bool unassignUnitFromBuilding(df::unit* unit)
 {
     bool success = false;
     for (std::size_t idx = 0; idx < unit->general_refs.size(); idx++)
@@ -885,10 +575,10 @@ bool unassignUnitFromBuilding(df::unit* unit)
 }
 
 // assign to pen or pit
-command_result assignUnitToZone(color_ostream& out, df::unit* unit, df::building* building, bool verbose = false)
+static command_result assignUnitToZone(color_ostream& out, df::unit* unit, df::building* building, bool verbose = false)
 {
     // building must be a pen/pasture or pit
-    if(!isPenPasture(building) && !isPitPond(building))
+    if(!Buildings::isPenPasture(building) && !Buildings::isPitPond(building))
     {
         out << "Invalid building type. This is not a pen/pasture or pit/pond." << endl;
         return CR_WRONG_USAGE;
@@ -926,18 +616,18 @@ command_result assignUnitToZone(color_ostream& out, df::unit* unit, df::building
     civz->assigned_units.push_back(unit->id);
 
     out << "Unit " << unit->id
-        << "(" << getRaceName(unit) << ")"
+        << "(" << Units::getRaceName(unit) << ")"
         << " assigned to zone " << building->id;
-    if(isPitPond(building))
+    if(Buildings::isPitPond(building))
         out << " (pit/pond).";
-    if(isPenPasture(building))
+    if(Buildings::isPenPasture(building))
         out << " (pen/pasture).";
     out << endl;
 
     return CR_OK;
 }
 
-command_result assignUnitToCage(color_ostream& out, df::unit* unit, df::building* building, bool verbose)
+static command_result assignUnitToCage(color_ostream& out, df::unit* unit, df::building* building, bool verbose)
 {
     // building must be a pen/pasture or pit
     if(!isCage(building))
@@ -967,24 +657,24 @@ command_result assignUnitToCage(color_ostream& out, df::unit* unit, df::building
     civz->assigned_units.push_back(unit->id);
 
     out << "Unit " << unit->id
-        << "(" << getRaceName(unit) << ")"
+        << "(" << Units::getRaceName(unit) << ")"
         << " assigned to cage " << building->id;
     out << endl;
 
     return CR_OK;
 }
 
-command_result assignUnitToChain(color_ostream& out, df::unit* unit, df::building* building, bool verbose)
+static command_result assignUnitToChain(color_ostream& out, df::unit* unit, df::building* building, bool verbose)
 {
     out << "sorry. assigning to chains is not possible yet." << endl;
     return CR_WRONG_USAGE;
 }
 
-command_result assignUnitToBuilding(color_ostream& out, df::unit* unit, df::building* building, bool verbose)
+static command_result assignUnitToBuilding(color_ostream& out, df::unit* unit, df::building* building, bool verbose)
 {
     command_result result = CR_WRONG_USAGE;
 
-    if(isActivityZone(building))
+    if(Buildings::isActivityZone(building))
         result = assignUnitToZone(out, unit, building, verbose);
     else if(isCage(building))
         result = assignUnitToCage(out, unit, building, verbose);
@@ -996,9 +686,9 @@ command_result assignUnitToBuilding(color_ostream& out, df::unit* unit, df::buil
     return result;
 }
 
-command_result assignUnitsToCagezone(color_ostream& out, vector<df::unit*> units, df::building* building, bool verbose)
+static command_result assignUnitsToCagezone(color_ostream& out, vector<df::unit*> units, df::building* building, bool verbose)
 {
-    if(!isPenPasture(building))
+    if(!Buildings::isPenPasture(building))
     {
         out << "A cage zone needs to be a pen/pasture containing at least one cage!" << endl;
         return CR_WRONG_USAGE;
@@ -1055,10 +745,10 @@ command_result assignUnitsToCagezone(color_ostream& out, vector<df::unit*> units
     return CR_OK;
 }
 
-command_result nickUnitsInZone(color_ostream& out, df::building* building, string nick)
+static command_result nickUnitsInZone(color_ostream& out, df::building* building, string nick)
 {
     // building must be a pen/pasture or pit
-    if(!isPenPasture(building) && !isPitPond(building))
+    if(!Buildings::isPenPasture(building) && !Buildings::isPitPond(building))
     {
         out << "Invalid building type. This is not a pen/pasture or pit/pond." << endl;
         return CR_WRONG_USAGE;
@@ -1075,7 +765,7 @@ command_result nickUnitsInZone(color_ostream& out, df::building* building, strin
     return CR_OK;
 }
 
-command_result nickUnitsInCage(color_ostream& out, df::building* building, string nick)
+static command_result nickUnitsInCage(color_ostream& out, df::building* building, string nick)
 {
     // building must be a pen/pasture or pit
     if(!isCage(building))
@@ -1095,7 +785,7 @@ command_result nickUnitsInCage(color_ostream& out, df::building* building, strin
     return CR_OK;
 }
 
-command_result nickUnitsInChain(color_ostream& out, df::building* building, string nick)
+static command_result nickUnitsInChain(color_ostream& out, df::building* building, string nick)
 {
     out << "sorry. nicknaming chained units is not possible yet." << endl;
     return CR_WRONG_USAGE;
@@ -1103,11 +793,11 @@ command_result nickUnitsInChain(color_ostream& out, df::building* building, stri
 
 // give all units inside a pasture or cage the same nickname
 // (usage example: protect them from being autobutchered)
-command_result nickUnitsInBuilding(color_ostream& out, df::building* building, string nick)
+static command_result nickUnitsInBuilding(color_ostream& out, df::building* building, string nick)
 {
     command_result result = CR_WRONG_USAGE;
 
-    if(isActivityZone(building))
+    if(Buildings::isActivityZone(building))
         result = nickUnitsInZone(out, building, nick);
     else if(isCage(building))
         result = nickUnitsInCage(out, building, nick);
@@ -1120,9 +810,9 @@ command_result nickUnitsInBuilding(color_ostream& out, df::building* building, s
 }
 
 // dump some zone info
-void zoneInfo(color_ostream & out, df::building* building, bool verbose)
+static void zoneInfo(color_ostream & out, df::building* building, bool verbose)
 {
-    if(!isActivityZone(building))
+    if(!Buildings::isActivityZone(building))
         return;
 
     string name;
@@ -1138,7 +828,7 @@ void zoneInfo(color_ostream & out, df::building* building, bool verbose)
     out.print("\n");
 
     df::building_civzonest * civ = (df::building_civzonest *) building;
-    if(isActive(civ))
+    if(Buildings::isActive(civ))
         out << "active";
     else
         out << "not active";
@@ -1180,7 +870,7 @@ void zoneInfo(color_ostream & out, df::building* building, bool verbose)
 }
 
 // dump some cage info
-void cageInfo(color_ostream & out, df::building* building, bool verbose)
+static void cageInfo(color_ostream & out, df::building* building, bool verbose)
 {
     if(!isCage(building))
         return;
@@ -1220,7 +910,7 @@ void cageInfo(color_ostream & out, df::building* building, bool verbose)
 }
 
 // dump some chain/restraint info
-void chainInfo(color_ostream & out, df::building* building, bool list_refs = false)
+static void chainInfo(color_ostream & out, df::building* building, bool list_refs = false)
 {
     if(!isChain(building))
         return;
@@ -1247,7 +937,7 @@ void chainInfo(color_ostream & out, df::building* building, bool list_refs = fal
     }
 }
 
-df::building* getAssignableBuildingAtCursor(color_ostream& out)
+static df::building* getAssignableBuildingAtCursor(color_ostream& out)
 {
     // set building at cursor position to be new target building
     if (cursor->x == -30000)
@@ -1267,7 +957,7 @@ df::building* getAssignableBuildingAtCursor(color_ostream& out)
     }
     else
     {
-        auto zone_at_tile = findPenPitAt(Gui::getCursorPos());
+        auto zone_at_tile = Buildings::findPenPitAt(Gui::getCursorPos());
         if(!zone_at_tile)
         {
             out << "No pen/pasture, pit, or cage under cursor!" << endl;
@@ -1284,38 +974,38 @@ df::building* getAssignableBuildingAtCursor(color_ostream& out)
 // ZONE FILTERS (as in, filters used by 'zone')
 
 // Maps parameter names to filters.
-unordered_map<string, function<bool(df::unit*)>> zone_filters;
+static unordered_map<string, function<bool(df::unit*)>> zone_filters;
 static struct zone_filters_init { zone_filters_init() {
     zone_filters["caged"] = isContainedInItem;
-    zone_filters["egglayer"] = isEggLayer;
-    zone_filters["female"] = isFemale;
-    zone_filters["grazer"] = isGrazer;
-    zone_filters["hunting"] = isHunter;
-    zone_filters["male"] = isMale;
-    zone_filters["milkable"] = isMilkable;
-    zone_filters["naked"] = isNaked;
-    zone_filters["own"] = isOwnCiv;
-    zone_filters["tamable"] = isTamable;
-    zone_filters["tame"] = isTame;
+    zone_filters["egglayer"] = Units::isEggLayer;
+    zone_filters["female"] = Units::isFemale;
+    zone_filters["grazer"] = Units::isGrazer;
+    zone_filters["hunting"] = Units::isHunter;
+    zone_filters["male"] = Units::isMale;
+    zone_filters["milkable"] = Units::isMilkable;
+    zone_filters["naked"] = Units::isNaked;
+    zone_filters["own"] = Units::isOwnCiv;
+    zone_filters["tamable"] = Units::isTamable;
+    zone_filters["tame"] = Units::isTame;
     zone_filters["trainablewar"] = [](df::unit *unit) -> bool
     {
-        return !isWar(unit) && !isHunter(unit) && isTrainableWar(unit);
+        return !Units::isWar(unit) && !Units::isHunter(unit) && Units::isTrainableWar(unit);
     };
     zone_filters["trainablehunt"] = [](df::unit *unit) -> bool
     {
-        return !isWar(unit) && !isHunter(unit) && isTrainableHunting(unit);
+        return !Units::isWar(unit) && !Units::isHunter(unit) && Units::isTrainableHunting(unit);
     };
-    zone_filters["trained"] = isTrained;
+    zone_filters["trained"] = Units::isTrained;
     // backwards compatibility
     zone_filters["unassigned"] = [](df::unit *unit) -> bool
     {
         return !isAssigned(unit);
     };
-    zone_filters["war"] = isWar;
+    zone_filters["war"] = Units::isWar;
 }} zone_filters_init_;
 
 // Extra annotations / descriptions for parameter names.
-unordered_map<string, string> zone_filter_notes;
+static unordered_map<string, string> zone_filter_notes;
 static struct zone_filter_notes_init { zone_filter_notes_init() {
     zone_filter_notes["caged"] = "caged (ignores built cages)";
     zone_filter_notes["hunting"] = "trained hunting creature";
@@ -1326,7 +1016,7 @@ static struct zone_filter_notes_init { zone_filter_notes_init() {
     zone_filter_notes["war"] = "trained war creature";
 }} zone_filter_notes_init_;
 
-pair<string, function<bool(df::unit*)>> createRaceFilter(vector<string> &filter_args)
+static pair<string, function<bool(df::unit*)>> createRaceFilter(vector<string> &filter_args)
 {
     // guaranteed to exist.
     string race = filter_args[0];
@@ -1334,12 +1024,12 @@ pair<string, function<bool(df::unit*)>> createRaceFilter(vector<string> &filter_
     return make_pair(
         "race of " + race,
         [race](df::unit *unit) -> bool {
-            return getRaceName(unit) == race;
+            return Units::getRaceName(unit) == race;
         }
     );
 }
 
-pair<string, function<bool(df::unit*)>> createAgeFilter(vector<string> &filter_args)
+static pair<string, function<bool(df::unit*)>> createAgeFilter(vector<string> &filter_args)
 {
     int target_age;
     stringstream ss(filter_args[0]);
@@ -1360,12 +1050,12 @@ pair<string, function<bool(df::unit*)>> createAgeFilter(vector<string> &filter_a
     return make_pair(
         "age of exactly " + int_to_string(target_age),
         [target_age](df::unit *unit) -> bool {
-            return getAge(unit, true) == target_age;
+            return Units::getAge(unit, true) == target_age;
         }
     );
 }
 
-pair<string, function<bool(df::unit*)>> createMinAgeFilter(vector<string> &filter_args)
+static pair<string, function<bool(df::unit*)>> createMinAgeFilter(vector<string> &filter_args)
 {
     double min_age;
     stringstream ss(filter_args[0]);
@@ -1386,12 +1076,12 @@ pair<string, function<bool(df::unit*)>> createMinAgeFilter(vector<string> &filte
     return make_pair(
         "minimum age of " + int_to_string(min_age),
         [min_age](df::unit *unit) -> bool {
-            return getAge(unit, true) >= min_age;
+            return Units::getAge(unit, true) >= min_age;
         }
     );
 }
 
-pair<string, function<bool(df::unit*)>> createMaxAgeFilter(vector<string> &filter_args)
+static pair<string, function<bool(df::unit*)>> createMaxAgeFilter(vector<string> &filter_args)
 {
     double max_age;
     stringstream ss(filter_args[0]);
@@ -1412,7 +1102,7 @@ pair<string, function<bool(df::unit*)>> createMaxAgeFilter(vector<string> &filte
     return make_pair(
         "maximum age of " + int_to_string(max_age),
         [max_age](df::unit *unit) -> bool {
-            return getAge(unit, true) <= max_age;
+            return Units::getAge(unit, true) <= max_age;
         }
     );
 }
@@ -1428,7 +1118,7 @@ pair<string, function<bool(df::unit*)>> createMaxAgeFilter(vector<string> &filte
 // Constructor functions are permitted to throw strings, which will be caught and printed.
 // Result filter functions are not permitted to throw std::exceptions.
 // Result filter functions should not store references
-unordered_map<string, pair<int,
+static unordered_map<string, pair<int,
            function<pair<string, function<bool(df::unit*)>>(vector<string>&)>>> zone_param_filters;
 static struct zone_param_filters_init { zone_param_filters_init() {
     zone_param_filters["race"] = make_pair(1, createRaceFilter);
@@ -1437,7 +1127,7 @@ static struct zone_param_filters_init { zone_param_filters_init() {
     zone_param_filters["maxage"] = make_pair(1, createMaxAgeFilter);
 }} zone_param_filters_init_;
 
-command_result df_zone (color_ostream &out, vector <string> & parameters)
+static command_result df_zone (color_ostream &out, vector <string> & parameters)
 {
     CoreSuspender suspend;
 
@@ -1526,7 +1216,7 @@ command_result df_zone (color_ostream &out, vector <string> & parameters)
         else if(p0 == "unassign")
         {
             // if there's a unit selected...
-            df::unit *unit = getSelectedUnit(out, true);
+            df::unit *unit = Gui::getSelectedUnit(out, true);
             if (unit) {
                 // remove assignment reference from unit and old zone
                 if(unassignUnitFromBuilding(unit))
@@ -1865,7 +1555,7 @@ command_result df_zone (color_ostream &out, vector <string> & parameters)
 
                 active_filters.push_back([](df::unit *unit)
                     {
-                        return !isMerchant(unit) && !isForest(unit);
+                        return !Units::isMerchant(unit) && !Units::isForest(unit);
                     }
                 );
             } else {
@@ -1875,7 +1565,7 @@ command_result df_zone (color_ostream &out, vector <string> & parameters)
 
                 active_filters.push_back([](df::unit *unit)
                     {
-                        return isMerchant(unit) || isForest(unit);
+                        return Units::isMerchant(unit) || Units::isForest(unit);
                     }
                 );
             }
@@ -1926,7 +1616,7 @@ command_result df_zone (color_ostream &out, vector <string> & parameters)
     {
         // filter for units in the building
         unordered_set<int32_t> assigned_unit_ids;
-        if(isActivityZone(target_building))
+        if(Buildings::isActivityZone(target_building))
         {
             df::building_civzonest *civz = (df::building_civzonest *) target_building;
             auto &assigned_units_vec = civz->assigned_units;
@@ -1984,7 +1674,7 @@ command_result df_zone (color_ostream &out, vector <string> & parameters)
 
     if(!race_filter_set && (building_assign || cagezone_assign || unit_slaughter))
     {
-        string own_race_name = getRaceNameById(ui->race_id);
+        string own_race_name = Units::getRaceNameById(ui->race_id);
         out.color(COLOR_BROWN);
         out << "Default filter for " << parameters[0]
             << ": 'not (race " << own_race_name << " or own civilization)'; use 'race "
@@ -1994,7 +1684,7 @@ command_result df_zone (color_ostream &out, vector <string> & parameters)
 
         active_filters.push_back([](df::unit *unit)
             {
-                return !isOwnRace(unit) || !isOwnCiv(unit);
+                return !Units::isOwnRace(unit) || !Units::isOwnCiv(unit);
             }
         );
     }
@@ -2022,7 +1712,7 @@ command_result df_zone (color_ostream &out, vector <string> & parameters)
 
         active_filters.push_back([](df::unit *unit)
             {
-                return !isMerchant(unit) && !isForest(unit);
+                return !Units::isMerchant(unit) && !Units::isForest(unit);
             }
         );
     }
@@ -2058,7 +1748,7 @@ command_result df_zone (color_ostream &out, vector <string> & parameters)
             df::unit *unit = *unit_it;
 
             // ignore inactive and undead units
-            if (!isActive(unit) || isUndead(unit)) {
+            if (!Units::isActive(unit) || Units::isUndead(unit)) {
                 continue;
             }
 
@@ -2130,10 +1820,10 @@ command_result df_zone (color_ostream &out, vector <string> & parameters)
                 if (removed)
                 {
                     out << "Unit " << unit->id
-                        << "(" << getRaceName(unit) << ")"
+                        << "(" << Units::getRaceName(unit) << ")"
                         << " unassigned from";
 
-                    if (isActivityZone(target_building))
+                    if (Buildings::isActivityZone(target_building))
                     {
                         out << " zone ";
                     }
@@ -2179,7 +1869,7 @@ command_result df_zone (color_ostream &out, vector <string> & parameters)
     else
     {
         // must have unit selected
-        df::unit *unit = getSelectedUnit(out, true);
+        df::unit *unit = Gui::getSelectedUnit(out, true);
         if (!unit) {
             out.color(COLOR_RED);
             out << "Error: no unit selected!" << endl;
@@ -2207,1361 +1897,72 @@ command_result df_zone (color_ostream &out, vector <string> & parameters)
     return CR_OK;
 }
 
-////////////////////
-// autobutcher stuff
-
-// getUnitAge() returns 0 if born in current year, therefore the look at birth_time in that case
-// (assuming that the value from there indicates in which tick of the current year the unit was born)
-bool compareUnitAgesYounger(df::unit* i, df::unit* j)
-{
-    int32_t age_i = (int32_t) getAge(i, true);
-    int32_t age_j = (int32_t) getAge(j, true);
-    if(age_i == 0 && age_j == 0)
-    {
-        age_i = i->birth_time;
-        age_j = j->birth_time;
-    }
-    return (age_i < age_j);
-}
-bool compareUnitAgesOlder(df::unit* i, df::unit* j)
-{
-    int32_t age_i = (int32_t) getAge(i, true);
-    int32_t age_j = (int32_t) getAge(j, true);
-    if(age_i == 0 && age_j == 0)
-    {
-        age_i = i->birth_time;
-        age_j = j->birth_time;
-    }
-    return (age_i > age_j);
-}
-
-
-
-//enum WatchedRaceSubtypes
-//{
-//    femaleKid=0,
-//    maleKid,
-//    femaleAdult,
-//    maleAdult
-//};
-
-enum unit_ptr_index
-{
- fk_index = 0,
- mk_index = 1,
- fa_index = 2,
- ma_index = 3
-};
+//START zone filters
 
-struct WatchedRace
+class zone_filter
 {
 public:
-    PersistentDataItem rconfig;
-
-    bool isWatched; // if true, autobutcher will process this race
-    int raceId;
-
-    // target amounts
-    unsigned fk; // max female kids
-    unsigned mk; // max male kids
-    unsigned fa; // max female adults
-    unsigned ma; // max male adults
-
-    // amounts of protected (not butcherable) units
-    unsigned fk_prot;
-    unsigned fa_prot;
-    unsigned mk_prot;
-    unsigned ma_prot;
-
-    // butcherable units
-    vector <df::unit*> unit_ptr[4];
-
-    // priority butcherable units
-    vector <df::unit*> prot_ptr[4];
-
-    WatchedRace(bool watch, int id, unsigned _fk, unsigned _mk, unsigned _fa, unsigned _ma)
-    {
-        isWatched = watch;
-        raceId = id;
-        fk = _fk;
-        mk = _mk;
-        fa = _fa;
-        ma = _ma;
-        fk_prot = fa_prot = mk_prot = ma_prot = 0;
-    }
-
-    ~WatchedRace()
+    zone_filter()
     {
-        ClearUnits();
+        initialized = false;
     }
 
-    void UpdateConfig(color_ostream & out)
+    void initialize(const df::ui_sidebar_mode &mode)
     {
-        if(!rconfig.isValid())
-        {
-            string keyname = "autobutcher/watchlist/" + getRaceNameById(raceId);
-            rconfig = World::GetPersistentData(keyname, NULL);
-        }
-        if(rconfig.isValid())
-        {
-            rconfig.ival(0) = raceId;
-            rconfig.ival(1) = isWatched;
-            rconfig.ival(2) = fk;
-            rconfig.ival(3) = mk;
-            rconfig.ival(4) = fa;
-            rconfig.ival(5) = ma;
-        }
-        else
+        if (!initialized)
         {
-            // this should never happen
-            string keyname = "autobutcher/watchlist/" + getRaceNameById(raceId);
-            out << "Something failed, could not find/create config key " << keyname << "!" << endl;
-        }
-    }
+            this->mode = mode;
+            saved_ui_building_assign_type.clear();
+            saved_ui_building_assign_units.clear();
+            saved_ui_building_assign_items.clear();
+            saved_ui_building_assign_is_marked.clear();
+            saved_indexes.clear();
 
-    void RemoveConfig(color_ostream & out)
-    {
-        if(!rconfig.isValid())
-            return;
-        World::DeletePersistentData(rconfig);
-    }
+            for (size_t i = 0; i < ui_building_assign_units->size(); i++)
+            {
+                saved_ui_building_assign_type.push_back(ui_building_assign_type->at(i));
+                saved_ui_building_assign_units.push_back(ui_building_assign_units->at(i));
+                saved_ui_building_assign_items.push_back(ui_building_assign_items->at(i));
+                saved_ui_building_assign_is_marked.push_back(ui_building_assign_is_marked->at(i));
+            }
 
-    void SortUnitsByAge()
-    {
-        sort(unit_ptr[fk_index].begin(), unit_ptr[fk_index].end(), compareUnitAgesOlder);
-        sort(unit_ptr[mk_index].begin(), unit_ptr[mk_index].end(), compareUnitAgesOlder);
-        sort(unit_ptr[fa_index].begin(), unit_ptr[fa_index].end(), compareUnitAgesYounger);
-        sort(unit_ptr[ma_index].begin(), unit_ptr[ma_index].end(), compareUnitAgesYounger);
-        sort(prot_ptr[fk_index].begin(), prot_ptr[fk_index].end(), compareUnitAgesOlder);
-        sort(prot_ptr[mk_index].begin(), prot_ptr[mk_index].end(), compareUnitAgesOlder);
-        sort(prot_ptr[fa_index].begin(), prot_ptr[fa_index].end(), compareUnitAgesYounger);
-        sort(prot_ptr[ma_index].begin(), prot_ptr[ma_index].end(), compareUnitAgesYounger);
-    }
+            search_string.clear();
+            show_non_grazers = show_pastured = show_noncaged = show_male = show_female = show_other_zones = true;
+            entry_mode = false;
 
-    void PushUnit(df::unit * unit)
-    {
-        if(isFemale(unit))
-        {
-            if(isBaby(unit) || isChild(unit))
-                unit_ptr[fk_index].push_back(unit);
-            else
-                unit_ptr[fa_index].push_back(unit);
-        }
-        else //treat sex n/a like it was male
-        {
-            if(isBaby(unit) || isChild(unit))
-                unit_ptr[mk_index].push_back(unit);
-            else
-                unit_ptr[ma_index].push_back(unit);
+            initialized = true;
         }
     }
 
-    void PushPriorityUnit(df::unit * unit)
+    void deinitialize()
     {
-        if(isFemale(unit))
-        {
-            if(isBaby(unit) || isChild(unit))
-                prot_ptr[fk_index].push_back(unit);
-            else
-                prot_ptr[fa_index].push_back(unit);
-        }
-        else
-        {
-            if(isBaby(unit) || isChild(unit))
-                prot_ptr[mk_index].push_back(unit);
-            else
-                prot_ptr[ma_index].push_back(unit);
-        }
+        initialized = false;
     }
 
-    void PushProtectedUnit(df::unit * unit)
+    void apply_filters()
     {
-        if(isFemale(unit))
-        {
-            if(isBaby(unit) || isChild(unit))
-                fk_prot++;
-            else
-                fa_prot++;
-        }
-        else //treat sex n/a like it was male
+        if (saved_indexes.size() > 0)
         {
-            if(isBaby(unit) || isChild(unit))
-                mk_prot++;
-            else
-                ma_prot++;
-        }
-    }
+            bool list_has_been_sorted = (ui_building_assign_units->size() == reference_list.size()
+                && *ui_building_assign_units != reference_list);
 
-    void ClearUnits()
-    {
-        fk_prot = fa_prot = mk_prot = ma_prot = 0;
-        for (size_t i = 0; i < 4; i++)
-        {
-            unit_ptr[i].clear();
-            prot_ptr[i].clear();
-        }
-    }
+            for (size_t i = 0; i < saved_indexes.size(); i++)
+            {
+                int adjusted_item_index = i;
+                if (list_has_been_sorted)
+                {
+                    for (size_t j = 0; j < ui_building_assign_units->size(); j++)
+                    {
+                        if (ui_building_assign_units->at(j) == reference_list[i])
+                        {
+                            adjusted_item_index = j;
+                            break;
+                        }
+                    }
+                }
 
-    int ProcessUnits(vector<df::unit*>& unit_ptr, vector<df::unit*>& unit_pri_ptr, unsigned prot, unsigned goal)
-    {
-        int subcount = 0;
-        while(unit_pri_ptr.size() && (unit_ptr.size() + unit_pri_ptr.size() + prot > goal) )
-        {
-            df::unit* unit = unit_pri_ptr.back();
-            doMarkForSlaughter(unit);
-            unit_pri_ptr.pop_back();
-            subcount++;
-        }
-        while(unit_ptr.size() && (unit_ptr.size() + prot > goal) )
-        {
-            df::unit* unit = unit_ptr.back();
-            doMarkForSlaughter(unit);
-            unit_ptr.pop_back();
-            subcount++;
-        }
-        return subcount;
-    }
-
-    int ProcessUnits()
-    {
-        SortUnitsByAge();
-        int slaughter_count = 0;
-        slaughter_count += ProcessUnits(unit_ptr[fk_index], prot_ptr[fk_index], fk_prot, fk);
-        slaughter_count += ProcessUnits(unit_ptr[mk_index], prot_ptr[mk_index], mk_prot, mk);
-        slaughter_count += ProcessUnits(unit_ptr[fa_index], prot_ptr[fa_index], fa_prot, fa);
-        slaughter_count += ProcessUnits(unit_ptr[ma_index], prot_ptr[ma_index], ma_prot, ma);
-        ClearUnits();
-        return slaughter_count;
-    }
-};
-// vector of races handled by autobutcher
-// the name is a bit misleading since entries can be set to 'unwatched'
-// to ignore them for a while but still keep the target count settings
-std::vector<WatchedRace*> watched_races;
-
-// helper for sorting the watchlist alphabetically
-bool compareRaceNames(WatchedRace* i, WatchedRace* j)
-{
-    string name_i = getRaceNamePluralById(i->raceId);
-    string name_j = getRaceNamePluralById(j->raceId);
-
-    return (name_i < name_j);
-}
-
-static void autobutcher_sortWatchList(color_ostream &out);
-
-// default target values for autobutcher
-static unsigned default_fk = 5;
-static unsigned default_mk = 1;
-static unsigned default_fa = 5;
-static unsigned default_ma = 1;
-
-command_result df_autobutcher(color_ostream &out, vector <string> & parameters)
-{
-    CoreSuspender suspend;
-
-    bool verbose = false;
-    bool watch_race = false;
-    bool unwatch_race = false;
-    bool forget_race = false;
-    bool list_watched = false;
-    bool list_export = false;
-    bool change_target = false;
-    vector <string> target_racenames;
-    vector <int> target_raceids;
-
-    unsigned target_fk = default_fk;
-    unsigned target_mk = default_mk;
-    unsigned target_fa = default_fa;
-    unsigned target_ma = default_ma;
-
-    if(!parameters.size())
-    {
-        out << "You must specify a command!" << endl;
-        out << autobutcher_help << endl;
-        return CR_OK;
-    }
-
-    // parse main command
-    string & p = parameters[0];
-    if (p == "help" || p == "?")
-    {
-        out << autobutcher_help << endl;
-        return CR_OK;
-    }
-    if (p == "example")
-    {
-        out << autobutcher_help_example << endl;
-        return CR_OK;
-    }
-    else if (p == "start")
-    {
-        plugin_enable(out, true);
-        enable_autobutcher = true;
-        start_autobutcher(out);
-        return autoButcher(out, verbose);
-    }
-    else if (p == "stop")
-    {
-        enable_autobutcher = false;
-        if(config_autobutcher.isValid())
-            config_autobutcher.ival(0) = enable_autobutcher;
-        out << "Autobutcher stopped." << endl;
-        return CR_OK;
-    }
-    else if(p == "sleep")
-    {
-        parameters.erase(parameters.begin());
-        if(!parameters.size())
-        {
-            out.printerr("No duration specified!\n");
-            return CR_WRONG_USAGE;
-        }
-        else
-        {
-            size_t ticks = 0;
-            stringstream ss(parameters.back());
-            ss >> ticks;
-            if(ticks <= 0)
-            {
-                out.printerr("Invalid duration specified (must be > 0)!\n");
-                return CR_WRONG_USAGE;
-            }
-            sleep_autobutcher = ticks;
-            if(config_autobutcher.isValid())
-                config_autobutcher.ival(1) = sleep_autobutcher;
-            out << "New sleep timer for autobutcher: " << ticks << " ticks." << endl;
-            return CR_OK;
-        }
-    }
-    else if(p == "watch")
-    {
-        parameters.erase(parameters.begin());
-        watch_race = true;
-        out << "Start watching race(s): "; // << endl;
-    }
-    else if(p == "unwatch")
-    {
-        parameters.erase(parameters.begin());
-        unwatch_race = true;
-        out << "Stop watching race(s): "; // << endl;
-    }
-    else if(p == "forget")
-    {
-        parameters.erase(parameters.begin());
-        forget_race = true;
-        out << "Removing race(s) from watchlist: "; // << endl;
-    }
-    else if(p == "target")
-    {
-        // needs at least 5 more parameters:
-        // fk mk fa ma R (can have more than 1 R)
-        if(parameters.size() < 6)
-        {
-            out.printerr("Not enough parameters!\n");
-            return CR_WRONG_USAGE;
-        }
-        else
-        {
-            stringstream fk(parameters[1]);
-            stringstream mk(parameters[2]);
-            stringstream fa(parameters[3]);
-            stringstream ma(parameters[4]);
-            fk >> target_fk;
-            mk >> target_mk;
-            fa >> target_fa;
-            ma >> target_ma;
-            parameters.erase(parameters.begin(), parameters.begin()+5);
-            change_target = true;
-            out << "Setting new target count for race(s): "; // << endl;
-        }
-    }
-    else if(p == "autowatch")
-    {
-        out << "Auto-adding to watchlist started." << endl;
-        enable_autobutcher_autowatch = true;
-        if(config_autobutcher.isValid())
-            config_autobutcher.ival(2) = enable_autobutcher_autowatch;
-        return CR_OK;
-    }
-    else if(p == "noautowatch")
-    {
-        out << "Auto-adding to watchlist stopped." << endl;
-        enable_autobutcher_autowatch = false;
-        if(config_autobutcher.isValid())
-            config_autobutcher.ival(2) = enable_autobutcher_autowatch;
-        return CR_OK;
-    }
-    else if(p == "list")
-    {
-        list_watched = true;
-    }
-    else if(p == "list_export")
-    {
-        list_export = true;
-    }
-    else
-    {
-        out << "Unknown command: " << p << endl;
-        return CR_WRONG_USAGE;
-    }
-
-    if(list_watched)
-    {
-        out << "Autobutcher status: ";
-
-        if(enable_autobutcher)
-            out << "enabled,";
-        else
-            out << "not enabled,";
-
-        if (enable_autobutcher_autowatch)
-            out << " autowatch,";
-        else
-            out << " noautowatch,";
-
-        out << " sleep: " << sleep_autobutcher << endl;
-
-        out << "Default setting for new races:"
-            << " fk=" << default_fk
-            << " mk=" << default_mk
-            << " fa=" << default_fa
-            << " ma=" << default_ma
-            << endl;
-
-        if(!watched_races.size())
-        {
-            out << "The autobutcher race list is empty." << endl;
-            return CR_OK;
-        }
-
-        out << "Races on autobutcher list: " << endl;
-        for(size_t i=0; i<watched_races.size(); i++)
-        {
-            WatchedRace * w = watched_races[i];
-            df::creature_raw * raw = world->raws.creatures.all[w->raceId];
-            string name = raw->creature_id;
-            if(w->isWatched)
-                out << "watched: ";
-            else
-                out << "not watched: ";
-            out << name
-                << " fk=" << w->fk
-                << " mk=" << w->mk
-                << " fa=" << w->fa
-                << " ma=" << w->ma
-                << endl;
-        }
-        return CR_OK;
-    }
-
-    if(list_export)
-    {
-        // force creation of config
-        out << "autobutcher start" << endl;
-
-        if(!enable_autobutcher)
-            out << "autobutcher stop" << endl;
-
-        if (enable_autobutcher_autowatch)
-            out << "autobutcher autowatch" << endl;
-
-        out << "autobutcher sleep " << sleep_autobutcher << endl;
-        out << "autobutcher target"
-            << " " << default_fk
-            << " " << default_mk
-            << " " << default_fa
-            << " " << default_ma
-            << " new" << endl;
-
-        for(size_t i=0; i<watched_races.size(); i++)
-        {
-            WatchedRace * w = watched_races[i];
-            df::creature_raw * raw = world->raws.creatures.all[w->raceId];
-            string name = raw->creature_id;
-
-            out << "autobutcher target"
-                << " " << w->fk
-                << " " << w->mk
-                << " " << w->fa
-                << " " << w->ma
-                << " " << name << endl;
-
-            if(w->isWatched)
-                out << "autobutcher watch " << name << endl;
-        }
-        return CR_OK;
-    }
-
-    // parse rest of parameters for commands followed by a list of races
-    if(    watch_race
-        || unwatch_race
-        || forget_race
-        || change_target )
-    {
-        if(!parameters.size())
-        {
-            out.printerr("No race(s) specified!\n");
-            return CR_WRONG_USAGE;
-        }
-        while(parameters.size())
-        {
-            string tr = parameters.back();
-            target_racenames.push_back(tr);
-            parameters.pop_back();
-            out << tr << " ";
-        }
-        out << endl;
-    }
-
-    if(change_target && target_racenames.size() && target_racenames[0] == "all")
-    {
-        out << "Setting target count for all races on watchlist." << endl;
-        for(size_t i=0; i<watched_races.size(); i++)
-        {
-            WatchedRace * w = watched_races[i];
-            w->fk = target_fk;
-            w->mk = target_mk;
-            w->fa = target_fa;
-            w->ma = target_ma;
-            w->UpdateConfig(out);
-        }
-    }
-
-    if(target_racenames.size() && (target_racenames[0] == "all" || target_racenames[0] == "new"))
-    {
-        if(change_target)
-        {
-            out << "Setting target count for the future." << endl;
-            default_fk = target_fk;
-            default_mk = target_mk;
-            default_fa = target_fa;
-            default_ma = target_ma;
-            if(config_autobutcher.isValid())
-            {
-                config_autobutcher.ival(3) = default_fk;
-                config_autobutcher.ival(4) = default_mk;
-                config_autobutcher.ival(5) = default_fa;
-                config_autobutcher.ival(6) = default_ma;
-            }
-            return CR_OK;
-        }
-        else if(target_racenames[0] == "new")
-        {
-            out << "The only valid usage of 'new' is in combination when setting a target count!" << endl;
-
-            // hm, maybe instead of complaining start/stop autowatch instead? and get rid of the autowatch option?
-            if(unwatch_race)
-                out << "'unwatch new' makes no sense! Use 'noautowatch' instead." << endl;
-            else if(forget_race)
-                out << "'forget new' makes no sense, 'forget' is only for existing watchlist entries! Use 'noautowatch' instead." << endl;
-            else if(watch_race)
-                out << "'watch new' makes no sense! Use 'autowatch' instead." << endl;
-            return CR_WRONG_USAGE;
-        }
-    }
-
-    if(target_racenames.size() && target_racenames[0] == "all")
-    {
-        // fill with race ids from watchlist
-        for(size_t i=0; i<watched_races.size(); i++)
-        {
-            WatchedRace * w = watched_races[i];
-            target_raceids.push_back(w->raceId);
-        }
-    }
-    else
-    {
-        // map race names from parameter list to ids
-        size_t num_races = world->raws.creatures.all.size();
-        while(target_racenames.size())
-        {
-            bool found_race = false;
-            for(size_t i=0; i<num_races; i++)
-            {
-                if(getRaceNameById(i) == target_racenames.back())
-                {
-                    target_raceids.push_back(i);
-                    target_racenames.pop_back();
-                    found_race = true;
-                    break;
-                }
-            }
-            if(!found_race)
-            {
-                out << "Race not found: " << target_racenames.back() << endl;
-                return CR_OK;
-            }
-        }
-    }
-
-    while(target_raceids.size())
-    {
-        bool entry_found = false;
-        for(size_t i=0; i<watched_races.size(); i++)
-        {
-            WatchedRace * w = watched_races[i];
-            if(w->raceId == target_raceids.back())
-            {
-                if(unwatch_race)
-                {
-                    w->isWatched=false;
-                    w->UpdateConfig(out);
-                }
-                else if(forget_race)
-                {
-                    w->RemoveConfig(out);
-                    watched_races.erase(watched_races.begin()+i);
-                }
-                else if(watch_race)
-                {
-                    w->isWatched = true;
-                    w->UpdateConfig(out);
-                }
-                else if(change_target)
-                {
-                    w->fk = target_fk;
-                    w->mk = target_mk;
-                    w->fa = target_fa;
-                    w->ma = target_ma;
-                    w->UpdateConfig(out);
-                }
-                entry_found = true;
-                break;
-            }
-        }
-        if(!entry_found && (watch_race||change_target))
-        {
-            WatchedRace * w = new WatchedRace(watch_race, target_raceids.back(), target_fk, target_mk, target_fa, target_ma);
-            w->UpdateConfig(out);
-            watched_races.push_back(w);
-            autobutcher_sortWatchList(out);
-        }
-        target_raceids.pop_back();
-    }
-
-    return CR_OK;
-}
-
-// check watched_races vector for a race id, return -1 if nothing found
-// calling method needs to check itself if the race is currently being watched or ignored
-int getWatchedIndex(int id)
-{
-    for(size_t i=0; i<watched_races.size(); i++)
-    {
-        WatchedRace * w = watched_races[i];
-        if(w->raceId == id) // && w->isWatched)
-            return i;
-    }
-    return -1;
-}
-
-command_result autoButcher( color_ostream &out, bool verbose = false )
-{
-    // don't run if not supposed to
-    if(!Maps::IsValid())
-        return CR_OK;
-
-    // check if there is anything to watch before walking through units vector
-    if(!enable_autobutcher_autowatch)
-    {
-        bool watching = false;
-        for(size_t i=0; i<watched_races.size(); i++)
-        {
-            WatchedRace * w = watched_races[i];
-            if(w->isWatched)
-            {
-                watching = true;
-                break;
-            }
-        }
-        if(!watching)
-            return CR_OK;
-    }
-
-    for(size_t i=0; i<world->units.all.size(); i++)
-    {
-        df::unit * unit = world->units.all[i];
-
-        // this check is now divided into two steps, squeezed autowatch into the middle
-        // first one ignores completely inappropriate units (dead, undead, not belonging to the fort, ...)
-        // then let autowatch add units to the watchlist which will probably start breeding (owned pets, war animals, ...)
-        // then process units counting those which can't be butchered (war animals, named pets, ...)
-        // so that they are treated as "own stock" as well and count towards the target quota
-        if(    !isActive(unit)
-            || isUndead(unit)
-            || isMarkedForSlaughter(unit)
-            || isMerchant(unit) // ignore merchants' draught animals
-            || isForest(unit) // ignore merchants' caged animals
-            || !isOwnCiv(unit)
-            || !isTame(unit)
-            )
-            continue;
-
-        // found a bugged unit which had invalid coordinates but was not in a cage.
-        // marking it for slaughter didn't seem to have negative effects, but you never know...
-        if(!isContainedInItem(unit) && !hasValidMapPos(unit))
-            continue;
-
-        WatchedRace * w = NULL;
-        int watched_index = getWatchedIndex(unit->race);
-        if(watched_index != -1)
-        {
-            w = watched_races[watched_index];
-        }
-        else if(enable_autobutcher_autowatch)
-        {
-            w = new WatchedRace(true, unit->race, default_fk, default_mk, default_fa, default_ma);
-            w->UpdateConfig(out);
-            watched_races.push_back(w);
-
-            string announce;
-            announce = "New race added to autobutcher watchlist: " + getRaceNamePluralById(w->raceId);
-            Gui::showAnnouncement(announce, 2, false);
-            autobutcher_sortWatchList(out);
-        }
-
-        if(w && w->isWatched)
-        {
-            // don't butcher protected units, but count them as stock as well
-            // this way they count towards target quota, so if you order that you want 1 female adult cat
-            // and have 2 cats, one of them being a pet, the other gets butchered
-            if(    isWar(unit)    // ignore war dogs etc
-                || isHunter(unit) // ignore hunting dogs etc
-                // ignore creatures in built cages which are defined as rooms to leave zoos alone
-                // (TODO: better solution would be to allow some kind of slaughter cages which you can place near the butcher)
-                || (isContainedInItem(unit) && isInBuiltCageRoom(unit))  // !!! see comments in isBuiltCageRoom()
-                || isAvailableForAdoption(unit)
-                || unit->name.has_name )
-                w->PushProtectedUnit(unit);
-            else if (   isGay(unit)
-                     || isGelded(unit))
-                w->PushPriorityUnit(unit);
-            else
-                w->PushUnit(unit);
-        }
-    }
-
-    int slaughter_count = 0;
-    for(size_t i=0; i<watched_races.size(); i++)
-    {
-        WatchedRace * w = watched_races[i];
-        int slaughter_subcount = w->ProcessUnits();
-        slaughter_count += slaughter_subcount;
-        if(slaughter_subcount)
-        {
-            stringstream ss;
-            ss << slaughter_subcount;
-            string announce;
-            announce = getRaceNamePluralById(w->raceId) + " marked for slaughter: " + ss.str();
-            Gui::showAnnouncement(announce, 2, false);
-        }
-    }
-
-    return CR_OK;
-}
-
-////////////////////////////////////////////////////
-// autobutcher start/init/cleanup
-
-command_result start_autobutcher(color_ostream &out)
-{
-    plugin_enable(out, true);
-    enable_autobutcher = true;
-
-    if (!config_autobutcher.isValid())
-    {
-        config_autobutcher = World::AddPersistentData("autobutcher/config");
-
-        if (!config_autobutcher.isValid())
-        {
-            out << "Cannot enable autobutcher without a world!" << endl;
-            return CR_OK;
-        }
-
-        config_autobutcher.ival(1) = sleep_autobutcher;
-        config_autobutcher.ival(2) = enable_autobutcher_autowatch;
-        config_autobutcher.ival(3) = default_fk;
-        config_autobutcher.ival(4) = default_mk;
-        config_autobutcher.ival(5) = default_fa;
-        config_autobutcher.ival(6) = default_ma;
-    }
-
-    config_autobutcher.ival(0) = enable_autobutcher;
-
-    out << "Starting autobutcher." << endl;
-    init_autobutcher(out);
-    return CR_OK;
-}
-
-command_result init_autobutcher(color_ostream &out)
-{
-    cleanup_autobutcher(out);
-
-    config_autobutcher = World::GetPersistentData("autobutcher/config");
-    if(config_autobutcher.isValid())
-    {
-        if (config_autobutcher.ival(0) == -1)
-        {
-            config_autobutcher.ival(0) = enable_autobutcher;
-            config_autobutcher.ival(1) = sleep_autobutcher;
-            config_autobutcher.ival(2) = enable_autobutcher_autowatch;
-            config_autobutcher.ival(3) = default_fk;
-            config_autobutcher.ival(4) = default_mk;
-            config_autobutcher.ival(5) = default_fa;
-            config_autobutcher.ival(6) = default_ma;
-            out << "Autobutcher's persistent config object was invalid!" << endl;
-        }
-        else
-        {
-            enable_autobutcher = config_autobutcher.ival(0);
-            sleep_autobutcher = config_autobutcher.ival(1);
-            enable_autobutcher_autowatch = config_autobutcher.ival(2);
-            default_fk = config_autobutcher.ival(3);
-            default_mk = config_autobutcher.ival(4);
-            default_fa = config_autobutcher.ival(5);
-            default_ma = config_autobutcher.ival(6);
-        }
-    }
-
-    if(!enable_autobutcher)
-        return CR_OK;
-
-    plugin_enable(out, true);
-    // read watchlist from save
-
-    std::vector<PersistentDataItem> items;
-    World::GetPersistentData(&items, "autobutcher/watchlist/", true);
-    for (auto p = items.begin(); p != items.end(); p++)
-    {
-        string key = p->key();
-        out << "Reading from save: " << key << endl;
-        //out << "  raceid: "   << p->ival(0) << endl;
-        //out << "  watched: "  << p->ival(1) << endl;
-        //out << "  fk: "       << p->ival(2) << endl;
-        //out << "  mk: "       << p->ival(3) << endl;
-        //out << "  fa: "       << p->ival(4) << endl;
-        //out << "  ma: "       << p->ival(5) << endl;
-        WatchedRace * w = new WatchedRace(p->ival(1), p->ival(0), p->ival(2), p->ival(3),p->ival(4),p->ival(5));
-        w->rconfig = *p;
-        watched_races.push_back(w);
-    }
-    autobutcher_sortWatchList(out);
-    return CR_OK;
-}
-
-command_result cleanup_autobutcher(color_ostream &out)
-{
-    for(size_t i=0; i<watched_races.size(); i++)
-    {
-        delete watched_races[i];
-    }
-    watched_races.clear();
-    return CR_OK;
-}
-
-// abuse WatchedRace struct for counting stocks (since it sorts by gender and age)
-// calling method must delete pointer!
-WatchedRace * checkRaceStocksTotal(int race)
-{
-    WatchedRace * w = new WatchedRace(true, race, default_fk, default_mk, default_fa, default_ma);
-
-    for(size_t i=0; i<world->units.all.size(); i++)
-    {
-        df::unit * unit = world->units.all[i];
-
-        if(unit->race != race)
-            continue;
-
-        if(    !isActive(unit)
-            || isUndead(unit)
-            || isMerchant(unit) // ignore merchants' draught animals
-            || isForest(unit) // ignore merchants' caged animals
-            || !isOwnCiv(unit)
-            )
-            continue;
-
-        // found a bugged unit which had invalid coordinates but was not in a cage.
-        // marking it for slaughter didn't seem to have negative effects, but you never know...
-        if(!isContainedInItem(unit) && !hasValidMapPos(unit))
-            continue;
-
-        w->PushUnit(unit);
-    }
-    return w;
-}
-
-WatchedRace * checkRaceStocksProtected(int race)
-{
-    WatchedRace * w = new WatchedRace(true, race, default_fk, default_mk, default_fa, default_ma);
-
-    for(size_t i=0; i<world->units.all.size(); i++)
-    {
-        df::unit * unit = world->units.all[i];
-
-        if(unit->race != race)
-            continue;
-
-        if(    !isActive(unit)
-            || isUndead(unit)
-            || isMerchant(unit) // ignore merchants' draught animals
-            || isForest(unit) // ignore merchants' caged animals
-            || !isOwnCiv(unit)
-            )
-            continue;
-
-        // found a bugged unit which had invalid coordinates but was not in a cage.
-        // marking it for slaughter didn't seem to have negative effects, but you never know...
-        if(!isContainedInItem(unit) && !hasValidMapPos(unit))
-            continue;
-
-        if(   !isTame(unit)
-           || isWar(unit) // ignore war dogs etc
-           || isHunter(unit) // ignore hunting dogs etc
-            // ignore creatures in built cages which are defined as rooms to leave zoos alone
-            // (TODO: better solution would be to allow some kind of slaughter cages which you can place near the butcher)
-            || (isContainedInItem(unit) && isInBuiltCageRoom(unit))  // !!! see comments in isBuiltCageRoom()
-            || isAvailableForAdoption(unit)
-            || unit->name.has_name )
-            w->PushUnit(unit);
-    }
-    return w;
-}
-
-WatchedRace * checkRaceStocksButcherable(int race)
-{
-    WatchedRace * w = new WatchedRace(true, race, default_fk, default_mk, default_fa, default_ma);
-
-    for(size_t i=0; i<world->units.all.size(); i++)
-    {
-        df::unit * unit = world->units.all[i];
-
-        if(unit->race != race)
-            continue;
-
-        if(    !isActive(unit)
-            || isUndead(unit)
-            || isMerchant(unit) // ignore merchants' draught animals
-            || isForest(unit) // ignore merchants' caged animals
-            || !isOwnCiv(unit)
-            || !isTame(unit)
-            || isWar(unit) // ignore war dogs etc
-            || isHunter(unit) // ignore hunting dogs etc
-            // ignore creatures in built cages which are defined as rooms to leave zoos alone
-            // (TODO: better solution would be to allow some kind of slaughter cages which you can place near the butcher)
-            || (isContainedInItem(unit) && isInBuiltCageRoom(unit))  // !!! see comments in isBuiltCageRoom()
-            || isAvailableForAdoption(unit)
-            || unit->name.has_name
-            )
-            continue;
-
-        // found a bugged unit which had invalid coordinates but was not in a cage.
-        // marking it for slaughter didn't seem to have negative effects, but you never know...
-        if(!isContainedInItem(unit) && !hasValidMapPos(unit))
-            continue;
-
-        w->PushUnit(unit);
-    }
-    return w;
-}
-
-WatchedRace * checkRaceStocksButcherFlag(int race)
-{
-    WatchedRace * w = new WatchedRace(true, race, default_fk, default_mk, default_fa, default_ma);
-
-    for(size_t i=0; i<world->units.all.size(); i++)
-    {
-        df::unit * unit = world->units.all[i];
-
-        if(unit->race != race)
-            continue;
-
-        if(    !isActive(unit)
-            || isUndead(unit)
-            || isMerchant(unit) // ignore merchants' draught animals
-            || isForest(unit) // ignore merchants' caged animals
-            || !isOwnCiv(unit)
-            )
-            continue;
-
-        // found a bugged unit which had invalid coordinates but was not in a cage.
-        // marking it for slaughter didn't seem to have negative effects, but you never know...
-        if(!isContainedInItem(unit) && !hasValidMapPos(unit))
-            continue;
-
-        if(isMarkedForSlaughter(unit))
-            w->PushUnit(unit);
-    }
-    return w;
-}
-
-void butcherRace(int race)
-{
-    for(size_t i=0; i<world->units.all.size(); i++)
-    {
-        df::unit * unit = world->units.all[i];
-
-        if(unit->race != race)
-            continue;
-
-        if(    !isActive(unit)
-            || isUndead(unit)
-            || isMerchant(unit) // ignore merchants' draught animals
-            || isForest(unit) // ignore merchants' caged animals
-            || !isOwnCiv(unit)
-            || !isTame(unit)
-            || isWar(unit) // ignore war dogs etc
-            || isHunter(unit) // ignore hunting dogs etc
-            // ignore creatures in built cages which are defined as rooms to leave zoos alone
-            // (TODO: better solution would be to allow some kind of slaughter cages which you can place near the butcher)
-            || (isContainedInItem(unit) && isInBuiltCageRoom(unit))  // !!! see comments in isBuiltCageRoom()
-            || isAvailableForAdoption(unit)
-            || unit->name.has_name
-            )
-            continue;
-
-        // found a bugged unit which had invalid coordinates but was not in a cage.
-        // marking it for slaughter didn't seem to have negative effects, but you never know...
-        if(!isContainedInItem(unit) && !hasValidMapPos(unit))
-            continue;
-
-        doMarkForSlaughter(unit);
-    }
-}
-
-// remove butcher flag for all units of a given race
-void unbutcherRace(int race)
-{
-    for(size_t i=0; i<world->units.all.size(); i++)
-    {
-        df::unit * unit = world->units.all[i];
-
-        if(unit->race != race)
-            continue;
-
-        if(    !isActive(unit)
-            || isUndead(unit)
-            || !isMarkedForSlaughter(unit)
-            )
-            continue;
-
-        if(!isContainedInItem(unit) && !hasValidMapPos(unit))
-            continue;
-
-        unit->flags2.bits.slaughter = 0;
-    }
-}
-
-
-/////////////////////////////////////
-// API functions to control autobutcher with a lua script
-
-static bool autobutcher_isEnabled() { return enable_autobutcher; }
-static bool autowatch_isEnabled() { return enable_autobutcher_autowatch; }
-
-static unsigned autobutcher_getSleep(color_ostream &out)
-{
-    return sleep_autobutcher;
-}
-
-static void autobutcher_setSleep(color_ostream &out, unsigned ticks)
-{
-    sleep_autobutcher = ticks;
-    if(config_autobutcher.isValid())
-        config_autobutcher.ival(1) = sleep_autobutcher;
-}
-
-static void autobutcher_setEnabled(color_ostream &out, bool enable)
-{
-    if(enable)
-    {
-        enable_autobutcher = true;
-        start_autobutcher(out);
-        autoButcher(out, false);
-    }
-    else
-    {
-        enable_autobutcher = false;
-        if(config_autobutcher.isValid())
-            config_autobutcher.ival(0) = enable_autobutcher;
-        out << "Autobutcher stopped." << endl;
-    }
-
-    if (enable)
-        plugin_enable(out, true);
-}
-
-static void autowatch_setEnabled(color_ostream &out, bool enable)
-{
-    if(enable)
-    {
-        out << "Auto-adding to watchlist started." << endl;
-        enable_autobutcher_autowatch = true;
-        if(config_autobutcher.isValid())
-            config_autobutcher.ival(2) = enable_autobutcher_autowatch;
-    }
-    else
-    {
-        out << "Auto-adding to watchlist stopped." << endl;
-        enable_autobutcher_autowatch = false;
-        if(config_autobutcher.isValid())
-            config_autobutcher.ival(2) = enable_autobutcher_autowatch;
-    }
-}
-
-// set all data for a watchlist race in one go
-// if race is not already on watchlist it will be added
-// params: (id, fk, mk, fa, ma, watched)
-static void autobutcher_setWatchListRace(color_ostream &out, unsigned id, unsigned fk, unsigned mk, unsigned fa, unsigned ma, bool watched)
-{
-    int watched_index = getWatchedIndex(id);
-    if(watched_index != -1)
-    {
-        out << "updating watchlist entry" << endl;
-        WatchedRace * w = watched_races[watched_index];
-        w->fk = fk;
-        w->mk = mk;
-        w->fa = fa;
-        w->ma = ma;
-        w->isWatched = watched;
-        w->UpdateConfig(out);
-    }
-    else
-    {
-        out << "creating new watchlist entry" << endl;
-        WatchedRace * w = new WatchedRace(watched, id, fk, mk, fa, ma); //default_fk, default_mk, default_fa, default_ma);
-        w->UpdateConfig(out);
-        watched_races.push_back(w);
-
-        string announce;
-        announce = "New race added to autobutcher watchlist: " + getRaceNamePluralById(w->raceId);
-        Gui::showAnnouncement(announce, 2, false);
-        autobutcher_sortWatchList(out);
-    }
-}
-
-// remove entry from watchlist
-static void autobutcher_removeFromWatchList(color_ostream &out, unsigned id)
-{
-    int watched_index = getWatchedIndex(id);
-    if(watched_index != -1)
-    {
-        out << "updating watchlist entry" << endl;
-        WatchedRace * w = watched_races[watched_index];
-        w->RemoveConfig(out);
-        watched_races.erase(watched_races.begin() + watched_index);
-    }
-}
-
-// sort watchlist alphabetically
-static void autobutcher_sortWatchList(color_ostream &out)
-{
-    sort(watched_races.begin(), watched_races.end(), compareRaceNames);
-}
-
-// set default target values for new races
-static void autobutcher_setDefaultTargetNew(color_ostream &out, unsigned fk, unsigned mk, unsigned fa, unsigned ma)
-{
-    default_fk = fk;
-    default_mk = mk;
-    default_fa = fa;
-    default_ma = ma;
-    if(config_autobutcher.isValid())
-    {
-        config_autobutcher.ival(3) = default_fk;
-        config_autobutcher.ival(4) = default_mk;
-        config_autobutcher.ival(5) = default_fa;
-        config_autobutcher.ival(6) = default_ma;
-    }
-}
-
-// set default target values for ALL races (update watchlist and set new default)
-static void autobutcher_setDefaultTargetAll(color_ostream &out, unsigned fk, unsigned mk, unsigned fa, unsigned ma)
-{
-    for(unsigned i=0; i<watched_races.size(); i++)
-    {
-        WatchedRace * w = watched_races[i];
-        w->fk = fk;
-        w->mk = mk;
-        w->fa = fa;
-        w->ma = ma;
-        w->UpdateConfig(out);
-    }
-    autobutcher_setDefaultTargetNew(out, fk, mk, fa, ma);
-}
-
-static void autobutcher_butcherRace(color_ostream &out, unsigned id)
-{
-    butcherRace(id);
-}
-
-static void autobutcher_unbutcherRace(color_ostream &out, unsigned id)
-{
-    unbutcherRace(id);
-}
-
-// push autobutcher settings on lua stack
-static int autobutcher_getSettings(lua_State *L)
-{
-    lua_newtable(L);
-    int ctable = lua_gettop(L);
-    Lua::SetField(L, enable_autobutcher, ctable, "enable_autobutcher");
-    Lua::SetField(L, enable_autobutcher_autowatch, ctable, "enable_autowatch");
-    Lua::SetField(L, default_fk, ctable, "fk");
-    Lua::SetField(L, default_mk, ctable, "mk");
-    Lua::SetField(L, default_fa, ctable, "fa");
-    Lua::SetField(L, default_ma, ctable, "ma");
-    Lua::SetField(L, sleep_autobutcher, ctable, "sleep");
-    return 1;
-}
-
-// push the watchlist vector as nested table on the lua stack
-static int autobutcher_getWatchList(lua_State *L)
-{
-    lua_newtable(L);
-
-    for(size_t i=0; i<watched_races.size(); i++)
-    {
-        lua_newtable(L);
-        int ctable = lua_gettop(L);
-        WatchedRace * w = watched_races[i];
-        Lua::SetField(L, w->raceId, ctable, "id");
-        Lua::SetField(L, w->isWatched, ctable, "watched");
-        Lua::SetField(L, getRaceNamePluralById(w->raceId), ctable, "name");
-        Lua::SetField(L, w->fk, ctable, "fk");
-        Lua::SetField(L, w->mk, ctable, "mk");
-        Lua::SetField(L, w->fa, ctable, "fa");
-        Lua::SetField(L, w->ma, ctable, "ma");
-
-        int id = w->raceId;
-
-        w = checkRaceStocksTotal(id);
-        Lua::SetField(L, w->unit_ptr[fk_index].size(), ctable, "fk_total");
-        Lua::SetField(L, w->unit_ptr[mk_index].size(), ctable, "mk_total");
-        Lua::SetField(L, w->unit_ptr[fa_index].size(), ctable, "fa_total");
-        Lua::SetField(L, w->unit_ptr[ma_index].size(), ctable, "ma_total");
-        delete w;
-
-        w = checkRaceStocksProtected(id);
-        Lua::SetField(L, w->unit_ptr[fk_index].size(), ctable, "fk_protected");
-        Lua::SetField(L, w->unit_ptr[mk_index].size(), ctable, "mk_protected");
-        Lua::SetField(L, w->unit_ptr[fa_index].size(), ctable, "fa_protected");
-        Lua::SetField(L, w->unit_ptr[ma_index].size(), ctable, "ma_protected");
-        delete w;
-
-        w = checkRaceStocksButcherable(id);
-        Lua::SetField(L, w->unit_ptr[fk_index].size(), ctable, "fk_butcherable");
-        Lua::SetField(L, w->unit_ptr[mk_index].size(), ctable, "mk_butcherable");
-        Lua::SetField(L, w->unit_ptr[fa_index].size(), ctable, "fa_butcherable");
-        Lua::SetField(L, w->unit_ptr[ma_index].size(), ctable, "ma_butcherable");
-        delete w;
-
-        w = checkRaceStocksButcherFlag(id);
-        Lua::SetField(L, w->unit_ptr[fk_index].size(), ctable, "fk_butcherflag");
-        Lua::SetField(L, w->unit_ptr[mk_index].size(), ctable, "mk_butcherflag");
-        Lua::SetField(L, w->unit_ptr[fa_index].size(), ctable, "fa_butcherflag");
-        Lua::SetField(L, w->unit_ptr[ma_index].size(), ctable, "ma_butcherflag");
-        delete w;
-
-        lua_rawseti(L, -2, i+1);
-    }
-
-    return 1;
-}
-
-DFHACK_PLUGIN_LUA_FUNCTIONS {
-    DFHACK_LUA_FUNCTION(autobutcher_isEnabled),
-    DFHACK_LUA_FUNCTION(autowatch_isEnabled),
-    DFHACK_LUA_FUNCTION(autobutcher_setEnabled),
-    DFHACK_LUA_FUNCTION(autowatch_setEnabled),
-    DFHACK_LUA_FUNCTION(autobutcher_getSleep),
-    DFHACK_LUA_FUNCTION(autobutcher_setSleep),
-    DFHACK_LUA_FUNCTION(autobutcher_setWatchListRace),
-    DFHACK_LUA_FUNCTION(autobutcher_setDefaultTargetNew),
-    DFHACK_LUA_FUNCTION(autobutcher_setDefaultTargetAll),
-    DFHACK_LUA_FUNCTION(autobutcher_butcherRace),
-    DFHACK_LUA_FUNCTION(autobutcher_unbutcherRace),
-    DFHACK_LUA_FUNCTION(autobutcher_removeFromWatchList),
-    DFHACK_LUA_FUNCTION(autobutcher_sortWatchList),
-    DFHACK_LUA_END
-};
-
-DFHACK_PLUGIN_LUA_COMMANDS {
-    DFHACK_LUA_COMMAND(autobutcher_getSettings),
-    DFHACK_LUA_COMMAND(autobutcher_getWatchList),
-    DFHACK_LUA_END
-};
-
-// end lua API
-
-
-
-//START zone filters
-
-class zone_filter
-{
-public:
-    zone_filter()
-    {
-        initialized = false;
-    }
-
-    void initialize(const df::ui_sidebar_mode &mode)
-    {
-        if (!initialized)
-        {
-            this->mode = mode;
-            saved_ui_building_assign_type.clear();
-            saved_ui_building_assign_units.clear();
-            saved_ui_building_assign_items.clear();
-            saved_ui_building_assign_is_marked.clear();
-            saved_indexes.clear();
-
-            for (size_t i = 0; i < ui_building_assign_units->size(); i++)
-            {
-                saved_ui_building_assign_type.push_back(ui_building_assign_type->at(i));
-                saved_ui_building_assign_units.push_back(ui_building_assign_units->at(i));
-                saved_ui_building_assign_items.push_back(ui_building_assign_items->at(i));
-                saved_ui_building_assign_is_marked.push_back(ui_building_assign_is_marked->at(i));
-            }
-
-            search_string.clear();
-            show_non_grazers = show_pastured = show_noncaged = show_male = show_female = show_other_zones = true;
-            entry_mode = false;
-
-            initialized = true;
-        }
-    }
-
-    void deinitialize()
-    {
-        initialized = false;
-    }
-
-    void apply_filters()
-    {
-        if (saved_indexes.size() > 0)
-        {
-            bool list_has_been_sorted = (ui_building_assign_units->size() == reference_list.size()
-                && *ui_building_assign_units != reference_list);
-
-            for (size_t i = 0; i < saved_indexes.size(); i++)
-            {
-                int adjusted_item_index = i;
-                if (list_has_been_sorted)
-                {
-                    for (size_t j = 0; j < ui_building_assign_units->size(); j++)
-                    {
-                        if (ui_building_assign_units->at(j) == reference_list[i])
-                        {
-                            adjusted_item_index = j;
-                            break;
-                        }
-                    }
-                }
-
-                saved_ui_building_assign_is_marked[saved_indexes[i]] = ui_building_assign_is_marked->at(adjusted_item_index);
-            }
+                saved_ui_building_assign_is_marked[saved_indexes[i]] = ui_building_assign_is_marked->at(adjusted_item_index);
+            }
         }
 
         string search_string_l = toLower(search_string);
@@ -3578,7 +1979,7 @@ public:
             if (!curr_unit)
                 continue;
 
-            if (!show_non_grazers && !isGrazer(curr_unit))
+            if (!show_non_grazers && !Units::isGrazer(curr_unit))
                 continue;
 
             if (!show_pastured && isAssignedToZone(curr_unit))
@@ -3594,10 +1995,10 @@ public:
                     continue;
             }
 
-            if (!show_male && isMale(curr_unit))
+            if (!show_male && Units::isMale(curr_unit))
                 continue;
 
-            if (!show_female && isFemale(curr_unit))
+            if (!show_female && Units::isFemale(curr_unit))
                 continue;
 
             if (!search_string_l.empty())
@@ -3894,21 +2295,15 @@ DFhackCExport command_result plugin_enable ( color_ostream &out, bool enable)
 DFhackCExport command_result plugin_init ( color_ostream &out, std::vector <PluginCommand> &commands)
 {
     commands.push_back(PluginCommand(
-        "zone", "manage activity zones.",
-        df_zone, false,
-        zone_help.c_str()
-        ));
-    commands.push_back(PluginCommand(
-        "autobutcher", "auto-assign lifestock for butchering.",
-        df_autobutcher, false,
-        autobutcher_help.c_str()
-        ));
-    init_autobutcher(out);
+        "zone",
+        "manage activity zones.",
+        df_zone,
+        false,
+        zone_help.c_str()));
     return CR_OK;
 }
 
 DFhackCExport command_result plugin_shutdown ( color_ostream &out )
 {
-    cleanup_autobutcher(out);
     return CR_OK;
 }

From fe2212db96244c056e00a374bba5269aad3e49fc Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Tue, 2 Aug 2022 01:07:36 -0700
Subject: [PATCH 420/854] output status when run without params

---
 plugins/autonestbox.cpp | 32 +++++++++++++++++++-------------
 1 file changed, 19 insertions(+), 13 deletions(-)

diff --git a/plugins/autonestbox.cpp b/plugins/autonestbox.cpp
index 6c878806c..b1932b269 100644
--- a/plugins/autonestbox.cpp
+++ b/plugins/autonestbox.cpp
@@ -41,12 +41,14 @@ static const string autonestbox_help =
     "Usage:\n"
     "\n"
     "enable autonestbox\n"
-    "   Start checking for unpastured egg-layers and assigning them to nestbox zones.\n"
+    "    Start checking for unpastured egg-layers and assigning them to nestbox zones.\n"
+    "autonestbox\n"
+    "    Print current status."
     "autonestbox now\n"
-    "   Run a scan and assignment cycle right now. Does not require that the plugin is enabled.\n"
+    "    Run a scan and assignment cycle right now. Does not require that the plugin is enabled.\n"
     "autonestbox ticks <ticks>\n"
-    "   Change the number of ticks between scan and assignment cycles when the plugin is enabled.\n"
-    "   The default is 6000 (about 8 days)\n";
+    "    Change the number of ticks between scan and assignment cycles when the plugin is enabled.\n"
+    "    The default is 6000 (about 8 days)\n";
 
 namespace DFHack {
     DBG_DECLARE(autonestbox, status);
@@ -56,8 +58,8 @@ namespace DFHack {
 static const string CONFIG_KEY = "autonestbox/config";
 static PersistentDataItem config;
 enum ConfigValues {
-    IS_ENABLED = 0,
-    CYCLE_TICKS = 1,
+    CONFIG_IS_ENABLED = 0,
+    CONFIG_CYCLE_TICKS = 1,
 };
 static int get_config_val(int index) {
     if (!config.isValid())
@@ -103,15 +105,15 @@ static void init_autonestbox(color_ostream &out) {
     if (!config.isValid())
         config = World::AddPersistentData(CONFIG_KEY);
 
-    if (get_config_val(IS_ENABLED) == -1) {
-        set_config_val(IS_ENABLED, 0);
-        set_config_val(CYCLE_TICKS, 6000);
+    if (get_config_val(CONFIG_IS_ENABLED) == -1) {
+        set_config_val(CONFIG_IS_ENABLED, 0);
+        set_config_val(CONFIG_CYCLE_TICKS, 6000);
     }
 
     if (is_enabled)
-        set_config_val(IS_ENABLED, 1);
+        set_config_val(CONFIG_IS_ENABLED, 1);
     else
-        is_enabled = (get_config_val(IS_ENABLED) == 1);
+        is_enabled = (get_config_val(CONFIG_IS_ENABLED) == 1);
     did_complain = false;
 }
 
@@ -167,7 +169,8 @@ DFhackCExport command_result plugin_onstatechange(color_ostream &out, state_chan
 }
 
 DFhackCExport command_result plugin_onupdate(color_ostream &out) {
-    if (is_enabled && ++cycle_counter >= (size_t)get_config_val(CYCLE_TICKS))
+    if (is_enabled && ++cycle_counter >=
+            (size_t)get_config_val(CONFIG_CYCLE_TICKS))
         autonestbox_cycle(out);
     return CR_OK;
 }
@@ -209,12 +212,15 @@ static command_result df_autonestbox(color_ostream &out, vector<string> &paramet
         return CR_WRONG_USAGE;
 
     if (opts.ticks > -1) {
-        set_config_val(CYCLE_TICKS, opts.ticks);
+        set_config_val(CONFIG_CYCLE_TICKS, opts.ticks);
         INFO(status,out).print("New cycle timer: %d ticks.\n", opts.ticks);
     }
     else if (opts.now) {
         autonestbox_cycle(out);
     }
+    else {
+        out << "autonestbox is " << (is_enabled ? "" : "not ") << "running\n";
+    }
     return CR_OK;
 }
 

From 3983b4d75b41c31510c42ae833825514b730232a Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Tue, 2 Aug 2022 01:54:21 -0700
Subject: [PATCH 421/854] update docs

---
 plugins/autobutcher.cpp     | 121 +++++++++++++++++++++---------------
 plugins/autonestbox.cpp     |   1 -
 plugins/lua/autobutcher.lua |   9 ---
 3 files changed, 72 insertions(+), 59 deletions(-)

diff --git a/plugins/autobutcher.cpp b/plugins/autobutcher.cpp
index 0d7a9c632..69799207a 100644
--- a/plugins/autobutcher.cpp
+++ b/plugins/autobutcher.cpp
@@ -34,63 +34,86 @@ DFHACK_PLUGIN_IS_ENABLED(is_enabled);
 REQUIRE_GLOBAL(world);
 
 const string autobutcher_help =
-    "Assigns your lifestock for slaughter once it reaches a specific count. Requires\n"
+    "Automatically butcher excess livestock. This plugin monitors how many pets\n"
+    "you have of each gender and age and assigns excess lifestock for slaughter\n"
+    "once they reach a specific count. Requires\n"
     "that you add the target race(s) to a watch list. Only tame units will be\n"
     "processed. Named units will be completely ignored (you can give animals\n"
     "nicknames with the tool 'rename unit' to protect them from getting slaughtered\n"
-    "automatically. Trained war or hunting pets will be ignored.\n"
-    "Once you have too much adults, the oldest will be butchered first.\n"
-    "Once you have too much kids, the youngest will be butchered first.\n"
+    "automatically). Trained war or hunting pets will be ignored.\n"
+    "Once you have too many adults, the oldest will be butchered first.\n"
+    "Once you have too many kids, the youngest will be butchered first.\n"
     "If you don't set a target count the following default will be used:\n"
     "1 male kid, 5 female kids, 1 male adult, 5 female adults.\n"
-    "Options:\n"
-    "  start        - run every X frames (df simulation ticks)\n"
-    "                 default: X=6000  (~60 seconds at 100fps)\n"
-    "  stop         - stop running automatically\n"
-    "  sleep X      - change timer to sleep X frames between runs.\n"
-    "  watch R      - start watching race(s)\n"
-    "                 R = valid race RAW id (ALPACA, BIRD_TURKEY, etc)\n"
-    "                 or a list of RAW ids seperated by spaces\n"
-    "                 or the keyword 'all' which affects your whole current watchlist.\n"
-    "  unwatch R    - stop watching race(s)\n"
-    "                 the current target settings will be remembered\n"
-    "  forget R     - unwatch race(s) and forget target settings for it/them\n"
-    "  autowatch    - automatically adds all new races (animals you buy\n"
-    "                 from merchants, tame yourself or get from migrants)\n"
-    "                 to the watch list using default target count\n"
-    "  noautowatch  - stop auto-adding new races to the watch list\n"
-    "  list         - print status and watchlist\n"
-    "  list_export  - print status and watchlist in batchfile format\n"
-    "                 can be used to copy settings into another savegame\n"
-    "                 usage: 'dfhack-run autobutcher list_export > xyz.bat' \n"
-    "  target fk mk fa ma R\n"
-    "               - set target count for specified race:\n"
-    "                 fk = number of female kids\n"
-    "                 mk = number of male kids\n"
-    "                 fa = number of female adults\n"
-    "                 ma = number of female adults\n"
-    "                 R = 'all' sets count for all races on the current watchlist\n"
-    "                 including the races which are currenly set to 'unwatched'\n"
-    "                 and sets the new default for future watch commands\n"
-    "                 R = 'new' sets the new default for future watch commands\n"
-    "                 without changing your current watchlist\n"
-    "  example      - print some usage examples\n";
-
-const string autobutcher_help_example =
+    "\n"
+    "Usage:\n"
+    "\n"
+    "enable autobutcher\n"
+    "    Start processing livestock according to the configuration. Note that\n"
+    "    no races are watched by default. You have to add the ones you want to\n"
+    "    monitor (or use autowatch)\n"
+    "autobutcher autowatch\n"
+    "    Automatically add all new races (animals you buy\n"
+    "    from merchants, tame yourself, or get from migrants)\n"
+    "    to the watch list using the default target counts.\n"
+    "autobutcher noautowatch\n"
+    "    Stop auto-adding new races to the watch list.\n"
+    "autobutcher target <fk> <mk> <fa> <ma> all|new|<race> [<race> ...] \n"
+    "    Set target counts for the specified races:\n"
+    "        fk = number of female kids\n"
+    "        mk = number of male kids\n"
+    "        fa = number of female adults\n"
+    "        ma = number of female adults\n"
+    "    If you specify 'all', then this command will set the counts for all races\n"
+    "    on your current watchlist (including the races which are currenly set to\n"
+    "    'unwatched') and sets the new default for future watch commands. If you\n"
+    "    specify 'new', then this command just sets the new default counts for\n"
+    "    future watch commands without changing your current watchlist. Otherwise,\n"
+    "    all space separated races listed will be modified (or added to the watchlist\n"
+    "    if they aren't there already).\n"
+    "autobutcher ticks <ticks>\n"
+    "    Change the number of ticks between scanning cycles when the plugin is\n"
+    "    enabled. By default, a cycle happens every 6000 ticks (about 8 game days).\n"
+    "autobutcher watch all|<race> [<race> ...]\n"
+    "    Start watching the listed races. If they aren't already in your watchlist, then\n"
+    "    they will be added with the default target counts. If you specify the keyword 'all',\n"
+    "    then all races in your watchlist that are currently marked as unwatched will become\n"
+    "    watched.\n"
+    "autobutcher unwatch all|<race> [<race> ...]\n"
+    "    Stop watching the specified race(s) (or all races on your watchlist if 'all' is\n"
+    "    given). The current target settings will be remembered.\n"
+    "autobutcher forget all|<race> [<race> ...]\n"
+    "    Unwatch the specified race(s) (or all races on your watchlist if 'all' is given)\n"
+    "    and forget target settings for it/them.\n"
+    "autobutcher [list]\n"
+    "    Print status and current settings, including the watchlist.\n"
+    "autobutcher list_export\n"
+    "    Print commands required to set the current settings in another fort.\n"
+    "    Useful to run form dfhack-run like: 'dfhack-run autobutcher list_export > autobutcher.script'\n"
+    "\n"
+    "To see a list of all races, run this command:\n"
+    "\n"
+    "    devel/query --table df.global.world.raws.creatures.all --search ^creature_id --maxdepth 1'\n"
+    "\n"
+    "Though not all the races listed there are tameable/butcherable\n"
+    "\n"
     "Examples:\n"
-    "  autobutcher target 4 3 2 1 ALPACA BIRD_TURKEY\n"
-    "  autobutcher watch ALPACA BIRD_TURKEY\n"
-    "  autobutcher start\n"
-    "    This means you want to have max 7 kids (4 female, 3 male) and max 3 adults\n"
-    "    (2 female, 1 male) of the races alpaca and turkey. Once the kids grow up the\n"
+    "\n"
+    "autobutcher target 4 3 2 1 BIRD_TURKEY\n"
+    "    This means you want to have at most 7 kids (4 female, 3 male) and at most 3 adults\n"
+    "    (2 female, 1 male) for turkeys. Once the kids grow up, the\n"
     "    oldest adults will get slaughtered. Excess kids will get slaughtered starting\n"
     "    the the youngest to allow that the older ones grow into adults.\n"
-    "  autobutcher target 0 0 0 0 new\n"
-    "  autobutcher autowatch\n"
-    "  autobutcher start\n"
-    "    This tells autobutcher to automatically put all new races onto the watchlist\n"
-    "    and mark unnamed tame units for slaughter as soon as they arrive in your\n"
-    "    fortress. Settings already made for some races will be left untouched.\n";
+    "autobutcher target 2 2 2 2 DOG\n"
+    "autobutcher target 1 1 2 2 CAT\n"
+    "autobutcher target 50 50 14 2 BIRD_GOOSE\n"
+    "autobutcher target 2 2 4 2 ALPACA SHEEP LLAMA\n"
+    "autobutcher target 5 5 6 2 PIG\n"
+    "autobutcher target 0 0 0 0 new\n"
+    "autobutcher autowatch\n"
+    "    Configure useful limits for dogs, cats, geese (for eggs, leather, and bones), alpacas, sheep,\n"
+    "    and llamas (for wool), and pigs (for milk and meat). All other unnamed tame units will be marked\n"
+    "    for slaughter as soon as they arrive in your fortress.\n";
 
 namespace DFHack {
     DBG_DECLARE(autobutcher, status);
diff --git a/plugins/autonestbox.cpp b/plugins/autonestbox.cpp
index b1932b269..f61f9d635 100644
--- a/plugins/autonestbox.cpp
+++ b/plugins/autonestbox.cpp
@@ -37,7 +37,6 @@ static const string autonestbox_help =
     "If the pen is bigger than 1x1 the nestbox must be in the top left corner.\n"
     "Only 1 unit will be assigned per pen, regardless of the size.\n"
     "The age of the units is currently not checked, most birds grow up quite fast.\n"
-    "When called without options autonestbox will instantly run once.\n"
     "Usage:\n"
     "\n"
     "enable autonestbox\n"
diff --git a/plugins/lua/autobutcher.lua b/plugins/lua/autobutcher.lua
index ab334896c..f357f8fb1 100644
--- a/plugins/lua/autobutcher.lua
+++ b/plugins/lua/autobutcher.lua
@@ -1,14 +1,5 @@
 local _ENV = mkmodule('plugins.autobutcher')
 
---[[
-
- Native functions:
-
- * autobutcher_isEnabled()
- * autowatch_isEnabled()
-
---]]
-
 local argparse = require('argparse')
 
 local function is_int(val)

From db81538f63c3a4a6c334d084dccd311077e50885 Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Tue, 2 Aug 2022 02:00:15 -0700
Subject: [PATCH 422/854] update changelog

---
 docs/changelog.txt | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docs/changelog.txt b/docs/changelog.txt
index ce61d31d3..efaab734d 100644
--- a/docs/changelog.txt
+++ b/docs/changelog.txt
@@ -34,6 +34,8 @@ changelog.txt uses a syntax similar to RST, with a few special sequences:
 # Future
 
 ## New Plugins
+- `autonestbox`: split off from `zone` into its own plugin. Note that to enable, the command has changed from ``autonestbox start`` to `enable autonestbox`.
+- `autobutcher`: split off from `zone` into its own plugin. Note that to enable, the command has changed from ``autobutcher start`` to `enable autobutcher`.
 
 ## New Tweaks
 

From 4acb59cb64666f0ce3c57c56b3f3de667a433a15 Mon Sep 17 00:00:00 2001
From: "pre-commit-ci[bot]"
 <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Date: Tue, 2 Aug 2022 09:01:43 +0000
Subject: [PATCH 423/854] [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci
---
 plugins/autonestbox.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/autonestbox.cpp b/plugins/autonestbox.cpp
index f61f9d635..10c0e3cd8 100644
--- a/plugins/autonestbox.cpp
+++ b/plugins/autonestbox.cpp
@@ -100,7 +100,7 @@ static void autonestbox_cycle(color_ostream &out);
 
 static void init_autonestbox(color_ostream &out) {
     config = World::GetPersistentData(CONFIG_KEY);
-    
+
     if (!config.isValid())
         config = World::AddPersistentData(CONFIG_KEY);
 

From 9595e2152da4e9502b9926894b7af9540041d13e Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Tue, 2 Aug 2022 02:02:23 -0700
Subject: [PATCH 424/854] update changelog (fix typo)

---
 docs/changelog.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/changelog.txt b/docs/changelog.txt
index efaab734d..2733cd539 100644
--- a/docs/changelog.txt
+++ b/docs/changelog.txt
@@ -34,8 +34,8 @@ changelog.txt uses a syntax similar to RST, with a few special sequences:
 # Future
 
 ## New Plugins
-- `autonestbox`: split off from `zone` into its own plugin. Note that to enable, the command has changed from ``autonestbox start`` to `enable autonestbox`.
-- `autobutcher`: split off from `zone` into its own plugin. Note that to enable, the command has changed from ``autobutcher start`` to `enable autobutcher`.
+- `autonestbox`: split off from `zone` into its own plugin. Note that to enable, the command has changed from ``autonestbox start`` to ``enable autonestbox``.
+- `autobutcher`: split off from `zone` into its own plugin. Note that to enable, the command has changed from ``autobutcher start`` to ``enable autobutcher``.
 
 ## New Tweaks
 

From f98015ae5544b526aab2799796894bd1535f42c4 Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Tue, 2 Aug 2022 10:42:54 -0700
Subject: [PATCH 425/854] ensure we run every N ticks, not frames

add more debug messages
fix watching/unwatching/forgetting races that aren't in the watchlist
---
 data/examples/init/onMapLoad_dreamfort.init | 10 ++-
 plugins/autobutcher.cpp                     | 67 +++++++++++++++------
 plugins/autonestbox.cpp                     | 14 +++--
 3 files changed, 61 insertions(+), 30 deletions(-)

diff --git a/data/examples/init/onMapLoad_dreamfort.init b/data/examples/init/onMapLoad_dreamfort.init
index c75620846..05d32134f 100644
--- a/data/examples/init/onMapLoad_dreamfort.init
+++ b/data/examples/init/onMapLoad_dreamfort.init
@@ -37,17 +37,14 @@ enable automelt
 
 # creates manager orders to produce replacements for worn clothing
 enable tailor
-tailor enable
 
 # auto-assigns nesting birds to nestbox zones and protects fertile eggs from
 # being cooked/eaten
-enable zone nestboxes
-autonestbox start
+enable zone autonestbox nestboxes
 
 # manages seed stocks
 enable seedwatch
 seedwatch all 30
-seedwatch start
 
 # ensures important tasks get assigned to workers.
 # otherwise these job types can get ignored in busy forts.
@@ -65,6 +62,7 @@ prioritize -a --reaction-name=TAN_A_HIDE CustomReaction
 # feel free to change this to "target 0 0 0 0" if you don't expect to want to raise
 # any animals not listed here -- you can always change it anytime during the game
 # later if you change your mind.
+on-new-fortress enable autobutcher
 on-new-fortress autobutcher target 2 2 2 2 new
 # dogs and cats. You should raise the limits for dogs if you will be training them
 # for hunting or war.
@@ -82,5 +80,5 @@ on-new-fortress autobutcher target 2 2 4 2 ALPACA SHEEP LLAMA
 on-new-fortress autobutcher target 5 5 6 2 PIG
 # butcher all unprofitable animals
 on-new-fortress autobutcher target 0 0 0 0 HORSE YAK DONKEY WATER_BUFFALO GOAT CAVY BIRD_DUCK BIRD_GUINEAFOWL
-# start it up!
-on-new-fortress autobutcher start; autobutcher watch all; autobutcher autowatch
+# watch for new animals
+on-new-fortress autobutcher autowatch
diff --git a/plugins/autobutcher.cpp b/plugins/autobutcher.cpp
index 69799207a..0b0d4ffdb 100644
--- a/plugins/autobutcher.cpp
+++ b/plugins/autobutcher.cpp
@@ -150,7 +150,7 @@ static void set_config_bool(int index, bool value) {
 }
 
 static unordered_map<string, int> race_to_id;
-static size_t cycle_counter = 0;  // how many ticks since the last cycle
+static int32_t cycle_timestamp = 0;  // world->frame_counter at last cycle
 
 static size_t DEFAULT_CYCLE_TICKS = 6000;
 
@@ -252,7 +252,7 @@ DFhackCExport command_result plugin_onstatechange(color_ostream &out, state_chan
 }
 
 DFhackCExport command_result plugin_onupdate(color_ostream &out) {
-    if (is_enabled && ++cycle_counter >= (size_t)get_config_val(CONFIG_CYCLE_TICKS))
+    if (is_enabled && world->frame_counter - cycle_timestamp >= get_config_val(CONFIG_CYCLE_TICKS))
         autobutcher_cycle(out);
     return CR_OK;
 }
@@ -663,7 +663,8 @@ static void autobutcher_status(color_ostream &out) {
 
 static void autobutcher_target(color_ostream &out, const autobutcher_options &opts) {
     if (opts.races_new) {
-        DEBUG(status,out).print("setting targets for new races\n");
+        DEBUG(status,out).print("setting targets for new races to fk=%u, mk=%u, fa=%u, ma=%u\n",
+                                opts.fk, opts.mk, opts.fa, opts.ma);
         set_config_val(CONFIG_DEFAULT_FK, opts.fk);
         set_config_val(CONFIG_DEFAULT_MK, opts.mk);
         set_config_val(CONFIG_DEFAULT_FA, opts.fa);
@@ -671,7 +672,8 @@ static void autobutcher_target(color_ostream &out, const autobutcher_options &op
     }
 
     if (opts.races_all) {
-        DEBUG(status,out).print("setting targets for all races on watchlist\n");
+        DEBUG(status,out).print("setting targets for all races on watchlist to fk=%u, mk=%u, fa=%u, ma=%u\n",
+                                opts.fk, opts.mk, opts.fa, opts.ma);
         for (auto w : watched_races) {
             w.second->fk = opts.fk;
             w.second->mk = opts.mk;
@@ -689,7 +691,6 @@ static void autobutcher_target(color_ostream &out, const autobutcher_options &op
         int id = race_to_id[*race];
         WatchedRace *w;
         if (!watched_races.count(id)) {
-            DEBUG(status,out).print("adding new targets for %s\n", race->c_str());
             w = new WatchedRace(out, id, true, opts.fk, opts.mk, opts.fa, opts.ma);
             watched_races.emplace(id, w);
         } else {
@@ -707,8 +708,6 @@ static void autobutcher_modify_watchlist(color_ostream &out, const autobutcher_o
     unordered_set<int> ids;
 
     if (opts.races_all) {
-        DEBUG(status,out).print("modifying all races on watchlist: %s\n",
-                                opts.command.c_str());
         for (auto w : watched_races)
             ids.emplace(w.first);
     }
@@ -722,13 +721,41 @@ static void autobutcher_modify_watchlist(color_ostream &out, const autobutcher_o
     }
 
     for (int id : ids) {
-        if (opts.command == "watch")
-            watched_races[id]->isWatched = true;
-        else if (opts.command == "unwatch")
-            watched_races[id]->isWatched = false;
+        if (opts.command == "watch") {
+            if (!watched_races.count(id)) {
+                watched_races.emplace(id,
+                    new WatchedRace(out, id, true,
+                                    get_config_val(CONFIG_DEFAULT_FK),
+                                    get_config_val(CONFIG_DEFAULT_MK),
+                                    get_config_val(CONFIG_DEFAULT_FA),
+                                    get_config_val(CONFIG_DEFAULT_MA)));
+            }
+            else if (!watched_races[id]->isWatched) {
+                DEBUG(status,out).print("watching: %s\n", opts.command.c_str());
+                watched_races[id]->isWatched = true;
+            }
+        }
+        else if (opts.command == "unwatch") {
+            if (!watched_races.count(id)) {
+                watched_races.emplace(id,
+                    new WatchedRace(out, id, false,
+                                    get_config_val(CONFIG_DEFAULT_FK),
+                                    get_config_val(CONFIG_DEFAULT_MK),
+                                    get_config_val(CONFIG_DEFAULT_FA),
+                                    get_config_val(CONFIG_DEFAULT_MA)));
+            }
+            else if (watched_races[id]->isWatched) {
+                DEBUG(status,out).print("unwatching: %s\n", opts.command.c_str());
+                watched_races[id]->isWatched = false;
+            }
+        }
         else if (opts.command == "forget") {
-            watched_races[id]->RemoveConfig(out);
-            watched_races.erase(id);
+            if (watched_races.count(id)) {
+                DEBUG(status,out).print("forgetting: %s\n", opts.command.c_str());
+                watched_races[id]->RemoveConfig(out);
+                delete watched_races[id];
+                watched_races.erase(id);
+            }
             continue;
         }
         watched_races[id]->UpdateConfig(out);
@@ -776,7 +803,10 @@ static bool isInBuiltCageRoom(df::unit *unit) {
 }
 
 static void autobutcher_cycle(color_ostream &out) {
-    DEBUG(cycle,out).print("running autobutcher_cycle\n");
+    // mark that we have recently run
+    cycle_timestamp = world->frame_counter;
+
+    DEBUG(cycle,out).print("running autobutcher cycle\n");
 
     // check if there is anything to watch before walking through units vector
     if (!get_config_bool(CONFIG_AUTOWATCH)) {
@@ -850,14 +880,13 @@ static void autobutcher_cycle(color_ostream &out) {
         }
     }
 
-    int slaughter_count = 0;
     for (auto w : watched_races) {
-        int slaughter_subcount = w.second->ProcessUnits();
-        slaughter_count += slaughter_subcount;
-        if (slaughter_subcount) {
+        int slaughter_count = w.second->ProcessUnits();
+        if (slaughter_count) {
             stringstream ss;
-            ss << slaughter_subcount;
+            ss << slaughter_count;
             string announce = Units::getRaceNamePluralById(w.first) + " marked for slaughter: " + ss.str();
+            DEBUG(cycle,out).print("%s\n", announce.c_str());
             Gui::showAnnouncement(announce, 2, false);
         }
     }
diff --git a/plugins/autonestbox.cpp b/plugins/autonestbox.cpp
index 10c0e3cd8..668938c2c 100644
--- a/plugins/autonestbox.cpp
+++ b/plugins/autonestbox.cpp
@@ -73,7 +73,7 @@ static bool set_config_val(int index, int value) {
 }
 
 static bool did_complain = false; // avoids message spam
-static size_t cycle_counter = 0;  // how many ticks since the last cycle
+static int32_t cycle_timestamp = 0;  // world->frame_counter at last cycle
 
 struct autonestbox_options {
     // whether to display help
@@ -168,8 +168,7 @@ DFhackCExport command_result plugin_onstatechange(color_ostream &out, state_chan
 }
 
 DFhackCExport command_result plugin_onupdate(color_ostream &out) {
-    if (is_enabled && ++cycle_counter >=
-            (size_t)get_config_val(CONFIG_CYCLE_TICKS))
+    if (is_enabled && world->frame_counter - cycle_timestamp >= get_config_val(CONFIG_CYCLE_TICKS))
         autonestbox_cycle(out);
     return CR_OK;
 }
@@ -342,7 +341,7 @@ static bool assignUnitToZone(color_ostream &out, df::unit *unit, df::building *b
     df::general_ref_building_civzone_assignedst *ref = createCivzoneRef();
     if (!ref) {
         ERR(cycle,out).print("Could not find a clonable activity zone reference!"
-            " You need to pen/pasture/pit at least one creature"
+            " You need to manually pen/pasture/pit at least one creature"
             " before autonestbox can function.\n");
         return false;
     }
@@ -381,6 +380,8 @@ static size_t assign_nestboxes(color_ostream &out) {
                 DEBUG(cycle,out).print("Failed to assign unit to building.\n");
                 return processed;
             }
+            DEBUG(cycle,out).print("assigned unit %d to zone %d\n",
+                                   free_unit->id, free_building->id);
             ++processed;
         }
     } while (free_unit && free_building);
@@ -406,13 +407,16 @@ static size_t assign_nestboxes(color_ostream &out) {
 
 static void autonestbox_cycle(color_ostream &out) {
     // mark that we have recently run
-    cycle_counter = 0;
+    cycle_timestamp = world->frame_counter;
+
+    DEBUG(cycle,out).print("running autonestbox cycle\n");
 
     size_t processed = assign_nestboxes(out);
     if (processed > 0) {
         stringstream ss;
         ss << processed << " nestboxes were assigned.";
         string announce = ss.str();
+        DEBUG(cycle,out).print("%s\n", announce.c_str());
         Gui::showAnnouncement(announce, 2, false);
         out << announce << endl;
         // can complain again

From 1dec977476c606ed048289f1d7e8f851d6a16795 Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Tue, 2 Aug 2022 11:07:36 -0700
Subject: [PATCH 426/854] clean up and add logging to state persistence

---
 plugins/autonestbox.cpp | 43 +++++++++++++++++++++++------------------
 1 file changed, 24 insertions(+), 19 deletions(-)

diff --git a/plugins/autonestbox.cpp b/plugins/autonestbox.cpp
index 668938c2c..ea8d7a50d 100644
--- a/plugins/autonestbox.cpp
+++ b/plugins/autonestbox.cpp
@@ -65,11 +65,15 @@ static int get_config_val(int index) {
         return -1;
     return config.ival(index);
 }
-static bool set_config_val(int index, int value) {
-    if (!config.isValid())
-        return false;
-    config.ival(index) = value;
-    return true;
+static bool get_config_bool(int index) {
+    return get_config_val(index) == 1;
+}
+static void set_config_val(int index, int value) {
+    if (config.isValid())
+        config.ival(index) = value;
+}
+static void set_config_bool(int index, bool value) {
+    set_config_val(index, value ? 1 : 0);
 }
 
 static bool did_complain = false; // avoids message spam
@@ -101,23 +105,24 @@ static void autonestbox_cycle(color_ostream &out);
 static void init_autonestbox(color_ostream &out) {
     config = World::GetPersistentData(CONFIG_KEY);
 
-    if (!config.isValid())
+    if (!config.isValid()) {
+        DEBUG(status,out).print("no config found in this save; initializing\n");
         config = World::AddPersistentData(CONFIG_KEY);
-
-    if (get_config_val(CONFIG_IS_ENABLED) == -1) {
-        set_config_val(CONFIG_IS_ENABLED, 0);
+        set_config_bool(CONFIG_IS_ENABLED, false);
         set_config_val(CONFIG_CYCLE_TICKS, 6000);
     }
 
-    if (is_enabled)
-        set_config_val(CONFIG_IS_ENABLED, 1);
-    else
-        is_enabled = (get_config_val(CONFIG_IS_ENABLED) == 1);
+    is_enabled = get_config_bool(CONFIG_IS_ENABLED);
+    DEBUG(status,out).print("loading persisted enabled state: %s\n",
+                            is_enabled ? "true" : "false");
     did_complain = false;
 }
 
 static void cleanup_autonestbox(color_ostream &out) {
-    is_enabled = false;
+    if (is_enabled) {
+        DEBUG(status,out).print("disabling (not persisting)\n");
+        is_enabled = false;
+    }
 }
 
 DFhackCExport command_result plugin_init(color_ostream &out, std::vector <PluginCommand> &commands) {
@@ -140,10 +145,10 @@ DFhackCExport command_result plugin_enable(color_ostream &out, bool enable) {
 
     if (enable != is_enabled) {
         is_enabled = enable;
-        if (is_enabled)
-            init_autonestbox(out);
-        else
-            cleanup_autonestbox(out);
+        DEBUG(status,out).print("%s from the API, persisting\n",
+                                is_enabled ? "enabled" : "disabled");
+        set_config_bool(CONFIG_IS_ENABLED, is_enabled);
+        init_autonestbox(out);
     }
     return CR_OK;
 }
@@ -217,7 +222,7 @@ static command_result df_autonestbox(color_ostream &out, vector<string> &paramet
         autonestbox_cycle(out);
     }
     else {
-        out << "autonestbox is " << (is_enabled ? "" : "not ") << "running\n";
+        out << "autonestbox is " << (is_enabled ? "" : "not ") << "running" << endl;
     }
     return CR_OK;
 }

From 1695919411635922a2aece78c8134bc91d7db6c3 Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Wed, 3 Aug 2022 22:40:55 -0700
Subject: [PATCH 427/854] apply canonical class 3 plugin structure

---
 plugins/autobutcher.cpp | 301 +++++++++++++++++++++-------------------
 plugins/autonestbox.cpp | 134 +++++++++---------
 2 files changed, 221 insertions(+), 214 deletions(-)

diff --git a/plugins/autobutcher.cpp b/plugins/autobutcher.cpp
index 0b0d4ffdb..ee93d30e5 100644
--- a/plugins/autobutcher.cpp
+++ b/plugins/autobutcher.cpp
@@ -1,16 +1,19 @@
-// - full automation of marking live-stock for slaughtering
-//   races can be added to a watchlist and it can be set how many male/female kids/adults are left alive
-//   adding to the watchlist can be automated as well.
-//   config for autobutcher (state and sleep setting) is saved the first time autobutcher is started
-//   config for watchlist entries is saved when they are created or modified
+// full automation of marking live-stock for slaughtering
+// races can be added to a watchlist and it can be set how many male/female kids/adults are left alive
+// adding to the watchlist can be automated as well.
+// config for autobutcher (state and sleep setting) is saved the first time autobutcher is started
+// config for watchlist entries is saved when they are created or modified
 
+#include <string>
 #include <unordered_map>
 #include <unordered_set>
+#include <vector>
 
 #include "df/building_cagest.h"
 #include "df/creature_raw.h"
 #include "df/world.h"
 
+#include "Core.h"
 #include "Debug.h"
 #include "LuaTools.h"
 #include "PluginManager.h"
@@ -33,6 +36,56 @@ DFHACK_PLUGIN_IS_ENABLED(is_enabled);
 
 REQUIRE_GLOBAL(world);
 
+// logging levels can be dynamically controlled with the `debugfilter` command.
+namespace DFHack {
+    // for configuration-related logging
+    DBG_DECLARE(autobutcher, status, DebugCategory::LINFO);
+    // for logging during the periodic scan
+    DBG_DECLARE(autobutcher, cycle, DebugCategory::LINFO);
+}
+
+static const string CONFIG_KEY = string(plugin_name) + "/config";
+static const string WATCHLIST_CONFIG_KEY_PREFIX = string(plugin_name) + "/watchlist/";
+static PersistentDataItem config;
+
+enum ConfigValues {
+    CONFIG_IS_ENABLED  = 0,
+    CONFIG_CYCLE_TICKS = 1,
+    CONFIG_AUTOWATCH   = 2,
+    CONFIG_DEFAULT_FK  = 3,
+    CONFIG_DEFAULT_MK  = 4,
+    CONFIG_DEFAULT_FA  = 5,
+    CONFIG_DEFAULT_MA  = 6,
+};
+static int get_config_val(int index) {
+    if (!config.isValid())
+        return -1;
+    return config.ival(index);
+}
+static bool get_config_bool(int index) {
+    return get_config_val(index) == 1;
+}
+static void set_config_val(int index, int value) {
+    if (config.isValid())
+        config.ival(index) = value;
+}
+static void set_config_bool(int index, bool value) {
+    set_config_val(index, value ? 1 : 0);
+}
+
+struct WatchedRace;
+// vector of races handled by autobutcher
+// the name is a bit misleading since entries can be set to 'unwatched'
+// to ignore them for a while but still keep the target count settings
+static unordered_map<int, WatchedRace*> watched_races;
+static unordered_map<string, int> race_to_id;
+static int32_t cycle_timestamp = 0;  // world->frame_counter at last cycle
+
+static void init_autobutcher(color_ostream &out);
+static void cleanup_autobutcher(color_ostream &out);
+static command_result df_autobutcher(color_ostream &out, vector<string> &parameters);
+static void autobutcher_cycle(color_ostream &out);
+
 const string autobutcher_help =
     "Automatically butcher excess livestock. This plugin monitors how many pets\n"
     "you have of each gender and age and assigns excess lifestock for slaughter\n"
@@ -115,44 +168,90 @@ const string autobutcher_help =
     "    and llamas (for wool), and pigs (for milk and meat). All other unnamed tame units will be marked\n"
     "    for slaughter as soon as they arrive in your fortress.\n";
 
-namespace DFHack {
-    DBG_DECLARE(autobutcher, status);
-    DBG_DECLARE(autobutcher, cycle);
+DFhackCExport command_result plugin_init(color_ostream &out, std::vector <PluginCommand> &commands) {
+    commands.push_back(PluginCommand(
+        plugin_name,
+        "Automatically butcher excess livestock.",
+        df_autobutcher,
+        false,
+        autobutcher_help.c_str()));
+    return CR_OK;
 }
 
-static const string CONFIG_KEY = "autobutcher/config";
-static const string WATCHLIST_CONFIG_KEY_PREFIX = "autobutcher/watchlist/";
+DFhackCExport command_result plugin_enable(color_ostream &out, bool enable) {
+    if (!Core::getInstance().isWorldLoaded()) {
+        out.printerr("Cannot enable %s without a loaded world.\n", plugin_name);
+        return CR_FAILURE;
+    }
 
-static PersistentDataItem config;
-enum ConfigValues {
-    CONFIG_IS_ENABLED  = 0,
-    CONFIG_CYCLE_TICKS = 1,
-    CONFIG_AUTOWATCH   = 2,
-    CONFIG_DEFAULT_FK  = 3,
-    CONFIG_DEFAULT_MK  = 4,
-    CONFIG_DEFAULT_FA  = 5,
-    CONFIG_DEFAULT_MA  = 6,
-};
-static int get_config_val(int index) {
-    if (!config.isValid())
-        return -1;
-    return config.ival(index);
+    if (enable != is_enabled) {
+        is_enabled = enable;
+        DEBUG(status,out).print("%s from the API; persisting\n",
+                                is_enabled ? "enabled" : "disabled");
+        set_config_bool(CONFIG_IS_ENABLED, is_enabled);
+    } else {
+        DEBUG(status,out).print("%s from the API, but already %s; no action\n",
+                                is_enabled ? "enabled" : "disabled",
+                                is_enabled ? "enabled" : "disabled");
+    }
+    return CR_OK;
 }
-static bool get_config_bool(int index) {
-    return get_config_val(index) == 1;
+
+DFhackCExport command_result plugin_shutdown (color_ostream &out) {
+    DEBUG(status,out).print("shutting down %s\n", plugin_name);
+    cleanup_autobutcher(out);
+    return CR_OK;
 }
-static void set_config_val(int index, int value) {
-    if (config.isValid())
-        config.ival(index) = value;
+
+DFhackCExport command_result plugin_load_data (color_ostream &out) {
+    config = World::GetPersistentData(CONFIG_KEY);
+
+    if (!config.isValid()) {
+        DEBUG(status,out).print("no config found in this save; initializing\n");
+        config = World::AddPersistentData(CONFIG_KEY);
+        set_config_bool(CONFIG_IS_ENABLED, is_enabled);
+        set_config_val(CONFIG_CYCLE_TICKS, 6000);
+        set_config_bool(CONFIG_AUTOWATCH, false);
+        set_config_val(CONFIG_DEFAULT_FK, 5);
+        set_config_val(CONFIG_DEFAULT_MK, 1);
+        set_config_val(CONFIG_DEFAULT_FA, 5);
+        set_config_val(CONFIG_DEFAULT_MA, 1);
+    }
+
+    // we have to copy our enabled flag into the global plugin variable, but
+    // all the other state we can directly read/modify from the persistent
+    // data structure.
+    is_enabled = get_config_bool(CONFIG_IS_ENABLED);
+    DEBUG(status,out).print("loading persisted enabled state: %s\n",
+                            is_enabled ? "true" : "false");
+
+    // load the persisted watchlist
+    init_autobutcher(out);
+
+    return CR_OK;
 }
-static void set_config_bool(int index, bool value) {
-    set_config_val(index, value ? 1 : 0);
+
+DFhackCExport command_result plugin_onstatechange(color_ostream &out, state_change_event event) {
+    if (event == DFHack::SC_WORLD_UNLOADED) {
+        if (is_enabled) {
+            DEBUG(status,out).print("world unloaded; disabling %s\n",
+                                    plugin_name);
+            is_enabled = false;
+        }
+        cleanup_autobutcher(out);
+    }
+    return CR_OK;
 }
 
-static unordered_map<string, int> race_to_id;
-static int32_t cycle_timestamp = 0;  // world->frame_counter at last cycle
+DFhackCExport command_result plugin_onupdate(color_ostream &out) {
+    if (is_enabled && world->frame_counter - cycle_timestamp >= get_config_val(CONFIG_CYCLE_TICKS))
+        autobutcher_cycle(out);
+    return CR_OK;
+}
 
-static size_t DEFAULT_CYCLE_TICKS = 6000;
+/////////////////////////////////////////////////////
+// autobutcher config logic
+//
 
 struct autobutcher_options {
     // whether to display help
@@ -199,68 +298,30 @@ static const struct_field_info autobutcher_options_fields[] = {
 };
 struct_identity autobutcher_options::_identity(sizeof(autobutcher_options), &df::allocator_fn<autobutcher_options>, NULL, "autobutcher_options", NULL, autobutcher_options_fields);
 
-static void init_autobutcher(color_ostream &out);
-static void cleanup_autobutcher(color_ostream &out);
-static command_result df_autobutcher(color_ostream &out, vector<string> &parameters);
-static void autobutcher_cycle(color_ostream &out);
-
-DFhackCExport command_result plugin_init(color_ostream &out, std::vector <PluginCommand> &commands) {
-    commands.push_back(PluginCommand(
-        "autobutcher",
-        "Automatically butcher excess livestock.",
-        df_autobutcher,
-        false,
-        autobutcher_help.c_str()));
-
-    init_autobutcher(out);
-    return CR_OK;
-}
-
-DFhackCExport command_result plugin_enable(color_ostream &out, bool enable) {
-    if (!Maps::IsValid()) {
-        out.printerr("Cannot run autobutcher without a loaded map.\n");
-        return CR_FAILURE;
-    }
+static bool get_options(color_ostream &out,
+                        autobutcher_options &opts,
+                        const vector<string> &parameters)
+{
+    auto L = Lua::Core::State;
+    Lua::StackUnwinder top(L);
 
-    if (enable != is_enabled) {
-        is_enabled = enable;
-        if (is_enabled)
-            init_autobutcher(out);
-        else
-            cleanup_autobutcher(out);
+    if (!lua_checkstack(L, parameters.size() + 2) ||
+        !Lua::PushModulePublic(
+            out, L, "plugins.autobutcher", "parse_commandline")) {
+        out.printerr("Failed to load autobutcher Lua code\n");
+        return false;
     }
-    return CR_OK;
-}
 
-DFhackCExport command_result plugin_shutdown (color_ostream &out) {
-    cleanup_autobutcher(out);
-    return CR_OK;
-}
+    Lua::Push(L, &opts);
+    for (const string &param : parameters)
+        Lua::Push(L, param);
 
-DFhackCExport command_result plugin_onstatechange(color_ostream &out, state_change_event event) {
-    switch (event) {
-    case DFHack::SC_MAP_LOADED:
-        init_autobutcher(out);
-        break;
-    case DFHack::SC_MAP_UNLOADED:
-        cleanup_autobutcher(out);
-        break;
-    default:
-        break;
-    }
-    return CR_OK;
-}
+    if (!Lua::SafeCall(out, L, parameters.size() + 1, 0))
+        return false;
 
-DFhackCExport command_result plugin_onupdate(color_ostream &out) {
-    if (is_enabled && world->frame_counter - cycle_timestamp >= get_config_val(CONFIG_CYCLE_TICKS))
-        autobutcher_cycle(out);
-    return CR_OK;
+    return true;
 }
 
-/////////////////////////////////////////////////////
-// autobutcher config logic
-//
-
 static void doMarkForSlaughter(df::unit *unit) {
     unit->flags2.bits.slaughter = 1;
 }
@@ -460,35 +521,7 @@ public:
     }
 };
 
-// vector of races handled by autobutcher
-// the name is a bit misleading since entries can be set to 'unwatched'
-// to ignore them for a while but still keep the target count settings
-static unordered_map<int, WatchedRace*> watched_races;
-
 static void init_autobutcher(color_ostream &out) {
-    config = World::GetPersistentData(CONFIG_KEY);
-
-    if (!config.isValid())
-        config = World::AddPersistentData(CONFIG_KEY);
-
-    if (get_config_val(CONFIG_IS_ENABLED) == -1) {
-        set_config_bool(CONFIG_IS_ENABLED, false);
-        set_config_val(CONFIG_CYCLE_TICKS, DEFAULT_CYCLE_TICKS);
-        set_config_bool(CONFIG_AUTOWATCH, false);
-        set_config_val(CONFIG_DEFAULT_FK, 5);
-        set_config_val(CONFIG_DEFAULT_MK, 1);
-        set_config_val(CONFIG_DEFAULT_FA, 5);
-        set_config_val(CONFIG_DEFAULT_MA, 1);
-    }
-
-    if (is_enabled)
-        set_config_bool(CONFIG_IS_ENABLED, true);
-    else
-        is_enabled = (get_config_val(CONFIG_IS_ENABLED) == 1);
-
-    if (!config.isValid())
-        return;
-
     if (!race_to_id.size()) {
         const size_t num_races = world->raws.creatures.all.size();
         for(size_t i = 0; i < num_races; ++i)
@@ -505,37 +538,13 @@ static void init_autobutcher(color_ostream &out) {
 }
 
 static void cleanup_autobutcher(color_ostream &out) {
-    is_enabled = false;
+    DEBUG(status,out).print("cleaning %s state\n", plugin_name);
     race_to_id.clear();
     for (auto w : watched_races)
         delete w.second;
     watched_races.clear();
 }
 
-static bool get_options(color_ostream &out,
-                        autobutcher_options &opts,
-                        const vector<string> &parameters)
-{
-    auto L = Lua::Core::State;
-    Lua::StackUnwinder top(L);
-
-    if (!lua_checkstack(L, parameters.size() + 2) ||
-        !Lua::PushModulePublic(
-            out, L, "plugins.autobutcher", "parse_commandline")) {
-        out.printerr("Failed to load autobutcher Lua code\n");
-        return false;
-    }
-
-    Lua::Push(L, &opts);
-    for (const string &param : parameters)
-        Lua::Push(L, param);
-
-    if (!Lua::SafeCall(out, L, parameters.size() + 1, 0))
-        return false;
-
-    return true;
-}
-
 static void autobutcher_export(color_ostream &out);
 static void autobutcher_status(color_ostream &out);
 static void autobutcher_target(color_ostream &out, const autobutcher_options &opts);
@@ -544,8 +553,8 @@ static void autobutcher_modify_watchlist(color_ostream &out, const autobutcher_o
 static command_result df_autobutcher(color_ostream &out, vector<string> &parameters) {
     CoreSuspender suspend;
 
-    if (!Maps::IsValid()) {
-        out.printerr("Cannot run autobutcher without a loaded map.\n");
+    if (!Core::getInstance().isWorldLoaded()) {
+        out.printerr("Cannot run %s without a loaded world.\n", plugin_name);
         return CR_FAILURE;
     }
 
@@ -763,7 +772,7 @@ static void autobutcher_modify_watchlist(color_ostream &out, const autobutcher_o
 }
 
 /////////////////////////////////////////////////////
-// autobutcher cycle logic
+// cycle logic
 //
 
 // check if contained in item (e.g. animals in cages)
@@ -806,7 +815,7 @@ static void autobutcher_cycle(color_ostream &out) {
     // mark that we have recently run
     cycle_timestamp = world->frame_counter;
 
-    DEBUG(cycle,out).print("running autobutcher cycle\n");
+    DEBUG(cycle,out).print("running %s cycle\n", plugin_name);
 
     // check if there is anything to watch before walking through units vector
     if (!get_config_bool(CONFIG_AUTOWATCH)) {
diff --git a/plugins/autonestbox.cpp b/plugins/autonestbox.cpp
index ea8d7a50d..c47f4425f 100644
--- a/plugins/autonestbox.cpp
+++ b/plugins/autonestbox.cpp
@@ -4,6 +4,9 @@
 //   maybe check for minimum age? it's not that useful to fill nestboxes with freshly hatched birds
 //   state and sleep setting is saved the first time autonestbox is started (to avoid writing stuff if the plugin is never used)
 
+#include <string>
+#include <vector>
+
 #include "df/building_cagest.h"
 #include "df/building_civzonest.h"
 #include "df/building_nest_boxst.h"
@@ -16,7 +19,6 @@
 
 #include "modules/Buildings.h"
 #include "modules/Gui.h"
-#include "modules/Maps.h"
 #include "modules/Persistence.h"
 #include "modules/Units.h"
 #include "modules/World.h"
@@ -50,11 +52,13 @@ static const string autonestbox_help =
     "    The default is 6000 (about 8 days)\n";
 
 namespace DFHack {
-    DBG_DECLARE(autonestbox, status);
-    DBG_DECLARE(autonestbox, cycle);
+    // for configuration-related logging
+    DBG_DECLARE(autonestbox, status, DebugCategory::LINFO);
+    // for logging during the periodic scan
+    DBG_DECLARE(autonestbox, cycle, DebugCategory::LINFO);
 }
 
-static const string CONFIG_KEY = "autonestbox/config";
+static const string CONFIG_KEY = string(plugin_name) + "/config";
 static PersistentDataItem config;
 enum ConfigValues {
     CONFIG_IS_ENABLED = 0,
@@ -79,95 +83,65 @@ static void set_config_bool(int index, bool value) {
 static bool did_complain = false; // avoids message spam
 static int32_t cycle_timestamp = 0;  // world->frame_counter at last cycle
 
-struct autonestbox_options {
-    // whether to display help
-    bool help = false;
-
-    // whether to run a cycle right now
-    bool now = false;
-
-    // how many ticks to wait between automatic cycles, -1 means unset
-    int32_t ticks = -1;
-
-    static struct_identity _identity;
-};
-static const struct_field_info autonestbox_options_fields[] = {
-    { struct_field_info::PRIMITIVE, "help",  offsetof(autonestbox_options, help),  &df::identity_traits<bool>::identity,    0, 0 },
-    { struct_field_info::PRIMITIVE, "now",   offsetof(autonestbox_options, now),   &df::identity_traits<bool>::identity,    0, 0 },
-    { struct_field_info::PRIMITIVE, "ticks", offsetof(autonestbox_options, ticks), &df::identity_traits<int32_t>::identity, 0, 0 },
-    { struct_field_info::END }
-};
-struct_identity autonestbox_options::_identity(sizeof(autonestbox_options), &df::allocator_fn<autonestbox_options>, NULL, "autonestbox_options", NULL, autonestbox_options_fields);
-
 static command_result df_autonestbox(color_ostream &out, vector<string> &parameters);
 static void autonestbox_cycle(color_ostream &out);
 
-static void init_autonestbox(color_ostream &out) {
-    config = World::GetPersistentData(CONFIG_KEY);
-
-    if (!config.isValid()) {
-        DEBUG(status,out).print("no config found in this save; initializing\n");
-        config = World::AddPersistentData(CONFIG_KEY);
-        set_config_bool(CONFIG_IS_ENABLED, false);
-        set_config_val(CONFIG_CYCLE_TICKS, 6000);
-    }
-
-    is_enabled = get_config_bool(CONFIG_IS_ENABLED);
-    DEBUG(status,out).print("loading persisted enabled state: %s\n",
-                            is_enabled ? "true" : "false");
-    did_complain = false;
-}
-
-static void cleanup_autonestbox(color_ostream &out) {
-    if (is_enabled) {
-        DEBUG(status,out).print("disabling (not persisting)\n");
-        is_enabled = false;
-    }
-}
-
 DFhackCExport command_result plugin_init(color_ostream &out, std::vector <PluginCommand> &commands) {
     commands.push_back(PluginCommand(
-        "autonestbox",
+        plugin_name,
         "Auto-assign egg-laying female pets to nestbox zones.",
         df_autonestbox,
         false,
         autonestbox_help.c_str()));
-
-    init_autonestbox(out);
     return CR_OK;
 }
 
 DFhackCExport command_result plugin_enable(color_ostream &out, bool enable) {
-    if (!Maps::IsValid()) {
-        out.printerr("Cannot run autonestbox without a loaded map.\n");
+    if (!Core::getInstance().isWorldLoaded()) {
+        out.printerr("Cannot enable %s without a loaded world.\n", plugin_name);
         return CR_FAILURE;
     }
 
     if (enable != is_enabled) {
         is_enabled = enable;
-        DEBUG(status,out).print("%s from the API, persisting\n",
+        DEBUG(status,out).print("%s from the API; persisting\n",
                                 is_enabled ? "enabled" : "disabled");
         set_config_bool(CONFIG_IS_ENABLED, is_enabled);
-        init_autonestbox(out);
+    } else {
+        DEBUG(status,out).print("%s from the API, but already %s; no action\n",
+                                is_enabled ? "enabled" : "disabled",
+                                is_enabled ? "enabled" : "disabled");
     }
     return CR_OK;
 }
 
-DFhackCExport command_result plugin_shutdown (color_ostream &out) {
-    cleanup_autonestbox(out);
+DFhackCExport command_result plugin_load_data (color_ostream &out) {
+    config = World::GetPersistentData(CONFIG_KEY);
+
+    if (!config.isValid()) {
+        DEBUG(status,out).print("no config found in this save; initializing\n");
+        config = World::AddPersistentData(CONFIG_KEY);
+        set_config_bool(CONFIG_IS_ENABLED, is_enabled);
+        set_config_val(CONFIG_CYCLE_TICKS, 6000);
+    }
+
+    // we have to copy our enabled flag into the global plugin variable, but
+    // all the other state we can directly read/modify from the persistent
+    // data structure.
+    is_enabled = get_config_bool(CONFIG_IS_ENABLED);
+    DEBUG(status,out).print("loading persisted enabled state: %s\n",
+                            is_enabled ? "true" : "false");
+    did_complain = false;
     return CR_OK;
 }
 
 DFhackCExport command_result plugin_onstatechange(color_ostream &out, state_change_event event) {
-    switch (event) {
-    case DFHack::SC_MAP_LOADED:
-        init_autonestbox(out);
-        break;
-    case DFHack::SC_MAP_UNLOADED:
-        cleanup_autonestbox(out);
-        break;
-    default:
-        break;
+    if (event == DFHack::SC_WORLD_UNLOADED) {
+        if (is_enabled) {
+            DEBUG(status,out).print("world unloaded; disabling %s\n",
+                                    plugin_name);
+            is_enabled = false;
+        }
     }
     return CR_OK;
 }
@@ -178,6 +152,30 @@ DFhackCExport command_result plugin_onupdate(color_ostream &out) {
     return CR_OK;
 }
 
+/////////////////////////////////////////////////////
+// configuration interface
+//
+
+struct autonestbox_options {
+    // whether to display help
+    bool help = false;
+
+    // whether to run a cycle right now
+    bool now = false;
+
+    // how many ticks to wait between automatic cycles, -1 means unset
+    int32_t ticks = -1;
+
+    static struct_identity _identity;
+};
+static const struct_field_info autonestbox_options_fields[] = {
+    { struct_field_info::PRIMITIVE, "help",  offsetof(autonestbox_options, help),  &df::identity_traits<bool>::identity,    0, 0 },
+    { struct_field_info::PRIMITIVE, "now",   offsetof(autonestbox_options, now),   &df::identity_traits<bool>::identity,    0, 0 },
+    { struct_field_info::PRIMITIVE, "ticks", offsetof(autonestbox_options, ticks), &df::identity_traits<int32_t>::identity, 0, 0 },
+    { struct_field_info::END }
+};
+struct_identity autonestbox_options::_identity(sizeof(autonestbox_options), &df::allocator_fn<autonestbox_options>, NULL, "autonestbox_options", NULL, autonestbox_options_fields);
+
 static bool get_options(color_ostream &out,
                         autonestbox_options &opts,
                         const vector<string> &parameters)
@@ -205,8 +203,8 @@ static bool get_options(color_ostream &out,
 static command_result df_autonestbox(color_ostream &out, vector<string> &parameters) {
     CoreSuspender suspend;
 
-    if (!Maps::IsValid()) {
-        out.printerr("Cannot run autonestbox without a loaded map.\n");
+    if (!Core::getInstance().isWorldLoaded()) {
+        out.printerr("Cannot run %s without a loaded world.\n", plugin_name);
         return CR_FAILURE;
     }
 
@@ -228,7 +226,7 @@ static command_result df_autonestbox(color_ostream &out, vector<string> &paramet
 }
 
 /////////////////////////////////////////////////////
-// autonestbox cycle logic
+// cycle logic
 //
 
 static bool isEmptyPasture(df::building *building) {

From 3b17448597f8c0233f6d59082629de497fbf5799 Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Wed, 3 Aug 2022 23:34:56 -0700
Subject: [PATCH 428/854] update docs for autobutcher

---
 docs/plugins/autobutcher.rst | 175 +++++++++++++++++++++++++++++++++++
 plugins/autobutcher.cpp      |  86 +----------------
 2 files changed, 176 insertions(+), 85 deletions(-)
 create mode 100644 docs/plugins/autobutcher.rst

diff --git a/docs/plugins/autobutcher.rst b/docs/plugins/autobutcher.rst
new file mode 100644
index 000000000..e77e13232
--- /dev/null
+++ b/docs/plugins/autobutcher.rst
@@ -0,0 +1,175 @@
+autobutcher
+===========
+Tags:
+:dfhack-keybind:`autobutcher`
+
+Automatically butcher excess livestock. This plugin monitors how many pets you
+have of each gender and age and assigns excess lifestock for slaughter. Requires
+that you add the target race(s) to a watch list. Units will be ignored if they
+are:
+
+* Untamed
+* Nicknamed (for custom protection; you can use the `rename` ``unit`` tool
+  individually, or `zone` ``nick`` for groups)
+* Caged, if and only if the cage is defined as a room (to protect zoos)
+* Trained for war or hunting
+
+Creatures who will not reproduce (because they're not interested in the
+opposite sex or have been gelded) will be butchered before those who will.
+Older adults and younger children will be butchered first if the population
+is above the target (defaults are: 1 male kid, 5 female kids, 1 male adult,
+5 female adults). Note that you may need to set a target above 1 to have a
+reliable breeding population due to asexuality etc. See `fix-ster` if this is a
+problem.
+
+Usage:
+
+``enable autobutcher``
+    Start processing livestock according to the configuration. Note that
+    no races are watched by default. You have to add the ones you want to
+    monitor with ``autobutcher watch``, ``autobutcher target`` or
+    ``autobutcher autowatch``.
+``autobutcher autowatch``
+    Automatically add all new races (animals you buy from merchants, tame
+    yourself, or get from migrants) to the watch list using the default target
+    counts.
+``autobutcher noautowatch``
+    Stop auto-adding new races to the watch list.
+``autobutcher target <fk> <mk> <fa> <ma> all|new|<race> [<race> ...]``
+    Set target counts for the specified races:
+        fk = number of female kids
+        mk = number of male kids
+        fa = number of female adults
+        ma = number of female adults
+    If you specify ``all``, then this command will set the counts for all races
+    on your current watchlist (including the races which are currenly set to
+    'unwatched') and sets the new default for future watch commands. If you
+    specify ``new``, then this command just sets the new default counts for
+    future watch commands without changing your current watchlist. Otherwise,
+    all space separated races listed will be modified (or added to the watchlist
+    if they aren't there already).
+``autobutcher ticks <ticks>``
+    Change the number of ticks between scanning cycles when the plugin is
+    enabled. By default, a cycle happens every 6000 ticks (about 8 game days).
+``autobutcher watch all|<race> [<race> ...]``
+    Start watching the listed races. If they aren't already in your watchlist,
+    then they will be added with the default target counts. If you specify the
+    keyword ``all``, then all races in your watchlist that are currently marked
+    as unwatched will become watched.
+``autobutcher unwatch all|<race> [<race> ...]``
+    Stop watching the specified race(s) (or all races on your watchlist if
+    ``all`` is given). The current target settings will be remembered.
+``autobutcher forget all|<race> [<race> ...]``
+    Unwatch the specified race(s) (or all races on your watchlist if ``all`` is
+    given) and forget target settings for it/them.
+``autobutcher [list]``
+    Print status and current settings, including the watchlist. This is the
+    default command if autobutcher is run without parameters.
+``autobutcher list_export``
+    Print commands required to set the current settings in another fort.
+    Useful to run form dfhack-run like:
+    ``dfhack-run autobutcher list_export > autobutcher.script``
+
+To see a list of all races, run this command:
+
+    devel/query --table df.global.world.raws.creatures.all --search ^creature_id --maxdepth 1
+
+Though not all the races listed there are tameable/butcherable.
+
+Examples
+--------
+
+Keep at most 7 kids (4 female, 3 male) and at most 3 adults (2 female, 1 male)
+for turkeys. Once the kids grow up, the oldest adults will get slaughtered.
+Excess kids will get slaughtered starting the the youngest to allow that the
+older ones grow into adults::
+
+    autobutcher target 4 3 2 1 BIRD_TURKEY
+
+Configure useful limits for dogs, cats, geese (for eggs, leather, and bones),
+alpacas, sheep, and llamas (for wool), and pigs (for milk and meat). All other
+unnamed tame units will be marked for slaughter as soon as they arrive in your
+fortress::
+
+    autobutcher target 2 2 2 2 DOG
+    autobutcher target 1 1 2 2 CAT
+    autobutcher target 50 50 14 2 BIRD_GOOSE
+    autobutcher target 2 2 4 2 ALPACA SHEEP LLAMA
+    autobutcher target 5 5 6 2 PIG
+    autobutcher target 0 0 0 0 new
+    autobutcher autowatch
+
+Options:
+
+:example:      Print some usage examples.
+:start:        Start running every X frames (df simulation ticks).
+               Default: X=6000, which would be every 60 seconds at 100fps.
+:stop:         Stop running automatically.
+:sleep <x>:    Changes the timer to sleep X frames between runs.
+:watch R:      Start watching a race. R can be a valid race RAW id (ALPACA,
+               BIRD_TURKEY, etc) or a list of ids seperated by spaces or
+               the keyword 'all' which affects all races on your current
+               watchlist.
+:unwatch R:    Stop watching race(s). The current target settings will be
+               remembered. R can be a list of ids or the keyword 'all'.
+:forget R:     Stop watching race(s) and forget it's/their target settings.
+               R can be a list of ids or the keyword 'all'.
+:autowatch:    Automatically adds all new races (animals you buy from merchants,
+               tame yourself or get from migrants) to the watch list using
+               default target count.
+:noautowatch:  Stop auto-adding new races to the watchlist.
+:list:         Print the current status and watchlist.
+:list_export:  Print the commands needed to set up status and watchlist,
+               which can be used to import them to another save (see notes).
+:target <fk> <mk> <fa> <ma> <R>:
+               Set target count for specified race(s).  The first four arguments
+               are the number of female and male kids, and female and male adults.
+               R can be a list of spceies ids, or the keyword ``all`` or ``new``.
+               ``R = 'all'``: change target count for all races on watchlist
+               and set the new default for the future. ``R = 'new'``: don't touch
+               current settings on the watchlist, only set the new default
+               for future entries.
+:list_export:  Print the commands required to rebuild your current settings.
+
+.. note::
+
+    Settings and watchlist are stored in the savegame, so that you can have
+    different settings for each save. If you want to copy your watchlist to
+    another savegame you must export the commands required to recreate your settings.
+
+    To export, open an external terminal in the DF directory, and run
+    ``dfhack-run autobutcher list_export > filename.txt``.  To import, load your
+    new save and run ``script filename.txt`` in the DFHack terminal.
+
+
+Examples:
+
+You want to keep max 7 kids (4 female, 3 male) and max 3 adults (2 female,
+1 male) of the race alpaca. Once the kids grow up the oldest adults will get
+slaughtered. Excess kids will get slaughtered starting with the youngest
+to allow that the older ones grow into adults. Any unnamed cats will
+be slaughtered as soon as possible. ::
+
+     autobutcher target 4 3 2 1 ALPACA BIRD_TURKEY
+     autobutcher target 0 0 0 0 CAT
+     autobutcher watch ALPACA BIRD_TURKEY CAT
+     autobutcher start
+
+Automatically put all new races onto the watchlist and mark unnamed tame units
+for slaughter as soon as they arrive in your fort. Settings already made
+for specific races will be left untouched. ::
+
+     autobutcher target 0 0 0 0 new
+     autobutcher autowatch
+     autobutcher start
+
+Stop watching the races alpaca and cat, but remember the target count
+settings so that you can use 'unwatch' without the need to enter the
+values again. Note: 'autobutcher unwatch all' works, but only makes sense
+if you want to keep the plugin running with the 'autowatch' feature or manually
+add some new races with 'watch'. If you simply want to stop it completely use
+'autobutcher stop' instead. ::
+
+    autobutcher unwatch ALPACA CAT
+
+const string autobutcher_help =
diff --git a/plugins/autobutcher.cpp b/plugins/autobutcher.cpp
index ee93d30e5..32c8b8764 100644
--- a/plugins/autobutcher.cpp
+++ b/plugins/autobutcher.cpp
@@ -86,95 +86,11 @@ static void cleanup_autobutcher(color_ostream &out);
 static command_result df_autobutcher(color_ostream &out, vector<string> &parameters);
 static void autobutcher_cycle(color_ostream &out);
 
-const string autobutcher_help =
-    "Automatically butcher excess livestock. This plugin monitors how many pets\n"
-    "you have of each gender and age and assigns excess lifestock for slaughter\n"
-    "once they reach a specific count. Requires\n"
-    "that you add the target race(s) to a watch list. Only tame units will be\n"
-    "processed. Named units will be completely ignored (you can give animals\n"
-    "nicknames with the tool 'rename unit' to protect them from getting slaughtered\n"
-    "automatically). Trained war or hunting pets will be ignored.\n"
-    "Once you have too many adults, the oldest will be butchered first.\n"
-    "Once you have too many kids, the youngest will be butchered first.\n"
-    "If you don't set a target count the following default will be used:\n"
-    "1 male kid, 5 female kids, 1 male adult, 5 female adults.\n"
-    "\n"
-    "Usage:\n"
-    "\n"
-    "enable autobutcher\n"
-    "    Start processing livestock according to the configuration. Note that\n"
-    "    no races are watched by default. You have to add the ones you want to\n"
-    "    monitor (or use autowatch)\n"
-    "autobutcher autowatch\n"
-    "    Automatically add all new races (animals you buy\n"
-    "    from merchants, tame yourself, or get from migrants)\n"
-    "    to the watch list using the default target counts.\n"
-    "autobutcher noautowatch\n"
-    "    Stop auto-adding new races to the watch list.\n"
-    "autobutcher target <fk> <mk> <fa> <ma> all|new|<race> [<race> ...] \n"
-    "    Set target counts for the specified races:\n"
-    "        fk = number of female kids\n"
-    "        mk = number of male kids\n"
-    "        fa = number of female adults\n"
-    "        ma = number of female adults\n"
-    "    If you specify 'all', then this command will set the counts for all races\n"
-    "    on your current watchlist (including the races which are currenly set to\n"
-    "    'unwatched') and sets the new default for future watch commands. If you\n"
-    "    specify 'new', then this command just sets the new default counts for\n"
-    "    future watch commands without changing your current watchlist. Otherwise,\n"
-    "    all space separated races listed will be modified (or added to the watchlist\n"
-    "    if they aren't there already).\n"
-    "autobutcher ticks <ticks>\n"
-    "    Change the number of ticks between scanning cycles when the plugin is\n"
-    "    enabled. By default, a cycle happens every 6000 ticks (about 8 game days).\n"
-    "autobutcher watch all|<race> [<race> ...]\n"
-    "    Start watching the listed races. If they aren't already in your watchlist, then\n"
-    "    they will be added with the default target counts. If you specify the keyword 'all',\n"
-    "    then all races in your watchlist that are currently marked as unwatched will become\n"
-    "    watched.\n"
-    "autobutcher unwatch all|<race> [<race> ...]\n"
-    "    Stop watching the specified race(s) (or all races on your watchlist if 'all' is\n"
-    "    given). The current target settings will be remembered.\n"
-    "autobutcher forget all|<race> [<race> ...]\n"
-    "    Unwatch the specified race(s) (or all races on your watchlist if 'all' is given)\n"
-    "    and forget target settings for it/them.\n"
-    "autobutcher [list]\n"
-    "    Print status and current settings, including the watchlist.\n"
-    "autobutcher list_export\n"
-    "    Print commands required to set the current settings in another fort.\n"
-    "    Useful to run form dfhack-run like: 'dfhack-run autobutcher list_export > autobutcher.script'\n"
-    "\n"
-    "To see a list of all races, run this command:\n"
-    "\n"
-    "    devel/query --table df.global.world.raws.creatures.all --search ^creature_id --maxdepth 1'\n"
-    "\n"
-    "Though not all the races listed there are tameable/butcherable\n"
-    "\n"
-    "Examples:\n"
-    "\n"
-    "autobutcher target 4 3 2 1 BIRD_TURKEY\n"
-    "    This means you want to have at most 7 kids (4 female, 3 male) and at most 3 adults\n"
-    "    (2 female, 1 male) for turkeys. Once the kids grow up, the\n"
-    "    oldest adults will get slaughtered. Excess kids will get slaughtered starting\n"
-    "    the the youngest to allow that the older ones grow into adults.\n"
-    "autobutcher target 2 2 2 2 DOG\n"
-    "autobutcher target 1 1 2 2 CAT\n"
-    "autobutcher target 50 50 14 2 BIRD_GOOSE\n"
-    "autobutcher target 2 2 4 2 ALPACA SHEEP LLAMA\n"
-    "autobutcher target 5 5 6 2 PIG\n"
-    "autobutcher target 0 0 0 0 new\n"
-    "autobutcher autowatch\n"
-    "    Configure useful limits for dogs, cats, geese (for eggs, leather, and bones), alpacas, sheep,\n"
-    "    and llamas (for wool), and pigs (for milk and meat). All other unnamed tame units will be marked\n"
-    "    for slaughter as soon as they arrive in your fortress.\n";
-
 DFhackCExport command_result plugin_init(color_ostream &out, std::vector <PluginCommand> &commands) {
     commands.push_back(PluginCommand(
         plugin_name,
         "Automatically butcher excess livestock.",
-        df_autobutcher,
-        false,
-        autobutcher_help.c_str()));
+        df_autobutcher));
     return CR_OK;
 }
 

From b2ab93b3cd97448ad5705590676c837e3d27b1a1 Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Wed, 3 Aug 2022 23:35:13 -0700
Subject: [PATCH 429/854] update docs for autonestbox

---
 docs/plugins/autonestbox.rst | 27 +++++++++++++++++++++++++++
 plugins/autonestbox.cpp      | 22 +---------------------
 2 files changed, 28 insertions(+), 21 deletions(-)
 create mode 100644 docs/plugins/autonestbox.rst

diff --git a/docs/plugins/autonestbox.rst b/docs/plugins/autonestbox.rst
new file mode 100644
index 000000000..6842bef5c
--- /dev/null
+++ b/docs/plugins/autonestbox.rst
@@ -0,0 +1,27 @@
+autonestbox
+===========
+Tags:
+:dfhack-keybind:`autonestbox`
+
+Auto-assign egg-laying female pets to nestbox zones. Requires that you create
+pen/pasture zones above nestboxes. If the pen is bigger than 1x1, the nestbox
+must be in the top left corner. Only 1 unit will be assigned per pen, regardless
+of the size. The age of the units is currently not checked since most birds grow
+up quite fast. Egg layers who are also grazers will be ignored, since confining
+them to a 1x1 pasture is not a good idea. Only tame and domesticated own units
+are processed since pasturing half-trained wild egg layers could destroy your
+neat nestbox zones when they revert to wild.
+
+Usage:
+
+``enable autonestbox``
+    Start checking for unpastured egg-layers and assigning them to nestbox
+    zones.
+``autonestbox``
+    Print current status.
+``autonestbox now``
+    Run a scan and assignment cycle right now. Does not require that the plugin
+    is enabled.
+``autonestbox ticks <ticks>``
+    Change the number of ticks between scan and assignment cycles when the
+    plugin is enabled. The default is 6000 (about 8 days).
diff --git a/plugins/autonestbox.cpp b/plugins/autonestbox.cpp
index c47f4425f..dd052f234 100644
--- a/plugins/autonestbox.cpp
+++ b/plugins/autonestbox.cpp
@@ -33,24 +33,6 @@ DFHACK_PLUGIN_IS_ENABLED(is_enabled);
 
 REQUIRE_GLOBAL(world);
 
-static const string autonestbox_help =
-    "Assigns unpastured female egg-layers to nestbox zones.\n"
-    "Requires that you create pen/pasture zones above nestboxes.\n"
-    "If the pen is bigger than 1x1 the nestbox must be in the top left corner.\n"
-    "Only 1 unit will be assigned per pen, regardless of the size.\n"
-    "The age of the units is currently not checked, most birds grow up quite fast.\n"
-    "Usage:\n"
-    "\n"
-    "enable autonestbox\n"
-    "    Start checking for unpastured egg-layers and assigning them to nestbox zones.\n"
-    "autonestbox\n"
-    "    Print current status."
-    "autonestbox now\n"
-    "    Run a scan and assignment cycle right now. Does not require that the plugin is enabled.\n"
-    "autonestbox ticks <ticks>\n"
-    "    Change the number of ticks between scan and assignment cycles when the plugin is enabled.\n"
-    "    The default is 6000 (about 8 days)\n";
-
 namespace DFHack {
     // for configuration-related logging
     DBG_DECLARE(autonestbox, status, DebugCategory::LINFO);
@@ -90,9 +72,7 @@ DFhackCExport command_result plugin_init(color_ostream &out, std::vector <Plugin
     commands.push_back(PluginCommand(
         plugin_name,
         "Auto-assign egg-laying female pets to nestbox zones.",
-        df_autonestbox,
-        false,
-        autonestbox_help.c_str()));
+        df_autonestbox));
     return CR_OK;
 }
 

From 5c9be942a501c9aedb8bd49bc60cba26b49aa468 Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Wed, 3 Aug 2022 23:40:35 -0700
Subject: [PATCH 430/854] update docs for workflow

---
 docs/plugins/workflow.rst | 153 +++++++++++++++++++++-----------------
 plugins/workflow.cpp      |  81 ++------------------
 2 files changed, 91 insertions(+), 143 deletions(-)

diff --git a/docs/plugins/workflow.rst b/docs/plugins/workflow.rst
index f6b8c4475..cb20ad806 100644
--- a/docs/plugins/workflow.rst
+++ b/docs/plugins/workflow.rst
@@ -1,73 +1,69 @@
 workflow
 ========
-Manage control of repeat jobs.  `gui/workflow` provides a simple
+Tags:
+:dfhack-keybind:`workflow`
+:dfhack-keybind:`fix-job-postings`
+
+Manage repeat jobs according to stock levels. `gui/workflow` provides a simple
 front-end integrated in the game UI.
 
-Usage:
+When the plugin is enabled, it protects all repeat jobs from removal. If they do
+disappear due to any cause (raw materials not available, manual removal by the
+player, etc.), they are immediately re-added to their workshop and suspended.
+
+If any constraints on item amounts are set, repeat jobs that produce that kind
+of item are automatically suspended and resumed as the item amount goes above or
+below the limit.
 
-``workflow enable [option...], workflow disable [option...]``
-   If no options are specified, enables or disables the plugin.
-   Otherwise, enables or disables any of the following options:
+There is a good amount of overlap between this plugin and the vanilla manager
+workorders, and both systems have their advantages. Vanilla manager workorders
+can be more expressive about when to enqueue jobs. For example, you can gate the
+activation of a vanilla workorder based on availability of raw materials, which
+you cannot do in ``workflow``. However, ``workflow`` is often more convenient
+for quickly keeping a small stock of various items on hand without having to
+configure all the vanilla manager options. Also see the `orders` plugin for
+a library of manager orders that may make managing your stocks even more
+convenient than ``workflow`` can.
 
-   - drybuckets: Automatically empty abandoned water buckets.
-   - auto-melt: Resume melt jobs when there are objects to melt.
+Usage:
+
+``enable workflow``
+    Start monitoring for and managing workshop jobs that are set to repeat.
+``workflow enable|disable drybuckets``
+    Enables/disables automatic emptying of abandoned water buckets.
+``workflow enable|disable auto-melt``
+    Enables/disables automatic resumption of repeat melt jobs when there are
+    objects to melt.
+``workflow count <constraint-spec> <target> [gap]``
+    Set a constraint, counting every stack as 1 item. If a gap is specified,
+    stocks are allowed to dip that many items below the target before relevant
+    jobs are resumed.
+``workflow amount <constraint-spec> <target> [gap]``
+    Set a constraint, counting all items within stacks. If a gap is specified,
+    stocks are allowed to dip that many items below the target before relevant
+    jobs are resumed.
+``workflow unlimit <constraint-spec>``
+    Delete a constraint.
+``workflow unlimit-all``
+    Delete all constraints.
 ``workflow jobs``
-   List workflow-controlled jobs (if in a workshop, filtered by it).
+    List workflow-controlled jobs (if in a workshop, filtered by it).
 ``workflow list``
-   List active constraints, and their job counts.
+    List active constraints, and their job counts.
 ``workflow list-commands``
-   List active constraints as workflow commands that re-create them;
-   this list can be copied to a file, and then reloaded using the
-   ``script`` built-in command.
-``workflow count <constraint-spec> <cnt-limit> [cnt-gap]``
-   Set a constraint, counting every stack as 1 item.
-``workflow amount <constraint-spec> <cnt-limit> [cnt-gap]``
-   Set a constraint, counting all items within stacks.
-``workflow unlimit <constraint-spec>``
-   Delete a constraint.
-``workflow unlimit-all``
-   Delete all constraints.
-
-Function
+    List active constraints as workflow commands that re-create them; this list
+    can be copied to a file, and then reloaded using the `script` built-in
+    command.
+``fix-job-postings [dry-run]``
+    Fixes crashes caused the version of workflow released with DFHack
+    0.40.24-r4. It will be run automatically if needed. If your save has never
+    been run with this version, you will never need this command. Specify the
+    ``dry-run`` keyword to see what this command would do without making any
+    changes to game state.
+
+Examples
 --------
-When the plugin is enabled, it protects all repeat jobs from removal.
-If they do disappear due to any cause, they are immediately re-added to their
-workshop and suspended.
-
-In addition, when any constraints on item amounts are set, repeat jobs that
-produce that kind of item are automatically suspended and resumed as the item
-amount goes above or below the limit. The gap specifies how much below the limit
-the amount has to drop before jobs are resumed; this is intended to reduce
-the frequency of jobs being toggled.
-
-Constraint format
------------------
-The constraint spec consists of 4 parts, separated with ``/`` characters::
-
-    ITEM[:SUBTYPE]/[GENERIC_MAT,...]/[SPECIFIC_MAT:...]/[LOCAL,<quality>]
-
-The first part is mandatory and specifies the item type and subtype,
-using the raw tokens for items (the same syntax used custom reaction inputs).
-For more information, see :wiki:`this wiki page <Material_token>`.
-
-The subsequent parts are optional:
-
-- A generic material spec constrains the item material to one of
-  the hard-coded generic classes, which currently include::
 
-    PLANT WOOD CLOTH SILK LEATHER BONE SHELL SOAP TOOTH HORN PEARL YARN
-    METAL STONE SAND GLASS CLAY MILK
-
-- A specific material spec chooses the material exactly, using the
-  raw syntax for reaction input materials, e.g. ``INORGANIC:IRON``,
-  although for convenience it also allows just ``IRON``, or ``ACACIA:WOOD`` etc.
-  See the link above for more details on the unabbreviated raw syntax.
-
-- A comma-separated list of miscellaneous flags, which currently can
-  be used to ignore imported items or items below a certain quality.
-
-Constraint examples
--------------------
 Keep metal bolts within 900-1000, and wood/bone within 150-200::
 
     workflow amount AMMO:ITEM_AMMO_BOLTS/METAL 1000 100
@@ -104,16 +100,39 @@ Make sure there are always 80-100 units of dimple dye::
 
 .. note::
 
-  In order for this to work, you have to set the material of the PLANT input
-  on the Mill Plants job to MUSHROOM_CUP_DIMPLE using the `job item-material <job>`
-  command. Otherwise the plugin won't be able to deduce the output material.
+    In order for this to work, you have to set the material of the PLANT input
+    on the Mill Plants job to MUSHROOM_CUP_DIMPLE using the
+    `job item-material <job>` command. Otherwise the plugin won't be able to
+    deduce the output material.
 
 Maintain 10-100 locally-made crafts of exceptional quality::
 
     workflow count CRAFTS///LOCAL,EXCEPTIONAL 100 90
 
-fix-job-postings
-----------------
-This command fixes crashes caused by previous versions of workflow, mostly in
-DFHack 0.40.24-r4, and should be run automatically when loading a world (but can
-also be run manually if desired).
+Constraint format
+-----------------
+
+The constraint spec consists of 4 parts, separated with ``/`` characters::
+
+    ITEM[:SUBTYPE]/[GENERIC_MAT,...]/[SPECIFIC_MAT:...]/[LOCAL,<quality>]
+
+The first part is mandatory and specifies the item type and subtype, using the
+raw tokens for items (the same syntax used custom reaction inputs). For more
+information, see :wiki:`this wiki page <Material_token>`.
+
+The subsequent parts are optional:
+
+- A generic material spec constrains the item material to one of the hard-coded
+  generic classes, which currently include::
+
+    PLANT WOOD CLOTH SILK LEATHER BONE SHELL SOAP TOOTH HORN PEARL YARN
+    METAL STONE SAND GLASS CLAY MILK
+
+- A specific material spec chooses the material exactly, using the raw syntax
+  for reaction input materials, e.g. ``INORGANIC:IRON``, although for
+  convenience it also allows just ``IRON``, or ``ACACIA:WOOD`` etc.  See the
+  link above for more details on the unabbreviated raw syntax.
+
+- A comma-separated list of miscellaneous flags, which currently can be used to
+  ignore imported items (``LOCAL``) or items below a certain quality (1-5, with
+  5 being masterwork).
diff --git a/plugins/workflow.cpp b/plugins/workflow.cpp
index 600a8bef1..83f312bfd 100644
--- a/plugins/workflow.cpp
+++ b/plugins/workflow.cpp
@@ -73,84 +73,13 @@ DFhackCExport command_result plugin_init (color_ostream &out, std::vector <Plugi
     if (ui_workshop_job_cursor && job_next_id) {
         commands.push_back(
             PluginCommand(
-                "workflow", "Manage control of repeat jobs.",
-                workflow_cmd, false,
-                "  workflow enable [option...]\n"
-                "  workflow disable [option...]\n"
-                "    If no options are specified, enables or disables the plugin.\n"
-                "    Otherwise, enables or disables any of the following options:\n"
-                "     - drybuckets: Automatically empty abandoned water buckets.\n"
-                "     - auto-melt: Resume melt jobs when there are objects to melt.\n"
-                "  workflow jobs\n"
-                "    List workflow-controlled jobs (if in a workshop, filtered by it).\n"
-                "  workflow list\n"
-                "    List active constraints, and their job counts.\n"
-                "  workflow list-commands\n"
-                "    List workflow commands that re-create existing constraints.\n"
-                "  workflow count <constraint-spec> <cnt-limit> [cnt-gap]\n"
-                "  workflow amount <constraint-spec> <cnt-limit> [cnt-gap]\n"
-                "    Set a constraint. The first form counts each stack as only 1 item.\n"
-                "  workflow unlimit <constraint-spec>\n"
-                "    Delete a constraint.\n"
-                "  workflow unlimit-all\n"
-                "    Delete all constraints.\n"
-                "Function:\n"
-                "  - When the plugin is enabled, it protects all repeat jobs from removal.\n"
-                "    If they do disappear due to any cause, they are immediately re-added\n"
-                "    to their workshop and suspended.\n"
-                "  - In addition, when any constraints on item amounts are set, repeat jobs\n"
-                "    that produce that kind of item are automatically suspended and resumed\n"
-                "    as the item amount goes above or below the limit. The gap specifies how\n"
-                "    much below the limit the amount has to drop before jobs are resumed;\n"
-                "    this is intended to reduce the frequency of jobs being toggled.\n"
-                "Constraint format:\n"
-                "  The contstraint spec consists of 4 parts, separated with '/' characters:\n"
-                "    ITEM[:SUBTYPE]/[GENERIC_MAT,...]/[SPECIFIC_MAT:...]/[LOCAL,<quality>]\n"
-                "  The first part is mandatory and specifies the item type and subtype,\n"
-                "  using the raw tokens for items, in the same syntax you would e.g. use\n"
-                "  for a custom reaction input. The subsequent parts are optional:\n"
-                "  - A generic material spec constrains the item material to one of\n"
-                "    the hard-coded generic classes, like WOOD, METAL, YARN or MILK.\n"
-                "  - A specific material spec chooses the material exactly, using the\n"
-                "    raw syntax for reaction input materials, e.g. INORGANIC:IRON,\n"
-                "    although for convenience it also allows just IRON, or ACACIA:WOOD.\n"
-                "  - A comma-separated list of miscellaneous flags, which currently can\n"
-                "    be used to ignore imported items or items below a certain quality.\n"
-                "Constraint examples:\n"
-                "  workflow amount AMMO:ITEM_AMMO_BOLTS/METAL 1000 100\n"
-                "  workflow amount AMMO:ITEM_AMMO_BOLTS/WOOD,BONE 200 50\n"
-                "    Keep metal bolts within 900-1000, and wood/bone within 150-200.\n"
-                "  workflow count FOOD 120 30\n"
-                "  workflow count DRINK 120 30\n"
-                "    Keep the number of prepared food & drink stacks between 90 and 120\n"
-                "  workflow count BIN 30\n"
-                "  workflow count BARREL 30\n"
-                "  workflow count BOX/CLOTH,SILK,YARN 30\n"
-                "    Make sure there are always 25-30 empty bins/barrels/bags.\n"
-                "  workflow count BAR//COAL 20\n"
-                "  workflow count BAR//COPPER 30\n"
-                "    Make sure there are always 15-20 coal and 25-30 copper bars.\n"
-                "  workflow count CRAFTS//GOLD 20\n"
-                "    Produce 15-20 gold crafts.\n"
-                "  workflow count POWDER_MISC/SAND 20\n"
-                "  workflow count BOULDER/CLAY 20\n"
-                "    Collect 15-20 sand bags and clay boulders.\n"
-                "  workflow amount POWDER_MISC//MUSHROOM_CUP_DIMPLE:MILL 100 20\n"
-                "    Make sure there are always 80-100 units of dimple dye.\n"
-                "    In order for this to work, you have to set the material of\n"
-                "    the PLANT input on the Mill Plants job to MUSHROOM_CUP_DIMPLE\n"
-                "    using the 'job item-material' command.\n"
-                "  workflow count CRAFTS///LOCAL,EXCEPTIONAL 100 90\n"
-                "    Maintain 10-100 locally-made crafts of exceptional quality.\n"
-            )
-        );
+                "workflow",
+                "Manage repeat jobs according to stock levels.",
+                workflow_cmd));
         commands.push_back(PluginCommand(
             "fix-job-postings",
-            "Fix broken job postings caused by certain versions of workflow",
-            fix_job_postings_cmd, false,
-            "fix-job-postings: Fix job postings\n"
-            "fix-job-postings dry|[any argument]: Dry run only (avoid making changes)\n"
-        ));
+            "Fix broken job postings caused by very old versions of workflow.",
+            fix_job_postings_cmd));
     }
 
     init_state(out);

From 26863fe4686bdfc2942ce9b7ed59cb73d1c5dc46 Mon Sep 17 00:00:00 2001
From: Myk <myk002@yahoo.com>
Date: Thu, 4 Aug 2022 00:18:06 -0700
Subject: [PATCH 431/854] Update zone.rst

---
 docs/plugins/zone.rst | 115 ------------------------------------------
 1 file changed, 115 deletions(-)

diff --git a/docs/plugins/zone.rst b/docs/plugins/zone.rst
index be827b47c..a3112c147 100644
--- a/docs/plugins/zone.rst
+++ b/docs/plugins/zone.rst
@@ -1,6 +1,3 @@
-.. _autobutcher:
-.. _autonestbox:
-
 zone
 ====
 Helps a bit with managing activity zones (pens, pastures and pits) and cages.
@@ -131,115 +128,3 @@ Examples
 ``zone tocages count 50 own tame male not grazer``
    Stuff up to 50 owned tame male animals who are not grazers into cages built
    on the current default zone.
-
-autobutcher
-===========
-Assigns lifestock for slaughter once it reaches a specific count. Requires that
-you add the target race(s) to a watch list. Only tame units will be processed.
-
-Units will be ignored if they are:
-
-* Nicknamed (for custom protection; you can use the `rename` ``unit`` tool
-  individually, or `zone` ``nick`` for groups)
-* Caged, if and only if the cage is defined as a room (to protect zoos)
-* Trained for war or hunting
-
-Creatures who will not reproduce (because they're not interested in the
-opposite sex or have been gelded) will be butchered before those who will.
-Older adults and younger children will be butchered first if the population
-is above the target (default 1 male, 5 female kids and adults).  Note that
-you may need to set a target above 1 to have a reliable breeding population
-due to asexuality etc.  See `fix-ster` if this is a problem.
-
-Options:
-
-:example:      Print some usage examples.
-:start:        Start running every X frames (df simulation ticks).
-               Default: X=6000, which would be every 60 seconds at 100fps.
-:stop:         Stop running automatically.
-:sleep <x>:    Changes the timer to sleep X frames between runs.
-:watch R:      Start watching a race. R can be a valid race RAW id (ALPACA,
-               BIRD_TURKEY, etc) or a list of ids seperated by spaces or
-               the keyword 'all' which affects all races on your current
-               watchlist.
-:unwatch R:    Stop watching race(s). The current target settings will be
-               remembered. R can be a list of ids or the keyword 'all'.
-:forget R:     Stop watching race(s) and forget it's/their target settings.
-               R can be a list of ids or the keyword 'all'.
-:autowatch:    Automatically adds all new races (animals you buy from merchants,
-               tame yourself or get from migrants) to the watch list using
-               default target count.
-:noautowatch:  Stop auto-adding new races to the watchlist.
-:list:         Print the current status and watchlist.
-:list_export:  Print the commands needed to set up status and watchlist,
-               which can be used to import them to another save (see notes).
-:target <fk> <mk> <fa> <ma> <R>:
-               Set target count for specified race(s).  The first four arguments
-               are the number of female and male kids, and female and male adults.
-               R can be a list of spceies ids, or the keyword ``all`` or ``new``.
-               ``R = 'all'``: change target count for all races on watchlist
-               and set the new default for the future. ``R = 'new'``: don't touch
-               current settings on the watchlist, only set the new default
-               for future entries.
-:list_export:  Print the commands required to rebuild your current settings.
-
-.. note::
-
-    Settings and watchlist are stored in the savegame, so that you can have
-    different settings for each save. If you want to copy your watchlist to
-    another savegame you must export the commands required to recreate your settings.
-
-    To export, open an external terminal in the DF directory, and run
-    ``dfhack-run autobutcher list_export > filename.txt``.  To import, load your
-    new save and run ``script filename.txt`` in the DFHack terminal.
-
-
-Examples:
-
-You want to keep max 7 kids (4 female, 3 male) and max 3 adults (2 female,
-1 male) of the race alpaca. Once the kids grow up the oldest adults will get
-slaughtered. Excess kids will get slaughtered starting with the youngest
-to allow that the older ones grow into adults. Any unnamed cats will
-be slaughtered as soon as possible. ::
-
-     autobutcher target 4 3 2 1 ALPACA BIRD_TURKEY
-     autobutcher target 0 0 0 0 CAT
-     autobutcher watch ALPACA BIRD_TURKEY CAT
-     autobutcher start
-
-Automatically put all new races onto the watchlist and mark unnamed tame units
-for slaughter as soon as they arrive in your fort. Settings already made
-for specific races will be left untouched. ::
-
-     autobutcher target 0 0 0 0 new
-     autobutcher autowatch
-     autobutcher start
-
-Stop watching the races alpaca and cat, but remember the target count
-settings so that you can use 'unwatch' without the need to enter the
-values again. Note: 'autobutcher unwatch all' works, but only makes sense
-if you want to keep the plugin running with the 'autowatch' feature or manually
-add some new races with 'watch'. If you simply want to stop it completely use
-'autobutcher stop' instead. ::
-
-    autobutcher unwatch ALPACA CAT
-
-autonestbox
-===========
-Assigns unpastured female egg-layers to nestbox zones. Requires that you create
-pen/pasture zones above nestboxes. If the pen is bigger than 1x1 the nestbox
-must be in the top left corner. Only 1 unit will be assigned per pen, regardless
-of the size. The age of the units is currently not checked, most birds grow up
-quite fast. Egglayers who are also grazers will be ignored, since confining them
-to a 1x1 pasture is not a good idea. Only tame and domesticated own units are
-processed since pasturing half-trained wild egglayers could destroy your neat
-nestbox zones when they revert to wild. When called without options autonestbox
-will instantly run once.
-
-Options:
-
-:start:        Start running every X frames (df simulation ticks).
-               Default: X=6000, which would be every 60 seconds at 100fps.
-:stop:         Stop running automatically.
-:sleep:        Must be followed by number X. Changes the timer to sleep X
-               frames between runs.

From 5e9dde8a61a8a409c56210106ad3617b7ccfe477 Mon Sep 17 00:00:00 2001
From: Myk <myk002@yahoo.com>
Date: Thu, 4 Aug 2022 00:22:07 -0700
Subject: [PATCH 432/854] Update autobutcher.rst

---
 docs/plugins/autobutcher.rst | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/docs/plugins/autobutcher.rst b/docs/plugins/autobutcher.rst
index e77e13232..6bd9a02ce 100644
--- a/docs/plugins/autobutcher.rst
+++ b/docs/plugins/autobutcher.rst
@@ -37,10 +37,10 @@ Usage:
     Stop auto-adding new races to the watch list.
 ``autobutcher target <fk> <mk> <fa> <ma> all|new|<race> [<race> ...]``
     Set target counts for the specified races:
-        fk = number of female kids
-        mk = number of male kids
-        fa = number of female adults
-        ma = number of female adults
+    - fk = number of female kids
+    - mk = number of male kids
+    - fa = number of female adults
+    - ma = number of female adults
     If you specify ``all``, then this command will set the counts for all races
     on your current watchlist (including the races which are currenly set to
     'unwatched') and sets the new default for future watch commands. If you
@@ -171,5 +171,3 @@ add some new races with 'watch'. If you simply want to stop it completely use
 'autobutcher stop' instead. ::
 
     autobutcher unwatch ALPACA CAT
-
-const string autobutcher_help =

From 8f242ac5cc391fd6be141b45ea8c2640b9bc39cc Mon Sep 17 00:00:00 2001
From: Myk <myk002@yahoo.com>
Date: Thu, 4 Aug 2022 00:24:36 -0700
Subject: [PATCH 433/854] Update tweak.rst

---
 docs/plugins/tweak.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/plugins/tweak.rst b/docs/plugins/tweak.rst
index 56d465f78..fff1a4512 100644
--- a/docs/plugins/tweak.rst
+++ b/docs/plugins/tweak.rst
@@ -62,7 +62,7 @@ Commands that persist until disabled or DF quits:
     Adds an option to butcher units when viewing cages with :kbd:`q`.
 ``civ-view-agreement``
     Fixes overlapping text on the "view agreement" screen.
-``condition-material`` 
+``condition-material``
     Fixes a crash in the work order contition material list (:bug:`9905`).
 ``craft-age-wear``
     Fixes crafted items not wearing out over time (:bug:`6003`). With this

From feed91d098354d7963f065195e328ed89af80549 Mon Sep 17 00:00:00 2001
From: "pre-commit-ci[bot]"
 <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Date: Thu, 4 Aug 2022 07:34:32 +0000
Subject: [PATCH 434/854] [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci
---
 docs/plugins/petcapRemover.rst | 1 -
 1 file changed, 1 deletion(-)

diff --git a/docs/plugins/petcapRemover.rst b/docs/plugins/petcapRemover.rst
index e3ce47916..3d9739ea3 100644
--- a/docs/plugins/petcapRemover.rst
+++ b/docs/plugins/petcapRemover.rst
@@ -29,4 +29,3 @@ Usage:
 ``petcapRemover pregtime <ticks>``
     Sets the pregnancy duration to the specified number of ticks. The default
     value is 200,000 ticks, which is the natural pet pregnancy duration.
-

From 46c3862a082c5d02013deed45db17902d4b24905 Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Fri, 5 Aug 2022 08:08:34 -0700
Subject: [PATCH 435/854] update docs for zone

---
 docs/plugins/zone.rst | 254 +++++++++++++++++++++++-------------------
 plugins/zone.cpp      | 140 ++---------------------
 2 files changed, 150 insertions(+), 244 deletions(-)

diff --git a/docs/plugins/zone.rst b/docs/plugins/zone.rst
index a3112c147..5e01a12ac 100644
--- a/docs/plugins/zone.rst
+++ b/docs/plugins/zone.rst
@@ -1,130 +1,158 @@
 zone
 ====
-Helps a bit with managing activity zones (pens, pastures and pits) and cages.
-
+Tags:
 :dfhack-keybind:`zone`
 
-Options:
-
-:set:         Set zone or cage under cursor as default for future assigns.
-:assign:      Assign unit(s) to the pen or pit marked with the 'set' command.
-              If no filters are set a unit must be selected in the in-game ui.
-              Can also be followed by a valid zone id which will be set
-              instead.
-:unassign:    Unassign selected creature from it's zone.
-:nick:        Mass-assign nicknames, must be followed by the name you want
-              to set.
-:remnick:     Mass-remove nicknames.
-:enumnick:    Assign enumerated nicknames (e.g. "Hen 1", "Hen 2"...). Must be
-              followed by the prefix to use in nicknames.
-:tocages:     Assign unit(s) to cages inside a pasture.
-:uinfo:       Print info about unit(s). If no filters are set a unit must
-              be selected in the in-game ui.
-:zinfo:       Print info about zone(s). If no filters are set zones under
-              the cursor are listed.
-:verbose:     Print some more info.
-:filters:     Print list of valid filter options.
-:examples:    Print some usage examples.
-:not:         Negates the next filter keyword.
-
-Filters:
-
-:all:           Process all units (to be used with additional filters).
-:count:         Must be followed by a number. Process only n units (to be used
-                with additional filters).
-:unassigned:    Not assigned to zone, chain or built cage.
-:minage:        Minimum age. Must be followed by number.
-:maxage:        Maximum age. Must be followed by number.
-:race:          Must be followed by a race RAW ID (e.g. BIRD_TURKEY, ALPACA,
-                etc). Negatable.
-:caged:         In a built cage. Negatable.
-:own:           From own civilization. Negatable.
-:merchant:      Is a merchant / belongs to a merchant. Should only be used for
-                pitting, not for stealing animals (slaughter should work).
-:war:           Trained war creature. Negatable.
-:hunting:       Trained hunting creature. Negatable.
-:tamed:         Creature is tame. Negatable.
-:trained:       Creature is trained. Finds war/hunting creatures as well as
-                creatures who have a training level greater than 'domesticated'.
-                If you want to specifically search for war/hunting creatures use
-                'war' or 'hunting' Negatable.
-:trainablewar:  Creature can be trained for war (and is not already trained for
-                war/hunt). Negatable.
-:trainablehunt: Creature can be trained for hunting (and is not already trained
-                for war/hunt). Negatable.
-:male:          Creature is male. Negatable.
-:female:        Creature is female. Negatable.
-:egglayer:      Race lays eggs. Negatable.
-:grazer:        Race is a grazer. Negatable.
-:milkable:      Race is milkable. Negatable.
+Manage activity zones, cages, and the animals therein.
+
+Usage:
+
+``enable zone``
+   Add helpful filters to the pen/pasture sidebar menu (e.g. show only caged
+   grazers).
+``zone set``
+   Set zone or cage under cursor as default for future ``assign`` or ``tocages``
+   commands.
+``zone assign [<zone id>] [<filter>]``
+   Assign unit(s) to the zone with the given ID, or to the most recent pen or
+   pit marked with the ``set`` command. If no filters are set, then a unit must
+   be selected in the in-game ui.
+``zone unassign [<filter>]``
+    Unassign selected creature from its zone.
+``zone nick <nickname> [<filter>]``
+    Assign the given nickname to the selected animal or the animals matched by
+    the given filter.
+``zone remnick [<filter>]``
+    Remove nicknames from the selected animal or the animals matched by the
+    given filter.
+``zone enumnick <nickname prefix> [<filter>]``
+    Assign enumerated nicknames (e.g. "Hen 1", "Hen 2"...).
+``zone tocages [<filter>]``
+    Assign unit(s) to cages that have been built inside the pasture selected
+    with the ``set`` command.
+``zone uinfo [<filter>]``
+    Print info about unit(s). If no filters are set, then a unit must be
+    selected in the in-game ui.
+``zone zinfo``
+    Print info about the zone(s) and any buildings under the cursor.
+
+Examples
+--------
+
+Before any ``assign`` or ``tocages`` examples can be used, you must first move
+the cursor over a pen/pasture or pit zone and run ``zone set`` to select the
+zone.
+
+``zone assign all own ALPACA minage 3 maxage 10``
+    Assign all of your alpacas who are between 3 and 10 years old to the
+    selected pasture.
+``zone assign all own caged grazer nick ineedgrass``
+    Assign all of your grazers who are sitting in cages on stockpiles (e.g.
+    after buying them from merchants) to the selected pasture and give them the
+    nickname 'ineedgrass'.
+``zone assign all own not grazer not race CAT``
+    Assign all of your animals who are not grazers (excluding cats) to the
+    selected pasture.
+    "  zone assign all own milkable not grazer\n"
+``zone assign all own female milkable not grazer``
+    Assign all of your non-grazing milkable creatures to the selected pasture or
+    cage.
+``zone assign all own race DWARF maxage 2``
+    Throw all useless kids into a pit :) They'll be fine I'm sure.
+``zone nick donttouchme``
+    Nicknames all units in the current default zone or cage to 'donttouchme'.
+    This is especially useful for protecting a group of animals assigned to a
+    pasture or cage from being "processed" by `autobutcher`.
+``zone tocages count 50 own tame male not grazer``
+    Stuff up to 50 of your tame male animals who are not grazers into cages
+    built on the current default zone.
+
+Filters
+-------
+
+:all:            Process all units.
+:count <n>:      Process only up to n units.
+:unassigned:     Not assigned to zone, chain or built cage.
+:minage <years>: Minimum age. Must be followed by number.
+:maxage <years>: Maximum age. Must be followed by number.
+:not:            Negates the next filter keyword. All of the keywords documented
+                 below are negatable.
+:race:           Must be followed by a race RAW ID (e.g. BIRD_TURKEY, ALPACA,
+                 etc).
+:caged:          In a built cage.
+:own:            From own civilization. You'll usually want to include this
+                 filter.
+:war:            Trained war creature.
+:hunting:        Trained hunting creature.
+:tamed:          Creature is tame.
+:trained:        Creature is trained. Finds war/hunting creatures as well as
+                 creatures who have a training level greater than 'domesticated'.
+                 If you want to specifically search for war/hunting creatures
+                 use ``war`` or ``hunting``.
+:trainablewar:   Creature can be trained for war (and is not already trained for
+                 war/hunt).
+:trainablehunt:  Creature can be trained for hunting (and is not already trained
+                 for war/hunt).
+:male:           Creature is male.
+:female:         Creature is female.
+:egglayer:       Race lays eggs. If you want units who actually lay eggs, also
+                 specify ``female``.
+:grazer:         Race is a grazer.
+:milkable:       Race is milkable. If you want units who actually can be milked,
+                 also specify ``female``.
+:merchant:       Is a merchant / belongs to a merchant. Should only be used for
+                 pitting or slaughtering, not for stealing animals.
 
 Usage with single units
 -----------------------
-One convenient way to use the zone tool is to bind the command 'zone assign' to
-a hotkey, maybe also the command 'zone set'. Place the in-game cursor over
-a pen/pasture or pit, use 'zone set' to mark it. Then you can select units
-on the map (in 'v' or 'k' mode), in the unit list or from inside cages
-and use 'zone assign' to assign them to their new home. Allows pitting your
-own dwarves, by the way.
-
-Usage with filters
-------------------
-All filters can be used together with the 'assign' command.
-
-Restrictions: It's not possible to assign units who are inside built cages
-or chained because in most cases that won't be desirable anyways.
-It's not possible to cage owned pets because in that case the owner
+One convenient way to use the zone tool is to bind the commands ``zone assign``
+and ``zone set`` to hotkeys. Place the in-game cursor over a pen/pasture or pit
+and use the ``zone set`` hotkey to mark it. Then you can select units on the map
+(in 'v' or 'k' mode), in the unit list or from inside cages and use the
+``zone assign`` hotkey to assign them to their new home. Allows pitting your own
+dwarves, by the way.
+
+Matching with filters
+---------------------
+All filters can be used together with the ``assign`` and ``tocages`` commands.
+
+Note that it's not possible to reassign units who are inside built cages or
+chained, though this likely won't matter because if you have gone to the trouble
+of creating a zoo or chaining a creature, you probably wouldn't want them
+reassigned anyways. Also, ``zone`` will avoid caging owned pets because the owner
 uncages them after a while which results in infinite hauling back and forth.
 
-Usually you should always use the filter 'own' (which implies tame) unless you
-want to use the zone tool for pitting hostiles. 'own' ignores own dwarves unless
-you specify 'race DWARF' (so it's safe to use 'assign all own' to one big
-pasture if you want to have all your animals at the same place). 'egglayer' and
-'milkable' should be used together with 'female' unless you have a mod with
-egg-laying male elves who give milk or whatever. Merchants and their animals are
-ignored unless you specify 'merchant' (pitting them should be no problem,
-but stealing and pasturing their animals is not a good idea since currently they
-are not properly added to your own stocks; slaughtering them should work).
+Most filters should include an ``own`` element (which implies ``tame``) unless
+you want to use ``zone assign`` for pitting hostiles. The ``own`` filter ignores
+dwarves unless you explicitly specify ``race DWARF`` (so it's safe to use
+``assign all own`` to one big pasture if you want to have all your animals in
+the same place).
 
-Most filters can be negated (e.g. 'not grazer' -> race is not a grazer).
+The ``egglayer`` and ``milkable`` filters should be used together with
+``female`` unless you want the males of the race included. Merchants and their
+animals are ignored unless you specify ``merchant`` (pitting them should be no
+problem, but stealing and pasturing their animals is not a good idea since
+currently they are not properly added to your own stocks; slaughtering them
+should work).
+
+Most filters can be negated (e.g. ``not grazer`` -> race is not a grazer).
 
 Mass-renaming
 -------------
-Using the 'nick' command you can set the same nickname for multiple units.
-If used without 'assign', 'all' or 'count' it will rename all units in the
-current default target zone. Combined with 'assign', 'all' or 'count' (and
-further optional filters) it will rename units matching the filter conditions.
+
+Using the ``nick`` command, you can set the same nickname for multiple units.
+If used without ``assign``, ``all``, or ``count``, it will rename all units in
+the current default target zone. Combined with ``assign``, ``all``, or ``count``
+(and likely further optional filters) it will rename units matching the filter
+conditions.
 
 Cage zones
 ----------
-Using the 'tocages' command you can assign units to a set of cages, for example
-a room next to your butcher shop(s). They will be spread evenly among available
-cages to optimize hauling to and butchering from them. For this to work you need
-to build cages and then place one pen/pasture activity zone above them, covering
-all cages you want to use. Then use 'zone set' (like with 'assign') and use
-'zone tocages filter1 filter2 ...'. 'tocages' overwrites 'assign' because it
-would make no sense, but can be used together with 'nick' or 'remnick' and all
-the usual filters.
 
-Examples
---------
-``zone assign all own ALPACA minage 3 maxage 10``
-   Assign all own alpacas who are between 3 and 10 years old to the selected
-   pasture.
-``zone assign all own caged grazer nick ineedgrass``
-   Assign all own grazers who are sitting in cages on stockpiles (e.g. after
-   buying them from merchants) to the selected pasture and give them
-   the nickname 'ineedgrass'.
-``zone assign all own not grazer not race CAT``
-   Assign all own animals who are not grazers, excluding cats.
-``zone assign count 5 own female milkable``
-   Assign up to 5 own female milkable creatures to the selected pasture.
-``zone assign all own race DWARF maxage 2``
-   Throw all useless kids into a pit :)
-``zone nick donttouchme``
-   Nicknames all units in the current default zone or cage to 'donttouchme'.
-   Mostly intended to be used for special pastures or cages which are not marked
-   as rooms you want to protect from autobutcher.
-``zone tocages count 50 own tame male not grazer``
-   Stuff up to 50 owned tame male animals who are not grazers into cages built
-   on the current default zone.
+The ``tocages`` command assigns units to a set of cages, for example a room next
+to your butcher shop(s). Units will be spread evenly among available cages to
+optimize hauling to and butchering from them. For this to work you need to build
+cages and then place one pen/pasture activity zone above them, covering all
+cages you want to use. Then use ``zone set`` (like with ``assign``) and run
+``zone tocages <filter>``. ``tocages`` can be used together with ``nick`` or
+``remnick`` to adjust nicknames while assigning to cages.
diff --git a/plugins/zone.cpp b/plugins/zone.cpp
index 60f1f2b61..a3a0f2431 100644
--- a/plugins/zone.cpp
+++ b/plugins/zone.cpp
@@ -66,105 +66,6 @@ REQUIRE_GLOBAL(ui_building_in_assign);
 REQUIRE_GLOBAL(ui_menu_width);
 REQUIRE_GLOBAL(world);
 
-static command_result df_zone (color_ostream &out, vector <string> & parameters);
-
-const string zone_help =
-    "Allows easier management of pens/pastures, pits and cages.\n"
-    "Commands:\n"
-    "  help         - print this help message\n"
-    "  filters      - print list of supported filters\n"
-    "  examples     - print some usage examples\n"
-    "  set          - set zone under cursor as default for future assigns\n"
-    "  assign       - assign creature(s) to a pen or pit\n"
-    "                 if no filters are used, a single unit must be selected.\n"
-    "                 can be followed by valid building id which will then be set.\n"
-    "                 building must be a pen/pasture, pit or cage.\n"
-    "  slaughter    - mark creature(s) for slaughter\n"
-    "                 if no filters are used, a single unit must be selected.\n"
-    "                 with filters named units are ignored unless specified.\n"
-    "  unassign     - unassign selected creature(s) from zone or cage\n"
-    "  nick         - give unit(s) nicknames (e.g. all units in a cage)\n"
-    "  enumnick     - give unit(s) enumerated nicknames (e.g Hen 1, Hen 2)\n"
-    "  remnick      - remove nicknames\n"
-    "  tocages      - assign to (multiple) built cages inside a pen/pasture\n"
-    "                 spreads creatures evenly among cages for faster hauling.\n"
-    "  uinfo        - print info about selected units\n"
-    "  zinfo        - print info about zone(s) under cursor\n"
-    "Options:\n"
-    "  verbose      - print some more info, mostly useless debug stuff\n"
-    ;
-
-const string zone_help_filters =
-    "Filters (to be used in combination with 'all' or 'count'):\n"
-    "Required (one of):\n"
-    "  all          - process all units\n"
-    "                 should be used in combination with further filters\n"
-    "  count        - must be followed by number. process X units\n"
-    "                 should be used in combination with further filters\n"
-    "Others (may be used with 'not' prefix):\n"
-    "  age          - exact age. must be followed by number\n"
-    "  caged        - in a built cage\n"
-    "  egglayer     - race lays eggs (use together with 'female')\n"
-    "  female       - obvious\n"
-    "  grazer       - is a grazer\n"
-    "  male         - obvious\n"
-    "  maxage       - maximum age. must be followed by number\n"
-    "  merchant     - is a merchant / belongs to a merchant\n"
-    "                 can be used to pit merchants and slaughter their animals\n"
-    "                 (could have weird effects during trading, be careful)\n"
-    "                 ('not merchant' is set by default)\n"
-    "  milkable     - race is milkable (use together with 'female')\n"
-    "  minage       - minimum age. must be followed by number\n"
-    "  named        - has name or nickname\n"
-    "                 ('not named' is set by default when using the 'slaughter' command)\n"
-    "  own          - from own civilization\n"
-    "  race         - must be followed by a race raw id (e.g. BIRD_TURKEY)\n"
-    "  tame         - tamed\n"
-    "  trainablehunt- can be trained for hunting (and is not already trained)\n"
-    "  trainablewar - can be trained for war (and is not already trained)\n"
-    "  trained      - obvious\n"
-    "  unassigned   - not assigned to zone, chain or built cage\n"
-    "  war          - trained war creature\n"
-    ;
-
-const string zone_help_examples =
-    "Example for assigning single units:\n"
-    "  (ingame) move cursor to a pen/pasture or pit zone\n"
-    "  (dfhack) 'zone set' to use this zone for future assignments\n"
-    "  (dfhack) map 'zone assign' to a hotkey of your choice\n"
-    "  (ingame) select unit with 'v', 'k' or from unit list or inside a cage\n"
-    "  (ingame) press hotkey to assign unit to it's new home (or pit)\n"
-    "Examples for assigning with filters:\n"
-    "  (this assumes you have already set up a target zone)\n"
-    "  zone assign all own grazer maxage 10\n"
-    "  zone assign all own milkable not grazer\n"
-    "  zone assign count 5 own female milkable\n"
-    "  zone assign all own race DWARF maxage 2\n"
-    "    throw all useless kids into a pit :)\n"
-    "Notes:\n"
-    "  Unassigning per filters ignores built cages and chains currently. Usually you\n"
-    "  should always use the filter 'own' (which implies tame) unless you want to\n"
-    "  use the zone tool for pitting hostiles. 'own' ignores own dwarves unless you\n"
-    "  specify 'race DWARF' and it ignores merchants and their animals unless you\n"
-    "  specify 'merchant' (so it's safe to use 'assign all own' to one big pasture\n"
-    "  if you want to have all your animals at the same place).\n"
-    "  'egglayer' and 'milkable' should be used together with 'female'\n"
-    "  well, unless you have a mod with egg-laying male elves who give milk...\n";
-
-
-///////////////
-// Various small tool functions
-// probably many of these should be moved to Unit.h and Building.h sometime later...
-
-// static df::general_ref_building_civzone_assignedst * createCivzoneRef();
-// static bool unassignUnitFromBuilding(df::unit* unit);
-// static command_result assignUnitToZone(color_ostream& out, df::unit* unit, df::building* building, bool verbose);
-// static void unitInfo(color_ostream & out, df::unit* creature, bool verbose);
-// static void zoneInfo(color_ostream & out, df::building* building, bool verbose);
-// static void cageInfo(color_ostream & out, df::building* building, bool verbose);
-// static void chainInfo(color_ostream & out, df::building* building, bool verbose);
-static bool isInBuiltCageRoom(df::unit*);
-
 static void doMarkForSlaughter(df::unit* unit)
 {
     unit->flags2.bits.slaughter = 1;
@@ -184,6 +85,8 @@ static bool hasValidMapPos(df::unit* unit)
         return false;
 }
 
+static bool isInBuiltCageRoom(df::unit*);
+
 // dump some unit info
 static void unitInfo(color_ostream & out, df::unit* unit, bool verbose = false)
 {
@@ -1127,8 +1030,7 @@ static struct zone_param_filters_init { zone_param_filters_init() {
     zone_param_filters["maxage"] = make_pair(1, createMaxAgeFilter);
 }} zone_param_filters_init_;
 
-static command_result df_zone (color_ostream &out, vector <string> & parameters)
-{
+static command_result df_zone(color_ostream &out, vector <string> & parameters) {
     CoreSuspender suspend;
 
     if (!Maps::IsValid())
@@ -1160,18 +1062,7 @@ static command_result df_zone (color_ostream &out, vector <string> & parameters)
 
         if (p0 == "help" || p0 == "?")
         {
-            out << zone_help << endl;
-            return CR_OK;
-        }
-        if (p0 == "filters")
-        {
-            out << zone_help_filters << endl;
-            return CR_OK;
-        }
-        if (p0 == "examples")
-        {
-            out << zone_help_examples << endl;
-            return CR_OK;
+            return CR_WRONG_USAGE;
         }
         else if(p0 == "zinfo")
         {
@@ -2275,13 +2166,8 @@ IMPLEMENT_VMETHOD_INTERPOSE(zone_hook, feed);
 IMPLEMENT_VMETHOD_INTERPOSE(zone_hook, render);
 //END zone filters
 
-DFhackCExport command_result plugin_enable ( color_ostream &out, bool enable)
-{
-    if (!gps)
-        return CR_FAILURE;
-
-    if (enable != is_enabled)
-    {
+DFhackCExport command_result plugin_enable(color_ostream &out, bool enable) {
+    if (enable != is_enabled) {
         if (!INTERPOSE_HOOK(zone_hook, feed).apply(enable) ||
             !INTERPOSE_HOOK(zone_hook, render).apply(enable))
             return CR_FAILURE;
@@ -2292,18 +2178,10 @@ DFhackCExport command_result plugin_enable ( color_ostream &out, bool enable)
     return CR_OK;
 }
 
-DFhackCExport command_result plugin_init ( color_ostream &out, std::vector <PluginCommand> &commands)
-{
+DFhackCExport command_result plugin_init(color_ostream &out, std::vector <PluginCommand> &commands) {
     commands.push_back(PluginCommand(
         "zone",
-        "manage activity zones.",
-        df_zone,
-        false,
-        zone_help.c_str()));
-    return CR_OK;
-}
-
-DFhackCExport command_result plugin_shutdown ( color_ostream &out )
-{
+        "Manage activity zones.",
+        df_zone));
     return CR_OK;
 }

From 6f48c1f4d063cef6a978b6cece81a7076e530cb7 Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Fri, 5 Aug 2022 08:08:47 -0700
Subject: [PATCH 436/854] remove some cruft from autobutcher docs

---
 docs/plugins/autobutcher.rst | 86 +++++-------------------------------
 1 file changed, 11 insertions(+), 75 deletions(-)

diff --git a/docs/plugins/autobutcher.rst b/docs/plugins/autobutcher.rst
index 6bd9a02ce..a6b69338c 100644
--- a/docs/plugins/autobutcher.rst
+++ b/docs/plugins/autobutcher.rst
@@ -67,8 +67,6 @@ Usage:
     default command if autobutcher is run without parameters.
 ``autobutcher list_export``
     Print commands required to set the current settings in another fort.
-    Useful to run form dfhack-run like:
-    ``dfhack-run autobutcher list_export > autobutcher.script``
 
 To see a list of all races, run this command:
 
@@ -76,6 +74,16 @@ To see a list of all races, run this command:
 
 Though not all the races listed there are tameable/butcherable.
 
+.. note::
+
+    Settings and watchlist are stored in the savegame, so you can have different
+    settings for each save. If you want to copy your watchlist to another,
+    savegame, you can export the commands required to recreate your settings.
+
+    To export, open an external terminal in the DF directory, and run
+    ``dfhack-run autobutcher list_export > filename.txt``.  To import, load your
+    new save and run ``script filename.txt`` in the DFHack terminal.
+
 Examples
 --------
 
@@ -91,6 +99,7 @@ alpacas, sheep, and llamas (for wool), and pigs (for milk and meat). All other
 unnamed tame units will be marked for slaughter as soon as they arrive in your
 fortress::
 
+    enable autobutcher
     autobutcher target 2 2 2 2 DOG
     autobutcher target 1 1 2 2 CAT
     autobutcher target 50 50 14 2 BIRD_GOOSE
@@ -98,76 +107,3 @@ fortress::
     autobutcher target 5 5 6 2 PIG
     autobutcher target 0 0 0 0 new
     autobutcher autowatch
-
-Options:
-
-:example:      Print some usage examples.
-:start:        Start running every X frames (df simulation ticks).
-               Default: X=6000, which would be every 60 seconds at 100fps.
-:stop:         Stop running automatically.
-:sleep <x>:    Changes the timer to sleep X frames between runs.
-:watch R:      Start watching a race. R can be a valid race RAW id (ALPACA,
-               BIRD_TURKEY, etc) or a list of ids seperated by spaces or
-               the keyword 'all' which affects all races on your current
-               watchlist.
-:unwatch R:    Stop watching race(s). The current target settings will be
-               remembered. R can be a list of ids or the keyword 'all'.
-:forget R:     Stop watching race(s) and forget it's/their target settings.
-               R can be a list of ids or the keyword 'all'.
-:autowatch:    Automatically adds all new races (animals you buy from merchants,
-               tame yourself or get from migrants) to the watch list using
-               default target count.
-:noautowatch:  Stop auto-adding new races to the watchlist.
-:list:         Print the current status and watchlist.
-:list_export:  Print the commands needed to set up status and watchlist,
-               which can be used to import them to another save (see notes).
-:target <fk> <mk> <fa> <ma> <R>:
-               Set target count for specified race(s).  The first four arguments
-               are the number of female and male kids, and female and male adults.
-               R can be a list of spceies ids, or the keyword ``all`` or ``new``.
-               ``R = 'all'``: change target count for all races on watchlist
-               and set the new default for the future. ``R = 'new'``: don't touch
-               current settings on the watchlist, only set the new default
-               for future entries.
-:list_export:  Print the commands required to rebuild your current settings.
-
-.. note::
-
-    Settings and watchlist are stored in the savegame, so that you can have
-    different settings for each save. If you want to copy your watchlist to
-    another savegame you must export the commands required to recreate your settings.
-
-    To export, open an external terminal in the DF directory, and run
-    ``dfhack-run autobutcher list_export > filename.txt``.  To import, load your
-    new save and run ``script filename.txt`` in the DFHack terminal.
-
-
-Examples:
-
-You want to keep max 7 kids (4 female, 3 male) and max 3 adults (2 female,
-1 male) of the race alpaca. Once the kids grow up the oldest adults will get
-slaughtered. Excess kids will get slaughtered starting with the youngest
-to allow that the older ones grow into adults. Any unnamed cats will
-be slaughtered as soon as possible. ::
-
-     autobutcher target 4 3 2 1 ALPACA BIRD_TURKEY
-     autobutcher target 0 0 0 0 CAT
-     autobutcher watch ALPACA BIRD_TURKEY CAT
-     autobutcher start
-
-Automatically put all new races onto the watchlist and mark unnamed tame units
-for slaughter as soon as they arrive in your fort. Settings already made
-for specific races will be left untouched. ::
-
-     autobutcher target 0 0 0 0 new
-     autobutcher autowatch
-     autobutcher start
-
-Stop watching the races alpaca and cat, but remember the target count
-settings so that you can use 'unwatch' without the need to enter the
-values again. Note: 'autobutcher unwatch all' works, but only makes sense
-if you want to keep the plugin running with the 'autowatch' feature or manually
-add some new races with 'watch'. If you simply want to stop it completely use
-'autobutcher stop' instead. ::
-
-    autobutcher unwatch ALPACA CAT

From ebfe00b112a69fdea0ea9a50116e5529f1e620db Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Fri, 5 Aug 2022 10:08:23 -0700
Subject: [PATCH 437/854] editing pass of short descriptions

and fix some short description parsing
---
 docs/plugins/jobutils.rst   |  2 ++
 docs/plugins/pathable.rst   |  3 ++-
 docs/plugins/prospector.rst |  4 ++--
 docs/plugins/resume.rst     |  2 +-
 docs/plugins/search.rst     |  7 ++++---
 docs/plugins/xlsxreader.rst |  2 +-
 library/lua/helpdb.lua      | 29 +++++++++++++++++++----------
 7 files changed, 31 insertions(+), 18 deletions(-)

diff --git a/docs/plugins/jobutils.rst b/docs/plugins/jobutils.rst
index e8434abdc..2ecf2b591 100644
--- a/docs/plugins/jobutils.rst
+++ b/docs/plugins/jobutils.rst
@@ -7,6 +7,8 @@ Tags:
 :dfhack-keybind:`job-duplicate`
 :dfhack-keybind:`job-material`
 
+Inspect or modify details of workshop jobs.
+
 Usage:
 
 ``job``
diff --git a/docs/plugins/pathable.rst b/docs/plugins/pathable.rst
index daf7697bc..7a906ad89 100644
--- a/docs/plugins/pathable.rst
+++ b/docs/plugins/pathable.rst
@@ -1,6 +1,7 @@
 pathable
 ========
 
-Provides a Lua API for marking tiles that are reachable from the cursor.
+Marks tiles that are reachable from the cursor. This plugin provides a Lua API,
+but no direct commands.
 
 See `pathable-api` for details.
diff --git a/docs/plugins/prospector.rst b/docs/plugins/prospector.rst
index 95436abec..718f92fa6 100644
--- a/docs/plugins/prospector.rst
+++ b/docs/plugins/prospector.rst
@@ -5,8 +5,8 @@ prospector
 Tags:
 :dfhack-keybind:`prospect`
 
-Shows a summary of resources that exist on the map or an estimate of resources
-available in the selected embark area.
+Shows a summary of resources that exist on the map. It can also calculate an
+estimate of resources available in the selected embark area.
 
 Usage::
 
diff --git a/docs/plugins/resume.rst b/docs/plugins/resume.rst
index d8feb0896..7afb9be0d 100644
--- a/docs/plugins/resume.rst
+++ b/docs/plugins/resume.rst
@@ -1,7 +1,7 @@
 resume
 ======
 Tags:
-:dfhack-keybind:``
+:dfhack-keybind:`resume`
 
 Color planned buildings based on their suspend status. When enabled, this plugin
 will display a colored 'X' over suspended buildings. When run as a command, it
diff --git a/docs/plugins/search.rst b/docs/plugins/search.rst
index c8f5d68b3..edf6fb47c 100644
--- a/docs/plugins/search.rst
+++ b/docs/plugins/search.rst
@@ -4,9 +4,10 @@ search
 ======
 Tags:
 
-The search plugin adds search capabilities to the Stocks, Animals, Trading,
-Stockpile, Noble (assignment candidates), Military (position candidates),
-Burrows (unit list), Rooms, Announcements, Job List, and Unit List screens.
+Adds search capabilities to the UI. The Stocks, Animals, Trading, Stockpile,
+Noble (assignment candidates), Military (position candidates), Burrows (unit
+list), Rooms, Announcements, Job List, and Unit List screens all get hotkeys
+that allow you to dynamically filter the displayed lists.
 
 Usage::
 
diff --git a/docs/plugins/xlsxreader.rst b/docs/plugins/xlsxreader.rst
index 6429ceedc..d09b69644 100644
--- a/docs/plugins/xlsxreader.rst
+++ b/docs/plugins/xlsxreader.rst
@@ -1,6 +1,6 @@
 xlsxreader
 ==========
 
-Provides a Lua API for reading .xlsx files.
+Provides a Lua API for reading xlsx files.
 
 See `xlsxreader-api` for details.
diff --git a/library/lua/helpdb.lua b/library/lua/helpdb.lua
index cf8e86af5..a23002e57 100644
--- a/library/lua/helpdb.lua
+++ b/library/lua/helpdb.lua
@@ -142,11 +142,11 @@ end
 --                             value is the comment character.)
 local function update_entry(entry, iterator, opts)
     opts = opts or {}
-    local lines = {}
+    local lines, tags = {}, ''
     local first_line_is_short_help = opts.first_line_is_short_help
     local begin_marker_found,header_found = not opts.begin_marker,opts.no_header
     local tags_found, short_help_found = false, opts.skip_short_help
-    local in_short_help = false
+    local in_tags, in_keybinding, in_short_help = false, false, false
     for line in iterator do
         if not short_help_found and first_line_is_short_help then
             line = line:trim()
@@ -179,16 +179,21 @@ local function update_entry(entry, iterator, opts)
         end
         if not header_found and line:find('%w') then
             header_found = true
-        elseif not tags_found and line:find('^[*]*Tags:[*]* [%w, ]+$') then
-            local _,_,tags = line:trim():find('[*]*Tags:[*]* *(.*)')
-            entry.tags = {}
-            for _,tag in ipairs(tags:split('[ ,]+')) do
-                entry.tags[tag] = true
+        elseif in_tags then
+            if #line == 0 then
+                in_tags = false
+            else
+                tags = tags .. line
             end
-            tags_found = true
+        elseif not tags_found and line:find('^[*]*Tags:[*]*') then
+            _,_,tags = line:trim():find('[*]*Tags:[*]* *(.*)')
+            in_tags, tags_found = true, true
+        elseif in_keybinding then
+            if #line == 0 then in_keybinding = false end
+        elseif line:find('^[*]*Keybinding:') then
+            in_keybinding = true
         elseif not short_help_found and
-                not line:find('^[*]*Keybinding:') and
-                line:find('%w') then
+                line:find('^%w') then
             if in_short_help then
                 entry.short_help = entry.short_help .. ' ' .. line
             else
@@ -205,6 +210,10 @@ local function update_entry(entry, iterator, opts)
         table.insert(lines, line)
         ::continue::
     end
+    entry.tags = {}
+    for _,tag in ipairs(tags:split('[ ,]+')) do
+        entry.tags[tag] = true
+    end
     if #lines > 0 then
         entry.long_help = table.concat(lines, '\n')
     end

From f7acc5cfc6a28e72fa4ab50e5d63042a5cf96e6c Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Fri, 5 Aug 2022 17:55:33 -0700
Subject: [PATCH 438/854] sync tags spreadsheet to git

spreadsheet - https://docs.google.com/spreadsheets/d/1hiDlo8M_bB_1jE-5HRs2RrrA_VZ4cRu9VXaTctX_nwk/edit#gid=170388995
sync command - for fname in *rst; do name=$(echo $fname | sed 's/[.]rst//'); tagline=$(egrep ",$name," ~/Downloads/DFHack\ taxonomy\ -\ Tool\ tags.csv | ~/Downloads/csvtotags.sh); sed -ri "s;[*]*Tags:.*;$tagline;" $fname; done
contents of csvtotags.sh -

fgrep . | sed -r 's/^[^,]+,([^,]+),[^.]+[.]"?,/\1,/' | awk -F, '
function tag(idx, tagname) {
    if ($idx == "TRUE") {
        if (hastag == 1) {printf(", ")}
        printf("`tag/%s`", tagname)
        hastag = 1
    }
}

{
printf("%s", "**Tags:** ")

hastag = 0
tag(2, "adventure")
tag(3, "fort")
tag(4, "legends")
tag(5, "embark")
tag(6, "system")
tag(7, "dev")
tag(8, "auto")
tag(9, "productivity")
tag(10, "inspection")
tag(11, "design")
tag(12, "quickfort")
tag(13, "interface")
tag(14, "fps")
tag(15, "fix")
tag(16, "mod")
tag(17, "armok")
tag(18, "animals")
tag(19, "buildings")
tag(20, "items")
tag(21, "jobs")
tag(22, "map")
tag(23, "labors")
tag(24, "units")
tag(25, "stockpiles")
tag(26, "trees")

printf("\n")
}
'
---
 docs/Tags.rst                               | 29 +++++++++++++--------
 docs/builtins/alias.rst                     |  2 +-
 docs/builtins/cls.rst                       |  2 +-
 docs/builtins/die.rst                       |  2 +-
 docs/builtins/disable.rst                   |  2 +-
 docs/builtins/enable.rst                    |  2 +-
 docs/builtins/fpause.rst                    |  2 +-
 docs/builtins/help.rst                      |  2 +-
 docs/builtins/hide.rst                      |  2 +-
 docs/builtins/keybinding.rst                |  2 +-
 docs/builtins/kill-lua.rst                  |  2 +-
 docs/builtins/load.rst                      |  2 +-
 docs/builtins/ls.rst                        |  2 +-
 docs/builtins/plug.rst                      |  2 +-
 docs/builtins/reload.rst                    |  2 +-
 docs/builtins/sc-script.rst                 |  2 +-
 docs/builtins/script.rst                    |  2 +-
 docs/builtins/show.rst                      |  2 +-
 docs/builtins/tags.rst                      |  2 +-
 docs/builtins/type.rst                      |  2 +-
 docs/builtins/unload.rst                    |  2 +-
 docs/plugins/3dveins.rst                    |  2 +-
 docs/plugins/RemoteFortressReader.rst       |  2 +-
 docs/plugins/add-spatter.rst                |  2 +-
 docs/plugins/autobutcher.rst                |  2 +-
 docs/plugins/autochop.rst                   |  2 +-
 docs/plugins/autoclothing.rst               |  2 +-
 docs/plugins/autodump.rst                   |  2 +-
 docs/plugins/autofarm.rst                   |  2 +-
 docs/plugins/autogems.rst                   |  2 +-
 docs/plugins/autohauler.rst                 |  2 +-
 docs/plugins/autolabor.rst                  |  2 +-
 docs/plugins/automaterial.rst               |  2 +-
 docs/plugins/automelt.rst                   |  2 +-
 docs/plugins/autonestbox.rst                |  2 +-
 docs/plugins/autotrade.rst                  |  2 +-
 docs/plugins/blueprint.rst                  |  2 +-
 docs/plugins/building-hacks.rst             |  1 +
 docs/plugins/buildingplan.rst               |  2 +-
 docs/plugins/burrows.rst                    |  2 +-
 docs/plugins/changeitem.rst                 |  2 +-
 docs/plugins/changelayer.rst                |  2 +-
 docs/plugins/changevein.rst                 |  2 +-
 docs/plugins/cleanconst.rst                 |  2 +-
 docs/plugins/cleaners.rst                   |  2 +-
 docs/plugins/cleanowned.rst                 |  2 +-
 docs/plugins/command-prompt.rst             |  2 +-
 docs/plugins/confirm.rst                    |  2 +-
 docs/plugins/createitem.rst                 |  2 +-
 docs/plugins/cursecheck.rst                 |  2 +-
 docs/plugins/cxxrandom.rst                  |  1 +
 docs/plugins/debug.rst                      |  2 +-
 docs/plugins/deramp.rst                     |  2 +-
 docs/plugins/dig-now.rst                    |  2 +-
 docs/plugins/dig.rst                        |  2 +-
 docs/plugins/digFlood.rst                   |  2 +-
 docs/plugins/diggingInvaders.rst            |  2 +-
 docs/plugins/dwarfmonitor.rst               |  2 +-
 docs/plugins/dwarfvet.rst                   |  2 +-
 docs/plugins/embark-assistant.rst           |  2 +-
 docs/plugins/embark-tools.rst               |  2 +-
 docs/plugins/eventful.rst                   |  1 +
 docs/plugins/fastdwarf.rst                  |  2 +-
 docs/plugins/filltraffic.rst                |  2 +-
 docs/plugins/fix-unit-occupancy.rst         |  2 +-
 docs/plugins/fixveins.rst                   |  2 +-
 docs/plugins/flows.rst                      |  2 +-
 docs/plugins/follow.rst                     |  2 +-
 docs/plugins/forceequip.rst                 |  2 +-
 docs/plugins/generated-creature-renamer.rst |  2 +-
 docs/plugins/getplants.rst                  |  2 +-
 docs/plugins/hotkeys.rst                    |  2 +-
 docs/plugins/infiniteSky.rst                |  2 +-
 docs/plugins/isoworldremote.rst             |  2 +-
 docs/plugins/jobutils.rst                   |  2 +-
 docs/plugins/labormanager.rst               |  2 +-
 docs/plugins/lair.rst                       |  2 +-
 docs/plugins/liquids.rst                    |  2 +-
 docs/plugins/luasocket.rst                  |  1 +
 docs/plugins/manipulator.rst                |  2 +-
 docs/plugins/map-render.rst                 |  1 +
 docs/plugins/misery.rst                     |  2 +-
 docs/plugins/mode.rst                       |  2 +-
 docs/plugins/mousequery.rst                 |  2 +-
 docs/plugins/nestboxes.rst                  |  2 +-
 docs/plugins/orders.rst                     |  2 +-
 docs/plugins/pathable.rst                   |  1 +
 docs/plugins/petcapRemover.rst              |  2 +-
 docs/plugins/plants.rst                     |  2 +-
 docs/plugins/power-meter.rst                |  2 +-
 docs/plugins/probe.rst                      |  2 +-
 docs/plugins/prospector.rst                 |  2 +-
 docs/plugins/regrass.rst                    |  2 +-
 docs/plugins/rename.rst                     |  2 +-
 docs/plugins/rendermax.rst                  |  2 +-
 docs/plugins/resume.rst                     |  2 +-
 docs/plugins/reveal.rst                     |  2 +-
 docs/plugins/ruby.rst                       |  2 +-
 docs/plugins/search.rst                     |  2 +-
 docs/plugins/seedwatch.rst                  |  2 +-
 docs/plugins/showmood.rst                   |  2 +-
 docs/plugins/siege-engine.rst               |  2 +-
 docs/plugins/sort.rst                       |  2 +-
 docs/plugins/spectate.rst                   |  2 +-
 docs/plugins/steam-engine.rst               |  2 +-
 docs/plugins/stockflow.rst                  |  2 +-
 docs/plugins/stockpiles.rst                 |  2 +-
 docs/plugins/stocks.rst                     |  2 +-
 docs/plugins/stonesense.rst                 |  2 +-
 docs/plugins/strangemood.rst                |  2 +-
 docs/plugins/tailor.rst                     |  2 +-
 docs/plugins/tiletypes.rst                  |  2 +-
 docs/plugins/title-folder.rst               |  2 +-
 docs/plugins/title-version.rst              |  2 +-
 docs/plugins/trackstop.rst                  |  2 +-
 docs/plugins/tubefill.rst                   |  2 +-
 docs/plugins/tweak.rst                      |  2 +-
 docs/plugins/workNow.rst                    |  2 +-
 docs/plugins/workflow.rst                   |  2 +-
 docs/plugins/xlsxreader.rst                 |  1 +
 docs/plugins/zone.rst                       |  2 +-
 121 files changed, 138 insertions(+), 124 deletions(-)

diff --git a/docs/Tags.rst b/docs/Tags.rst
index 294358bd8..d0c785c3c 100644
--- a/docs/Tags.rst
+++ b/docs/Tags.rst
@@ -1,20 +1,27 @@
 :orphan:
 
-- `tag/adventure`: Tools that are useful while in adventure mode.
+- `tag/adventure`: Tools that are useful while in adventure mode. Note that some tools only tagged with "fort" might also work in adventure mode, but not always in expected ways. Feel free to experiment, though!
 - `tag/fort`: Tools that are useful while in fort mode.
 - `tag/legends`: Tools that are useful while in legends mode.
-- `tag/items`: Tools that create or modify in-game items.
-- `tag/units`: Tools that create or modify units.
-- `tag/jobs`: Tools that create or modify jobs.
-- `tag/labors`: Tools that deal with labor assignment.
-- `tag/auto`: Tools that automatically manage some aspect of your fortress.
-- `tag/map`: Map modification.
+- `tag/embark`: Tools that are useful while on the embark screen.
 - `tag/system`: Tools related to working with DFHack commands or the core DFHack library.
+- `tag/dev`: Tools useful for develpers and modders.
+- `tag/auto`: Tools that you turn on and then they automatically manage some aspect of your fortress.
 - `tag/productivity`: Tools that help you do things that you could do manually, but using the tool is better and faster.
-- `tag/animals`: Tools that help you manage animals.
-- `tag/fix`: Tools that fix specific bugs.
 - `tag/inspection`: Tools that let you inspect game data.
-- `tag/buildings`: Tools that help you work wtih placing or configuring buildings and furniture.
+- `tag/design`: Tools that help you design your fort.
 - `tag/quickfort`: Tools that are involved in creating and playing back blueprints.
-- `tag/dev`: Tools useful for develpers and modders.
 - `tag/interface`: Tools that modify or extend the user interface.
+- `tag/fps`: Tools that help you manage FPS drop.
+- `tag/fix`: Tools that fix specific bugs.
+- `tag/mod`: Tools that introduce new gameplay elements.
+- `tag/armok`: Tools that give you complete control over various aspects of the game.
+- `tag/animals`: Tools that help you manage animals.
+- `tag/buildings`: Tools that help you work with placing or configuring buildings and furniture.
+- `tag/items`: Tools that create or modify in-game items.
+- `tag/jobs`: Tools that create or modify jobs.
+- `tag/map`: Map modification.
+- `tag/labors`: Tools that deal with labor assignment.
+- `tag/units`: Tools that create or modify units.
+- `tag/stockpiles`: Tools that interact wtih stockpiles.
+- `tag/trees`: Tools that interact with trees and shrubs.
diff --git a/docs/builtins/alias.rst b/docs/builtins/alias.rst
index 96f088798..6efaf0776 100644
--- a/docs/builtins/alias.rst
+++ b/docs/builtins/alias.rst
@@ -1,6 +1,6 @@
 alias
 =====
-Tags: `tag/system`
+**Tags:** `tag/system`
 :dfhack-keybind:`alias`
 
 :index:`Configure helper aliases for other DFHack commands.
diff --git a/docs/builtins/cls.rst b/docs/builtins/cls.rst
index a0478c8df..d6a245081 100644
--- a/docs/builtins/cls.rst
+++ b/docs/builtins/cls.rst
@@ -1,6 +1,6 @@
 cls
 ===
-Tags: `tag/system`
+**Tags:** `tag/system`
 :dfhack-keybind:`cls`
 
 :index:`Clear the terminal screen. <cls; Clear the terminal screen.>` Can also
diff --git a/docs/builtins/die.rst b/docs/builtins/die.rst
index 54a134433..db487da0e 100644
--- a/docs/builtins/die.rst
+++ b/docs/builtins/die.rst
@@ -1,6 +1,6 @@
 die
 ===
-Tags: `tag/system`
+**Tags:** `tag/system`
 :dfhack-keybind:`die`
 
 :index:`Instantly exit DF without saving.
diff --git a/docs/builtins/disable.rst b/docs/builtins/disable.rst
index 567e9dbb1..758b6ff8f 100644
--- a/docs/builtins/disable.rst
+++ b/docs/builtins/disable.rst
@@ -1,6 +1,6 @@
 disable
 =======
-Tags: `tag/system`
+**Tags:** `tag/system`
 :dfhack-keybind:`disable`
 
 :index:`Deactivate a DFHack tool that has some persistent effect.
diff --git a/docs/builtins/enable.rst b/docs/builtins/enable.rst
index b99dd194a..8705bc4ef 100644
--- a/docs/builtins/enable.rst
+++ b/docs/builtins/enable.rst
@@ -1,6 +1,6 @@
 enable
 ======
-Tags: `tag/system`
+**Tags:** `tag/system`
 :dfhack-keybind:`enable`
 
 :index:`Activate a DFHack tool that has some persistent effect.
diff --git a/docs/builtins/fpause.rst b/docs/builtins/fpause.rst
index c43cedfab..beb783e82 100644
--- a/docs/builtins/fpause.rst
+++ b/docs/builtins/fpause.rst
@@ -1,6 +1,6 @@
 fpause
 ======
-Tags: `tag/system`
+**Tags:** `tag/system`
 :dfhack-keybind:`fpause`
 
 :index:`Forces DF to pause. <fpause; Forces DF to pause.>` This is useful when
diff --git a/docs/builtins/help.rst b/docs/builtins/help.rst
index 957a84466..4195f2eaa 100644
--- a/docs/builtins/help.rst
+++ b/docs/builtins/help.rst
@@ -1,6 +1,6 @@
 help
 ====
-Tags: `tag/system`
+**Tags:** `tag/system`
 :dfhack-keybind:`help`
 
 :index:`Display help about a command or plugin.
diff --git a/docs/builtins/hide.rst b/docs/builtins/hide.rst
index de144b637..087d87726 100644
--- a/docs/builtins/hide.rst
+++ b/docs/builtins/hide.rst
@@ -1,6 +1,6 @@
 hide
 ====
-Tags: `tag/system`
+**Tags:** `tag/system`
 :dfhack-keybind:`hide`
 
 :index:`Hide the DFHack terminal window.
diff --git a/docs/builtins/keybinding.rst b/docs/builtins/keybinding.rst
index ad759b14c..fd857a42b 100644
--- a/docs/builtins/keybinding.rst
+++ b/docs/builtins/keybinding.rst
@@ -1,6 +1,6 @@
 keybinding
 ==========
-Tags: `tag/system`
+**Tags:** `tag/system`
 :dfhack-keybind:`keybinding`
 
 :index:`Create hotkeys that will run DFHack commands.
diff --git a/docs/builtins/kill-lua.rst b/docs/builtins/kill-lua.rst
index 222795db3..129268fa8 100644
--- a/docs/builtins/kill-lua.rst
+++ b/docs/builtins/kill-lua.rst
@@ -1,6 +1,6 @@
 kill-lua
 ========
-Tags: `tag/system`
+**Tags:** `tag/system`
 :dfhack-keybind:`kill-lua`
 
 :index:`Gracefully stops any currently-running Lua scripts.
diff --git a/docs/builtins/load.rst b/docs/builtins/load.rst
index b7e3db8f3..cd3aed2c0 100644
--- a/docs/builtins/load.rst
+++ b/docs/builtins/load.rst
@@ -1,6 +1,6 @@
 load
 ====
-Tags: `tag/system`
+**Tags:** `tag/system`
 :dfhack-keybind:`load`
 
 :index:`Load and register a plugin library.
diff --git a/docs/builtins/ls.rst b/docs/builtins/ls.rst
index 3ae3fb3e1..f03e3e533 100644
--- a/docs/builtins/ls.rst
+++ b/docs/builtins/ls.rst
@@ -1,6 +1,6 @@
 ls
 ==
-Tags: `tag/system`
+**Tags:** `tag/system`
 :dfhack-keybind:`ls`
 
 :index:`List available DFHack commands. <ls; List available DFHack commands.>`
diff --git a/docs/builtins/plug.rst b/docs/builtins/plug.rst
index 963660bbb..76e31c432 100644
--- a/docs/builtins/plug.rst
+++ b/docs/builtins/plug.rst
@@ -1,6 +1,6 @@
 plug
 ====
-Tags: `tag/system`
+**Tags:** `tag/system`
 :dfhack-keybind:`plug`
 
 :index:`List available plugins and whether they are enabled.
diff --git a/docs/builtins/reload.rst b/docs/builtins/reload.rst
index 4417b5185..8449c713d 100644
--- a/docs/builtins/reload.rst
+++ b/docs/builtins/reload.rst
@@ -1,6 +1,6 @@
 reload
 ======
-Tags: `tag/system`
+**Tags:** `tag/system`
 :dfhack-keybind:`reload`
 
 :index:`Reload a loaded plugin. <reload; Reload a loaded plugin.>` Developers
diff --git a/docs/builtins/sc-script.rst b/docs/builtins/sc-script.rst
index e19af0bf9..17c0efe25 100644
--- a/docs/builtins/sc-script.rst
+++ b/docs/builtins/sc-script.rst
@@ -1,6 +1,6 @@
 sc-script
 =========
-Tags: `tag/system`
+**Tags:** `tag/system`
 :dfhack-keybind:`sc-script`
 
 :index:`Run commands when game state changes occur.
diff --git a/docs/builtins/script.rst b/docs/builtins/script.rst
index f15e86bec..e5576ed50 100644
--- a/docs/builtins/script.rst
+++ b/docs/builtins/script.rst
@@ -1,6 +1,6 @@
 script
 ======
-Tags: `tag/system`
+**Tags:** `tag/system`
 :dfhack-keybind:`script`
 
 :index:`Execute a batch file of DFHack commands.
diff --git a/docs/builtins/show.rst b/docs/builtins/show.rst
index a173231d7..fde642726 100644
--- a/docs/builtins/show.rst
+++ b/docs/builtins/show.rst
@@ -1,6 +1,6 @@
 show
 ====
-Tags: `tag/system`
+**Tags:** `tag/system`
 :dfhack-keybind:`show`
 
 :index:`Unhides the DFHack terminal window.
diff --git a/docs/builtins/tags.rst b/docs/builtins/tags.rst
index 33ac36fe2..024677cff 100644
--- a/docs/builtins/tags.rst
+++ b/docs/builtins/tags.rst
@@ -1,6 +1,6 @@
 tags
 ====
-Tags: `tag/system`
+**Tags:** `tag/system`
 :dfhack-keybind:`tags`
 
 :index:`List the strings that DFHack tools can be tagged with.
diff --git a/docs/builtins/type.rst b/docs/builtins/type.rst
index 7c446bc4e..d7cf9588e 100644
--- a/docs/builtins/type.rst
+++ b/docs/builtins/type.rst
@@ -1,6 +1,6 @@
 type
 ====
-Tags: `tag/system`
+**Tags:** `tag/system`
 :dfhack-keybind:`type`
 
 :index:`Describe how a command is implemented.
diff --git a/docs/builtins/unload.rst b/docs/builtins/unload.rst
index ec385489f..e79d624ec 100644
--- a/docs/builtins/unload.rst
+++ b/docs/builtins/unload.rst
@@ -1,6 +1,6 @@
 unload
 ======
-Tags: `tag/system`
+**Tags:** `tag/system`
 :dfhack-keybind:`unload`
 
 :index:`Unload a plugin from memory. <unload; Unload a plugin from memory.>`
diff --git a/docs/plugins/3dveins.rst b/docs/plugins/3dveins.rst
index 9fe83a4b5..680d44c6e 100644
--- a/docs/plugins/3dveins.rst
+++ b/docs/plugins/3dveins.rst
@@ -1,6 +1,6 @@
 3dveins
 =======
-Tags:
+**Tags:** `tag/fort`, `tag/mod`, `tag/map`
 :dfhack-keybind:`3dveins`
 
 :index:`Rewrite layer veins to expand in 3D space.
diff --git a/docs/plugins/RemoteFortressReader.rst b/docs/plugins/RemoteFortressReader.rst
index f3bf505ac..da8c3570e 100644
--- a/docs/plugins/RemoteFortressReader.rst
+++ b/docs/plugins/RemoteFortressReader.rst
@@ -1,6 +1,6 @@
 RemoteFortressReader
 ====================
-Tags:
+**Tags:** `tag/dev`
 :dfhack-keybind:`RemoteFortressReader_version`
 :dfhack-keybind:`load-art-image-chunk`
 
diff --git a/docs/plugins/add-spatter.rst b/docs/plugins/add-spatter.rst
index 6e5a8ddb7..ed3675132 100644
--- a/docs/plugins/add-spatter.rst
+++ b/docs/plugins/add-spatter.rst
@@ -1,6 +1,6 @@
 add-spatter
 ===========
-Tags:
+**Tags:** `tag/adventure`, `tag/fort`, `tag/mod`, `tag/items`
 
 :index:`Make tagged reactions produce contaminants.
 <add-spatter; Make tagged reactions produce contaminants.>` Give some use to all
diff --git a/docs/plugins/autobutcher.rst b/docs/plugins/autobutcher.rst
index a6b69338c..7a960012e 100644
--- a/docs/plugins/autobutcher.rst
+++ b/docs/plugins/autobutcher.rst
@@ -1,6 +1,6 @@
 autobutcher
 ===========
-Tags:
+**Tags:** `tag/fort`, `tag/auto`, `tag/fps`, `tag/animals`
 :dfhack-keybind:`autobutcher`
 
 Automatically butcher excess livestock. This plugin monitors how many pets you
diff --git a/docs/plugins/autochop.rst b/docs/plugins/autochop.rst
index 6893644db..6b0b7125e 100644
--- a/docs/plugins/autochop.rst
+++ b/docs/plugins/autochop.rst
@@ -1,6 +1,6 @@
 autochop
 ========
-Tags:
+**Tags:** `tag/fort`, `tag/auto`
 
 :index:`Auto-harvest trees when low on stockpiled logs.
 <autochop; Auto-harvest trees when low on stockpiled logs.>` This plugin can
diff --git a/docs/plugins/autoclothing.rst b/docs/plugins/autoclothing.rst
index 2e0d03ec1..3feb22520 100644
--- a/docs/plugins/autoclothing.rst
+++ b/docs/plugins/autoclothing.rst
@@ -1,6 +1,6 @@
 autoclothing
 ============
-Tags:
+**Tags:** `tag/fort`, `tag/auto`, `tag/jobs`
 :dfhack-keybind:`autoclothing`
 
 :index:`Automatically manage clothing work orders.
diff --git a/docs/plugins/autodump.rst b/docs/plugins/autodump.rst
index b42ed9d85..53ed7f1ba 100644
--- a/docs/plugins/autodump.rst
+++ b/docs/plugins/autodump.rst
@@ -1,6 +1,6 @@
 autodump
 ========
-Tags:
+**Tags:** `tag/fort`, `tag/auto`, `tag/fps`, `tag/items`, `tag/stockpiles`
 :dfhack-keybind:`autodump`
 :dfhack-keybind:`autodump-destroy-here`
 :dfhack-keybind:`autodump-destroy-item`
diff --git a/docs/plugins/autofarm.rst b/docs/plugins/autofarm.rst
index 9a2169d65..bfe8ad717 100644
--- a/docs/plugins/autofarm.rst
+++ b/docs/plugins/autofarm.rst
@@ -1,6 +1,6 @@
 autofarm
 ========
-Tags:
+**Tags:** `tag/fort`, `tag/auto`, `tag/buildings`
 :dfhack-keybind:`autofarm`
 
 :index:`Automatically manage farm crop selection.
diff --git a/docs/plugins/autogems.rst b/docs/plugins/autogems.rst
index ee1bc8be6..bcff93ba6 100644
--- a/docs/plugins/autogems.rst
+++ b/docs/plugins/autogems.rst
@@ -1,6 +1,6 @@
 autogems
 ========
-Tags:
+**Tags:** `tag/fort`, `tag/auto`, `tag/jobs`
 :dfhack-keybind:`autogems-reload`
 
 :index:`Automatically cut rough gems. <autogems; Automatically cut rough gems.>`
diff --git a/docs/plugins/autohauler.rst b/docs/plugins/autohauler.rst
index 82561fa2a..e0e1b2bac 100644
--- a/docs/plugins/autohauler.rst
+++ b/docs/plugins/autohauler.rst
@@ -1,6 +1,6 @@
 autohauler
 ==========
-Tags:
+**Tags:** `tag/fort`, `tag/auto`, `tag/labors`
 :dfhack-keybind:`autohauler`
 
 :index:`Automatically manage hauling labors.
diff --git a/docs/plugins/autolabor.rst b/docs/plugins/autolabor.rst
index dc14a40bb..1d02fcfe8 100644
--- a/docs/plugins/autolabor.rst
+++ b/docs/plugins/autolabor.rst
@@ -1,6 +1,6 @@
 autolabor
 =========
-Tags:
+**Tags:** `tag/fort`, `tag/auto`, `tag/labors`
 :dfhack-keybind:`autolabor`
 
 :index:`Automatically manage dwarf labors.
diff --git a/docs/plugins/automaterial.rst b/docs/plugins/automaterial.rst
index 3b9a68b7a..1c237f260 100644
--- a/docs/plugins/automaterial.rst
+++ b/docs/plugins/automaterial.rst
@@ -1,6 +1,6 @@
 automaterial
 ============
-Tags:
+**Tags:** `tag/fort`, `tag/productivity`, `tag/design`, `tag/buildings`, `tag/map`
 
 :index:`Sorts building materials by recent usage.
 <automaterial; Sorts building materials by recent usage.>` This makes building
diff --git a/docs/plugins/automelt.rst b/docs/plugins/automelt.rst
index 8fe995d23..190bffc06 100644
--- a/docs/plugins/automelt.rst
+++ b/docs/plugins/automelt.rst
@@ -1,6 +1,6 @@
 automelt
 ========
-Tags:
+**Tags:** `tag/fort`, `tag/auto`, `tag/items`, `tag/stockpiles`
 
 :index:`Quickly designate items to be melted.
 <automelt; Quickly designate items to be melted.>` When `enabled <enable>`, this
diff --git a/docs/plugins/autonestbox.rst b/docs/plugins/autonestbox.rst
index 6842bef5c..2f874c452 100644
--- a/docs/plugins/autonestbox.rst
+++ b/docs/plugins/autonestbox.rst
@@ -1,6 +1,6 @@
 autonestbox
 ===========
-Tags:
+**Tags:** `tag/fort`, `tag/auto`, `tag/animals`
 :dfhack-keybind:`autonestbox`
 
 Auto-assign egg-laying female pets to nestbox zones. Requires that you create
diff --git a/docs/plugins/autotrade.rst b/docs/plugins/autotrade.rst
index 68aa2d50d..35657fc88 100644
--- a/docs/plugins/autotrade.rst
+++ b/docs/plugins/autotrade.rst
@@ -1,6 +1,6 @@
 autotrade
 =========
-Tags:
+**Tags:** `tag/fort`, `tag/auto`, `tag/items`, `tag/stockpiles`
 
 :index:`Quickly designate items to be traded.
 <autotrade; Quickly designate items to be traded.>` When `enabled <enable>`,
diff --git a/docs/plugins/blueprint.rst b/docs/plugins/blueprint.rst
index 6a0adfe58..48ffdd883 100644
--- a/docs/plugins/blueprint.rst
+++ b/docs/plugins/blueprint.rst
@@ -1,6 +1,6 @@
 blueprint
 =========
-Tags:
+**Tags:** `tag/fort`, `tag/design`, `tag/quickfort`, `tag/map`
 :dfhack-keybind:`blueprint`
 
 :index:`Record a live game map in a quickfort blueprint.
diff --git a/docs/plugins/building-hacks.rst b/docs/plugins/building-hacks.rst
index 106173c47..1f8ee1b2b 100644
--- a/docs/plugins/building-hacks.rst
+++ b/docs/plugins/building-hacks.rst
@@ -1,5 +1,6 @@
 building-hacks
 ==============
+**Tags:** `tag/fort`, `tag/mod`, `tag/buildings`
 
 Provides a Lua API for creating powered workshops.
 
diff --git a/docs/plugins/buildingplan.rst b/docs/plugins/buildingplan.rst
index 6aba86209..be95dc6f1 100644
--- a/docs/plugins/buildingplan.rst
+++ b/docs/plugins/buildingplan.rst
@@ -1,6 +1,6 @@
 buildingplan
 ============
-Tags:
+**Tags:** `tag/fort`, `tag/design`, `tag/quickfort`, `tag/buildings`, `tag/map`
 :dfhack-keybind:`buildingplan`
 
 :index:`Plan building construction before you have materials.
diff --git a/docs/plugins/burrows.rst b/docs/plugins/burrows.rst
index 29b81330d..4728e2cd5 100644
--- a/docs/plugins/burrows.rst
+++ b/docs/plugins/burrows.rst
@@ -1,6 +1,6 @@
 burrows
 =======
-Tags:
+**Tags:** `tag/fort`, `tag/auto`, `tag/productivity`, `tag/units`
 :dfhack-keybind:`burrow`
 
 :index:`Auto-expand burrows as you dig.
diff --git a/docs/plugins/changeitem.rst b/docs/plugins/changeitem.rst
index 93a10cbfa..68c53f821 100644
--- a/docs/plugins/changeitem.rst
+++ b/docs/plugins/changeitem.rst
@@ -1,6 +1,6 @@
 changeitem
 ==========
-Tags:
+**Tags:** `tag/adventure`, `tag/fort`, `tag/armok`, `tag/items`
 :dfhack-keybind:`changeitem`
 
 :index:`Change item material and base quality.
diff --git a/docs/plugins/changelayer.rst b/docs/plugins/changelayer.rst
index 5298cf955..1267fbdac 100644
--- a/docs/plugins/changelayer.rst
+++ b/docs/plugins/changelayer.rst
@@ -1,6 +1,6 @@
 changelayer
 ===========
-Tags:
+**Tags:** `tag/fort`, `tag/armok`, `tag/map`
 :dfhack-keybind:`changelayer`
 
 :index:`Change the material of an entire geology layer.
diff --git a/docs/plugins/changevein.rst b/docs/plugins/changevein.rst
index e23c3f063..96c68de76 100644
--- a/docs/plugins/changevein.rst
+++ b/docs/plugins/changevein.rst
@@ -1,6 +1,6 @@
 changevein
 ==========
-Tags:
+**Tags:** `tag/fort`, `tag/armok`, `tag/map`
 :dfhack-keybind:`changevein`
 
 :index:`Change the material of a mineral inclusion.
diff --git a/docs/plugins/cleanconst.rst b/docs/plugins/cleanconst.rst
index 37416c551..c47a8c6dd 100644
--- a/docs/plugins/cleanconst.rst
+++ b/docs/plugins/cleanconst.rst
@@ -1,6 +1,6 @@
 cleanconst
 ==========
-Tags:
+**Tags:** `tag/fort`, `tag/fps`, `tag/map`
 :dfhack-keybind:`cleanconst`
 
 :index:`Cleans up construction materials.
diff --git a/docs/plugins/cleaners.rst b/docs/plugins/cleaners.rst
index 4a6aee1e3..20fa792db 100644
--- a/docs/plugins/cleaners.rst
+++ b/docs/plugins/cleaners.rst
@@ -3,7 +3,7 @@
 
 cleaners
 ========
-Tags:
+**Tags:** `tag/adventure`, `tag/fort`, `tag/fps`, `tag/items`, `tag/map`, `tag/units`
 :dfhack-keybind:`clean`
 :dfhack-keybind:`spotclean`
 
diff --git a/docs/plugins/cleanowned.rst b/docs/plugins/cleanowned.rst
index c90fe0569..409c39345 100644
--- a/docs/plugins/cleanowned.rst
+++ b/docs/plugins/cleanowned.rst
@@ -1,6 +1,6 @@
 cleanowned
 ==========
-Tags:
+**Tags:** `tag/fort`, `tag/productivity`, `tag/items`
 :dfhack-keybind:`cleanowned`
 
 :index:`Confiscates and dumps garbage owned by dwarves.
diff --git a/docs/plugins/command-prompt.rst b/docs/plugins/command-prompt.rst
index 8e6c9e885..312734b97 100644
--- a/docs/plugins/command-prompt.rst
+++ b/docs/plugins/command-prompt.rst
@@ -1,6 +1,6 @@
 command-prompt
 ==============
-Tags:
+**Tags:** `tag/system`
 :dfhack-keybind:`command-prompt`
 
 :index:`An in-game DFHack terminal where you can enter other commands.
diff --git a/docs/plugins/confirm.rst b/docs/plugins/confirm.rst
index aceb1e6d6..de2556b6f 100644
--- a/docs/plugins/confirm.rst
+++ b/docs/plugins/confirm.rst
@@ -1,6 +1,6 @@
 confirm
 =======
-Tags:
+**Tags:** `tag/fort`, `tag/interface`
 :dfhack-keybind:`confirm`
 
 :index:`Adds confirmation dialogs for destructive actions.
diff --git a/docs/plugins/createitem.rst b/docs/plugins/createitem.rst
index b49a85be4..38f072e62 100644
--- a/docs/plugins/createitem.rst
+++ b/docs/plugins/createitem.rst
@@ -1,6 +1,6 @@
 createitem
 ==========
-Tags:
+**Tags:** `tag/adventure`, `tag/fort`, `tag/armok`, `tag/items`
 :dfhack-keybind:`createitem`
 
 :index:`Create arbitrary items. <createitem; Create arbitrary items.>` You can
diff --git a/docs/plugins/cursecheck.rst b/docs/plugins/cursecheck.rst
index 17cdacf26..ecb4dbd2f 100644
--- a/docs/plugins/cursecheck.rst
+++ b/docs/plugins/cursecheck.rst
@@ -1,6 +1,6 @@
 cursecheck
 ==========
-Tags:
+**Tags:** `tag/system`, `tag/interface`
 :dfhack-keybind:`cursecheck`
 
 :index:`Check for cursed creatures. <cursecheck; Check for cursed creatures.>`
diff --git a/docs/plugins/cxxrandom.rst b/docs/plugins/cxxrandom.rst
index f3ed8f86d..0016fb8d0 100644
--- a/docs/plugins/cxxrandom.rst
+++ b/docs/plugins/cxxrandom.rst
@@ -1,5 +1,6 @@
 cxxrandom
 =========
+**Tags:** `tag/dev`
 
 Provides a Lua API for random distributions.
 
diff --git a/docs/plugins/debug.rst b/docs/plugins/debug.rst
index 2b3b20359..4cc94b217 100644
--- a/docs/plugins/debug.rst
+++ b/docs/plugins/debug.rst
@@ -1,6 +1,6 @@
 debug
 =====
-Tags:
+**Tags:** `tag/dev`
 :dfhack-keybind:`debugfilter`
 
 :index:`Configure verbosity of DFHack debug output.
diff --git a/docs/plugins/deramp.rst b/docs/plugins/deramp.rst
index 7f4a8ce24..6126d2828 100644
--- a/docs/plugins/deramp.rst
+++ b/docs/plugins/deramp.rst
@@ -1,6 +1,6 @@
 deramp
 ======
-Tags:
+**Tags:** `tag/fort`, `tag/armok`, `tag/map`
 :dfhack-keybind:`deramp`
 
 :index:`Removes all ramps designated for removal from the map.
diff --git a/docs/plugins/dig-now.rst b/docs/plugins/dig-now.rst
index cdb21c01a..7d3beedc0 100644
--- a/docs/plugins/dig-now.rst
+++ b/docs/plugins/dig-now.rst
@@ -1,6 +1,6 @@
 dig-now
 =======
-Tags:
+**Tags:** `tag/fort`, `tag/armok`, `tag/map`
 :dfhack-keybind:`dig-now`
 
 :index:`Instantly complete dig designations.
diff --git a/docs/plugins/dig.rst b/docs/plugins/dig.rst
index 8fbf1a910..f4e0c8acb 100644
--- a/docs/plugins/dig.rst
+++ b/docs/plugins/dig.rst
@@ -3,7 +3,7 @@
 
 dig
 ===
-Tags:
+**Tags:** `tag/fort`, `tag/productivity`, `tag/design`, `tag/map`
 :dfhack-keybind:`digv`
 :dfhack-keybind:`digvx`
 :dfhack-keybind:`digl`
diff --git a/docs/plugins/digFlood.rst b/docs/plugins/digFlood.rst
index cb8018145..1a17c32a7 100644
--- a/docs/plugins/digFlood.rst
+++ b/docs/plugins/digFlood.rst
@@ -1,6 +1,6 @@
 digFlood
 ========
-Tags:
+**Tags:** `tag/fort`, `tag/auto`, `tag/map`
 :dfhack-keybind:`digFlood`
 
 :index:`Digs out veins as they are discovered.
diff --git a/docs/plugins/diggingInvaders.rst b/docs/plugins/diggingInvaders.rst
index d2fada0d4..4891bf8d4 100644
--- a/docs/plugins/diggingInvaders.rst
+++ b/docs/plugins/diggingInvaders.rst
@@ -1,6 +1,6 @@
 diggingInvaders
 ===============
-Tags:
+**Tags:** `tag/fort`, `tag/mod`, `tag/map`
 :dfhack-keybind:`diggingInvaders`
 
 :index:`Invaders dig and destroy to get to your dwarves.
diff --git a/docs/plugins/dwarfmonitor.rst b/docs/plugins/dwarfmonitor.rst
index 75b71d06c..a7f42bb81 100644
--- a/docs/plugins/dwarfmonitor.rst
+++ b/docs/plugins/dwarfmonitor.rst
@@ -1,6 +1,6 @@
 dwarfmonitor
 ============
-Tags:
+**Tags:** `tag/fort`, `tag/inspection`, `tag/units`
 :dfhack-keybind:`dwarfmonitor`
 
 :index:`Measure fort happiness and efficiency.
diff --git a/docs/plugins/dwarfvet.rst b/docs/plugins/dwarfvet.rst
index 6a1c5a60f..2db4a9595 100644
--- a/docs/plugins/dwarfvet.rst
+++ b/docs/plugins/dwarfvet.rst
@@ -1,6 +1,6 @@
 dwarfvet
 ========
-Tags:
+**Tags:** `tag/fort`, `tag/mod`, `tag/animals`
 :dfhack-keybind:`dwarfvet`
 
 :index:`Allows animals to be treated at animal hospitals.
diff --git a/docs/plugins/embark-assistant.rst b/docs/plugins/embark-assistant.rst
index 3a6081655..b9a7e4ee2 100644
--- a/docs/plugins/embark-assistant.rst
+++ b/docs/plugins/embark-assistant.rst
@@ -1,6 +1,6 @@
 embark-assistant
 ================
-Tags:
+**Tags:** `tag/fort`, `tag/embark`, `tag/interface`
 :dfhack-keybind:`embark-assistant`
 
 :index:`Embark site selection support.
diff --git a/docs/plugins/embark-tools.rst b/docs/plugins/embark-tools.rst
index 987b76df6..52532e4f2 100644
--- a/docs/plugins/embark-tools.rst
+++ b/docs/plugins/embark-tools.rst
@@ -1,6 +1,6 @@
 embark-tools
 ============
-Tags:
+**Tags:** `tag/fort`, `tag/embark`, `tag/interface`
 :dfhack-keybind:`embark-tools`
 
 :index:`Extend the embark screen functionality.
diff --git a/docs/plugins/eventful.rst b/docs/plugins/eventful.rst
index 892f233bb..102287b77 100644
--- a/docs/plugins/eventful.rst
+++ b/docs/plugins/eventful.rst
@@ -1,5 +1,6 @@
 eventful
 ========
+**Tags:** `tag/dev`, `tag/mod`
 
 Provides a Lua API for reacting to in-game events.
 
diff --git a/docs/plugins/fastdwarf.rst b/docs/plugins/fastdwarf.rst
index e06f2564c..2e09b8a4d 100644
--- a/docs/plugins/fastdwarf.rst
+++ b/docs/plugins/fastdwarf.rst
@@ -1,6 +1,6 @@
 fastdwarf
 =========
-Tags:
+**Tags:** `tag/fort`, `tag/armok`, `tag/units`
 :dfhack-keybind:`fastdwarf`
 
 Dwarves teleport and/or finish jobs instantly.
diff --git a/docs/plugins/filltraffic.rst b/docs/plugins/filltraffic.rst
index 5056ec830..5a3beaab7 100644
--- a/docs/plugins/filltraffic.rst
+++ b/docs/plugins/filltraffic.rst
@@ -3,7 +3,7 @@
 
 filltraffic
 ===========
-Tags:
+**Tags:** `tag/fort`, `tag/productivity`, `tag/design`, `tag/map`
 :dfhack-keybind:``
 
 Usage:
diff --git a/docs/plugins/fix-unit-occupancy.rst b/docs/plugins/fix-unit-occupancy.rst
index 48efd7255..28479791f 100644
--- a/docs/plugins/fix-unit-occupancy.rst
+++ b/docs/plugins/fix-unit-occupancy.rst
@@ -1,6 +1,6 @@
 fix-unit-occupancy
 ==================
-Tags:
+**Tags:** `tag/fort`, `tag/fix`, `tag/map`
 :dfhack-keybind:``
 
 Fix phantom unit occupancy issues. For example, if you see "unit blocking tile"
diff --git a/docs/plugins/fixveins.rst b/docs/plugins/fixveins.rst
index 940c13b7a..873e1770a 100644
--- a/docs/plugins/fixveins.rst
+++ b/docs/plugins/fixveins.rst
@@ -1,6 +1,6 @@
 fixveins
 ========
-Tags:
+**Tags:** `tag/fort`, `tag/fix`, `tag/map`
 :dfhack-keybind:`fixveins`
 
 Restore missing mineral inclusions. This tool can also remove invalid references
diff --git a/docs/plugins/flows.rst b/docs/plugins/flows.rst
index 354b0078e..a347f00e0 100644
--- a/docs/plugins/flows.rst
+++ b/docs/plugins/flows.rst
@@ -1,6 +1,6 @@
 flows
 =====
-Tags:
+**Tags:** `tag/fort`, `tag/inspection`, `tag/map`
 :dfhack-keybind:`flows`
 
 Counts map blocks with flowing liquids.. If you suspect that your magma sea
diff --git a/docs/plugins/follow.rst b/docs/plugins/follow.rst
index a0c15547e..5f43e2fdd 100644
--- a/docs/plugins/follow.rst
+++ b/docs/plugins/follow.rst
@@ -1,6 +1,6 @@
 follow
 ======
-Tags:
+**Tags:** `tag/fort`, `tag/interface`, `tag/units`
 :dfhack-keybind:`follow`
 
 Make the screen follow the selected unit. Once you exit from the current menu or
diff --git a/docs/plugins/forceequip.rst b/docs/plugins/forceequip.rst
index 217085fe4..51d48390c 100644
--- a/docs/plugins/forceequip.rst
+++ b/docs/plugins/forceequip.rst
@@ -1,6 +1,6 @@
 forceequip
 ==========
-Tags:
+**Tags:** `tag/adventure`, `tag/fort`, `tag/items`, `tag/units`
 :dfhack-keybind:`forceequip`
 
 Move items into a unit's inventory. This tool is typically used to equip
diff --git a/docs/plugins/generated-creature-renamer.rst b/docs/plugins/generated-creature-renamer.rst
index 1615ba32d..39983940b 100644
--- a/docs/plugins/generated-creature-renamer.rst
+++ b/docs/plugins/generated-creature-renamer.rst
@@ -1,6 +1,6 @@
 generated-creature-renamer
 ==========================
-Tags:
+**Tags:** `tag/adventure`, `tag/fort`, `tag/legends`, `tag/units`
 :dfhack-keybind:`list-generated`
 :dfhack-keybind:`save-generated-raws`
 
diff --git a/docs/plugins/getplants.rst b/docs/plugins/getplants.rst
index 167ac72f2..21325e8f2 100644
--- a/docs/plugins/getplants.rst
+++ b/docs/plugins/getplants.rst
@@ -1,6 +1,6 @@
 getplants
 =========
-Tags:
+**Tags:** `tag/fort`, `tag/productivity`
 :dfhack-keybind:`getplants`
 
 Designate trees for chopping and shrubs for gathering. Specify the types of
diff --git a/docs/plugins/hotkeys.rst b/docs/plugins/hotkeys.rst
index 49064db0a..fbf4a9a76 100644
--- a/docs/plugins/hotkeys.rst
+++ b/docs/plugins/hotkeys.rst
@@ -1,6 +1,6 @@
 hotkeys
 =======
-Tags:
+**Tags:** `tag/system`, `tag/productivity`, `tag/interface`
 :dfhack-keybind:`hotkeys`
 
 Show all dfhack keybindings in current context. The command opens an in-game
diff --git a/docs/plugins/infiniteSky.rst b/docs/plugins/infiniteSky.rst
index 96f141de5..ceb08aa0e 100644
--- a/docs/plugins/infiniteSky.rst
+++ b/docs/plugins/infiniteSky.rst
@@ -1,6 +1,6 @@
 infiniteSky
 ===========
-Tags:
+**Tags:** `tag/fort`, `tag/map`
 :dfhack-keybind:`infiniteSky`
 
 Automatically allocates new z-levels of sky at the top of the map as you build
diff --git a/docs/plugins/isoworldremote.rst b/docs/plugins/isoworldremote.rst
index 2c359fac2..84babe66a 100644
--- a/docs/plugins/isoworldremote.rst
+++ b/docs/plugins/isoworldremote.rst
@@ -1,5 +1,5 @@
 isoworldremote
 ==============
-Tags:
+**Tags:** `tag/dev`, `tag/mod`
 
 Provides a `remote API <remote>` used by Isoworld.
diff --git a/docs/plugins/jobutils.rst b/docs/plugins/jobutils.rst
index 2ecf2b591..5dcb0c85f 100644
--- a/docs/plugins/jobutils.rst
+++ b/docs/plugins/jobutils.rst
@@ -2,7 +2,7 @@
 
 jobutils
 ========
-Tags:
+**Tags:** `tag/fort`, `tag/inspection`, `tag/jobs`
 :dfhack-keybind:`job`
 :dfhack-keybind:`job-duplicate`
 :dfhack-keybind:`job-material`
diff --git a/docs/plugins/labormanager.rst b/docs/plugins/labormanager.rst
index 103ecde2f..1a25cedae 100644
--- a/docs/plugins/labormanager.rst
+++ b/docs/plugins/labormanager.rst
@@ -1,6 +1,6 @@
 labormanager
 ============
-Tags:
+**Tags:** `tag/fort`, `tag/auto`, `tag/labors`
 :dfhack-keybind:`labormanager`
 
 Automatically manage dwarf labors. Labormanager is derived from `autolabor`
diff --git a/docs/plugins/lair.rst b/docs/plugins/lair.rst
index b4a7ed524..43bb06072 100644
--- a/docs/plugins/lair.rst
+++ b/docs/plugins/lair.rst
@@ -1,6 +1,6 @@
 lair
 ====
-Tags:
+**Tags:** `tag/fort`, `tag/armok`, `tag/map`
 :dfhack-keybind:`lair`
 
 Mark the map as a monster lair. This avoids item scatter when the fortress is
diff --git a/docs/plugins/liquids.rst b/docs/plugins/liquids.rst
index 61e4bcfe2..808089591 100644
--- a/docs/plugins/liquids.rst
+++ b/docs/plugins/liquids.rst
@@ -2,7 +2,7 @@
 
 liquids
 =======
-Tags:
+**Tags:** `tag/adventure`, `tag/fort`, `tag/armok`, `tag/map`
 :dfhack-keybind:`liquids`
 :dfhack-keybind:`liquids-here`
 
diff --git a/docs/plugins/luasocket.rst b/docs/plugins/luasocket.rst
index 6f7c96cae..cbbf09f7e 100644
--- a/docs/plugins/luasocket.rst
+++ b/docs/plugins/luasocket.rst
@@ -1,5 +1,6 @@
 luasocket
 =========
+**Tags:** `tag/dev`, `tag/mod`
 
 Provides a Lua API for accessing network sockets.
 
diff --git a/docs/plugins/manipulator.rst b/docs/plugins/manipulator.rst
index 87ac4e088..07d1d4ab6 100644
--- a/docs/plugins/manipulator.rst
+++ b/docs/plugins/manipulator.rst
@@ -1,6 +1,6 @@
 manipulator
 ===========
-Tags:
+**Tags:** `tag/fort`, `tag/productivity`, `tag/interface`, `tag/labors`
 
 An in-game labor management interface. It is equivalent to the popular Dwarf
 Therapist utility.
diff --git a/docs/plugins/map-render.rst b/docs/plugins/map-render.rst
index 2bcb32adf..6b7f1a5d9 100644
--- a/docs/plugins/map-render.rst
+++ b/docs/plugins/map-render.rst
@@ -1,5 +1,6 @@
 map-render
 ==========
+**Tags:** `tag/dev`
 
 Provides a Lua API for rerendering portions of the map.
 
diff --git a/docs/plugins/misery.rst b/docs/plugins/misery.rst
index 9a3a632f2..5d11f98cb 100644
--- a/docs/plugins/misery.rst
+++ b/docs/plugins/misery.rst
@@ -1,6 +1,6 @@
 misery
 ======
-Tags:
+**Tags:** `tag/fort`, `tag/armok`, `tag/units`
 :dfhack-keybind:`misery`
 
 Increase the intensity of negative dwarven thoughts.
diff --git a/docs/plugins/mode.rst b/docs/plugins/mode.rst
index 225a49e1e..8c33d6ec3 100644
--- a/docs/plugins/mode.rst
+++ b/docs/plugins/mode.rst
@@ -1,6 +1,6 @@
 mode
 ====
-Tags:
+**Tags:** `tag/dev`
 :dfhack-keybind:`mode`
 
 This command lets you see and change the game mode directly.
diff --git a/docs/plugins/mousequery.rst b/docs/plugins/mousequery.rst
index 39f401bb2..7e01de6d0 100644
--- a/docs/plugins/mousequery.rst
+++ b/docs/plugins/mousequery.rst
@@ -1,6 +1,6 @@
 mousequery
 ==========
-Tags: `tag/fort`, `tag/interface`
+**Tags:** `tag/fort`, `tag/productivity`, `tag/interface`
 :dfhack-keybind:`mousequery`
 
 Adds mouse controls to the DF interface. For example, with ``mousequery`` you
diff --git a/docs/plugins/nestboxes.rst b/docs/plugins/nestboxes.rst
index fb9df20a9..1558a7357 100644
--- a/docs/plugins/nestboxes.rst
+++ b/docs/plugins/nestboxes.rst
@@ -1,6 +1,6 @@
 nestboxes
 =========
-Tags:
+**Tags:** `tag/fort`, `tag/auto`, `tag/animals`
 
 Protect fertile eggs incubating in a nestbox. This plugin will automatically
 scan for and forbid fertile eggs incubating in a nestbox so that dwarves won't
diff --git a/docs/plugins/orders.rst b/docs/plugins/orders.rst
index 2506bc582..3be1f82b2 100644
--- a/docs/plugins/orders.rst
+++ b/docs/plugins/orders.rst
@@ -1,6 +1,6 @@
 orders
 ======
-Tags:
+**Tags:** `tag/fort`, `tag/productivity`, `tag/jobs`
 :dfhack-keybind:`orders`
 
 Manage manager orders.
diff --git a/docs/plugins/pathable.rst b/docs/plugins/pathable.rst
index 7a906ad89..6368d1c7e 100644
--- a/docs/plugins/pathable.rst
+++ b/docs/plugins/pathable.rst
@@ -1,5 +1,6 @@
 pathable
 ========
+**Tags:** `tag/dev`, `tag/inspection`, `tag/interface`, `tag/map`
 
 Marks tiles that are reachable from the cursor. This plugin provides a Lua API,
 but no direct commands.
diff --git a/docs/plugins/petcapRemover.rst b/docs/plugins/petcapRemover.rst
index 3d9739ea3..95a9e60bd 100644
--- a/docs/plugins/petcapRemover.rst
+++ b/docs/plugins/petcapRemover.rst
@@ -1,6 +1,6 @@
 petcapRemover
 =============
-Tags:
+**Tags:** `tag/fort`, `tag/armok`, `tag/animals`
 :dfhack-keybind:`petcapRemover`
 
 Modify the pet population cap. In vanilla DF, pets will not reproduce unless the
diff --git a/docs/plugins/plants.rst b/docs/plugins/plants.rst
index 4fc87f353..2021bc103 100644
--- a/docs/plugins/plants.rst
+++ b/docs/plugins/plants.rst
@@ -2,7 +2,7 @@
 
 plants
 ======
-Tags:
+**Tags:** `tag/adventure`, `tag/fort`, `tag/armok`, `tag/map`
 :dfhack-keybind:`plant`
 
 Grow shrubs or trees.
diff --git a/docs/plugins/power-meter.rst b/docs/plugins/power-meter.rst
index 7186a413d..72a49b72c 100644
--- a/docs/plugins/power-meter.rst
+++ b/docs/plugins/power-meter.rst
@@ -1,6 +1,6 @@
 power-meter
 ===========
-Tags:
+**Tags:** `tag/fort`, `tag/mod`, `tag/buildings`
 
 Allow presure plates to measure power. If you run `gui/power-meter` while
 building a pressure plate, the pressure plate can be modified to detect power
diff --git a/docs/plugins/probe.rst b/docs/plugins/probe.rst
index 614d0bc81..0285bb821 100644
--- a/docs/plugins/probe.rst
+++ b/docs/plugins/probe.rst
@@ -1,6 +1,6 @@
 probe
 =====
-Tags:
+**Tags:** `tag/adventure`, `tag/fort`, `tag/inspection`, `tag/map`
 :dfhack-keybind:`probe`
 :dfhack-keybind:`bprobe`
 :dfhack-keybind:`cprobe`
diff --git a/docs/plugins/prospector.rst b/docs/plugins/prospector.rst
index 718f92fa6..7ff3b4313 100644
--- a/docs/plugins/prospector.rst
+++ b/docs/plugins/prospector.rst
@@ -2,7 +2,7 @@
 
 prospector
 ==========
-Tags:
+**Tags:** `tag/fort`, `tag/embark`, `tag/inspection`, `tag/map`
 :dfhack-keybind:`prospect`
 
 Shows a summary of resources that exist on the map. It can also calculate an
diff --git a/docs/plugins/regrass.rst b/docs/plugins/regrass.rst
index d47e98d19..98590a73e 100644
--- a/docs/plugins/regrass.rst
+++ b/docs/plugins/regrass.rst
@@ -1,6 +1,6 @@
 regrass
 =======
-Tags:
+**Tags:** `tag/adventure`, `tag/fort`, `tag/armok`, `tag/animals`
 :dfhack-keybind:`regrass`
 
 Regrows all the grass. Use this command if your grazers have eaten everything
diff --git a/docs/plugins/rename.rst b/docs/plugins/rename.rst
index 0c4bc9ddb..34695e19a 100644
--- a/docs/plugins/rename.rst
+++ b/docs/plugins/rename.rst
@@ -1,6 +1,6 @@
 rename
 ======
-Tags:
+**Tags:** `tag/adventure`, `tag/fort`, `tag/productivity`
 :dfhack-keybind:`rename`
 
 Easily rename things.  Use `gui/rename` for an in-game interface.
diff --git a/docs/plugins/rendermax.rst b/docs/plugins/rendermax.rst
index 641a7a248..83e9ee461 100644
--- a/docs/plugins/rendermax.rst
+++ b/docs/plugins/rendermax.rst
@@ -1,6 +1,6 @@
 rendermax
 =========
-Tags:
+**Tags:** `tag/adventure`, `tag/fort`, `tag/mod`
 :dfhack-keybind:`rendermax`
 
 Modify the map lighting. This plugin provides a collection of OpenGL lighting
diff --git a/docs/plugins/resume.rst b/docs/plugins/resume.rst
index 7afb9be0d..2f28d7083 100644
--- a/docs/plugins/resume.rst
+++ b/docs/plugins/resume.rst
@@ -1,6 +1,6 @@
 resume
 ======
-Tags:
+**Tags:** `tag/fort`, `tag/productivity`
 :dfhack-keybind:`resume`
 
 Color planned buildings based on their suspend status. When enabled, this plugin
diff --git a/docs/plugins/reveal.rst b/docs/plugins/reveal.rst
index f8611d033..fb69d9a02 100644
--- a/docs/plugins/reveal.rst
+++ b/docs/plugins/reveal.rst
@@ -2,7 +2,7 @@
 
 reveal
 ======
-Tags:
+**Tags:** `tag/adventure`, `tag/fort`, `tag/inspection`, `tag/armok`, `tag/map`
 :dfhack-keybind:`reveal`
 :dfhack-keybind:`unreveal`
 :dfhack-keybind:`revforget`
diff --git a/docs/plugins/ruby.rst b/docs/plugins/ruby.rst
index beb9be4a1..d3b89d3a9 100644
--- a/docs/plugins/ruby.rst
+++ b/docs/plugins/ruby.rst
@@ -2,7 +2,7 @@
 
 ruby
 ====
-Tags:
+**Tags:** `tag/dev`
 :dfhack-keybind:`rb`
 :dfhack-keybind:`rb_eval`
 
diff --git a/docs/plugins/search.rst b/docs/plugins/search.rst
index edf6fb47c..41ae1c922 100644
--- a/docs/plugins/search.rst
+++ b/docs/plugins/search.rst
@@ -2,7 +2,7 @@
 
 search
 ======
-Tags:
+**Tags:** `tag/fort`, `tag/productivity`, `tag/interface`
 
 Adds search capabilities to the UI. The Stocks, Animals, Trading, Stockpile,
 Noble (assignment candidates), Military (position candidates), Burrows (unit
diff --git a/docs/plugins/seedwatch.rst b/docs/plugins/seedwatch.rst
index 2b04b3fa6..bd51fdd2e 100644
--- a/docs/plugins/seedwatch.rst
+++ b/docs/plugins/seedwatch.rst
@@ -1,6 +1,6 @@
 seedwatch
 =========
-Tags:
+**Tags:** `tag/fort`, `tag/auto`
 :dfhack-keybind:`seedwatch`
 
 Manages seed and plant cooking based on seed stock levels.
diff --git a/docs/plugins/showmood.rst b/docs/plugins/showmood.rst
index 8afe4c629..42af0e7a8 100644
--- a/docs/plugins/showmood.rst
+++ b/docs/plugins/showmood.rst
@@ -1,6 +1,6 @@
 showmood
 ========
-Tags:
+**Tags:** `tag/fort`, `tag/inspection`, `tag/jobs`
 :dfhack-keybind:`showmood`
 
 Shows all items needed for the active strange mood.
diff --git a/docs/plugins/siege-engine.rst b/docs/plugins/siege-engine.rst
index a4cfed2ba..9255110bd 100644
--- a/docs/plugins/siege-engine.rst
+++ b/docs/plugins/siege-engine.rst
@@ -1,6 +1,6 @@
 siege-engine
 ============
-Tags:
+**Tags:** `tag/fort`, `tag/mod`, `tag/buildings`
 
 Extend the functionality and usability of siege engines. Siege engines in DF
 haven't been updated since the game was 2D, and can only aim in four
diff --git a/docs/plugins/sort.rst b/docs/plugins/sort.rst
index 12684175f..f3ba6e6fb 100644
--- a/docs/plugins/sort.rst
+++ b/docs/plugins/sort.rst
@@ -1,6 +1,6 @@
 sort
 ====
-Tags:
+**Tags:** `tag/fort`, `tag/productivity`, `tag/interface`
 :dfhack-keybind:`sort-items`
 :dfhack-keybind:`sort-units`
 
diff --git a/docs/plugins/spectate.rst b/docs/plugins/spectate.rst
index 983086c94..08cc3f819 100644
--- a/docs/plugins/spectate.rst
+++ b/docs/plugins/spectate.rst
@@ -1,6 +1,6 @@
 spectate
 ========
-Tags:
+**Tags:** `tag/fort`, `tag/units`
 
 Automatically follow exciting dwarves.
 
diff --git a/docs/plugins/steam-engine.rst b/docs/plugins/steam-engine.rst
index 35cd490f5..0fe245d63 100644
--- a/docs/plugins/steam-engine.rst
+++ b/docs/plugins/steam-engine.rst
@@ -1,6 +1,6 @@
 steam-engine
 ============
-Tags:
+**Tags:** `tag/fort`, `tag/mod`, `tag/buildings`
 
 Allow modded steam engine buildings to function. The steam-engine plugin detects
 custom workshops with STEAM_ENGINE in their token, and turns them into real
diff --git a/docs/plugins/stockflow.rst b/docs/plugins/stockflow.rst
index 0e2f5a1ad..48647b869 100644
--- a/docs/plugins/stockflow.rst
+++ b/docs/plugins/stockflow.rst
@@ -1,6 +1,6 @@
 stockflow
 =========
-Tags:
+**Tags:** `tag/fort`, `tag/auto`, `tag/jobs`, `tag/stockpiles`
 :dfhack-keybind:`stockflow`
 
 Queue manager jobs based on free space in stockpiles. With this plugin, the
diff --git a/docs/plugins/stockpiles.rst b/docs/plugins/stockpiles.rst
index 76d52117d..0c1000456 100644
--- a/docs/plugins/stockpiles.rst
+++ b/docs/plugins/stockpiles.rst
@@ -2,7 +2,7 @@
 
 stockpiles
 ==========
-Tags:
+**Tags:** `tag/fort`, `tag/productivity`, `tag/design`, `tag/stockpiles`
 :dfhack-keybind:`copystock`
 :dfhack-keybind:`savestock`
 :dfhack-keybind:`loadstock`
diff --git a/docs/plugins/stocks.rst b/docs/plugins/stocks.rst
index 076f2ab6f..5506b1d28 100644
--- a/docs/plugins/stocks.rst
+++ b/docs/plugins/stocks.rst
@@ -1,6 +1,6 @@
 stocks
 ======
-Tags:
+**Tags:** `tag/fort`, `tag/productivity`, `tag/interface`
 :dfhack-keybind:`stocks`
 
 Enhanced fortress stock management interface. When the plugin is enabled, two
diff --git a/docs/plugins/stonesense.rst b/docs/plugins/stonesense.rst
index 59212444b..3bb271477 100644
--- a/docs/plugins/stonesense.rst
+++ b/docs/plugins/stonesense.rst
@@ -1,6 +1,6 @@
 stonesense
 ==========
-Tags:
+**Tags:** `tag/adventure`, `tag/fort`, `tag/interface`, `tag/map`
 :dfhack-keybind:`stonesense`
 :dfhack-keybind:`ssense`
 
diff --git a/docs/plugins/strangemood.rst b/docs/plugins/strangemood.rst
index d6065f8eb..0198af136 100644
--- a/docs/plugins/strangemood.rst
+++ b/docs/plugins/strangemood.rst
@@ -1,6 +1,6 @@
 strangemood
 ===========
-Tags:
+**Tags:** `tag/fort`, `tag/armok`, `tag/units`
 :dfhack-keybind:`strangemood`
 
 Triggers a strange mood.
diff --git a/docs/plugins/tailor.rst b/docs/plugins/tailor.rst
index 19574bc3e..93072fb1b 100644
--- a/docs/plugins/tailor.rst
+++ b/docs/plugins/tailor.rst
@@ -1,6 +1,6 @@
 tailor
 ======
-Tags:
+**Tags:** `tag/fort`, `tag/auto`, `tag/jobs`
 :dfhack-keybind:`tailor`
 
 Automatically keep your dwarves in fresh clothing. Whenever the bookkeeper
diff --git a/docs/plugins/tiletypes.rst b/docs/plugins/tiletypes.rst
index cbdbd6cc5..185f283db 100644
--- a/docs/plugins/tiletypes.rst
+++ b/docs/plugins/tiletypes.rst
@@ -3,7 +3,7 @@
 
 tiletypes
 =========
-Tags:
+**Tags:** `tag/adventure`, `tag/fort`, `tag/armok`, `tag/map`
 :dfhack-keybind:`tiletypes`
 :dfhack-keybind:`tiletypes-command`
 :dfhack-keybind:`tiletypes-here`
diff --git a/docs/plugins/title-folder.rst b/docs/plugins/title-folder.rst
index 3156a9e1c..beddfc9cb 100644
--- a/docs/plugins/title-folder.rst
+++ b/docs/plugins/title-folder.rst
@@ -1,6 +1,6 @@
 title-folder
 =============
-Tags:
+**Tags:** `tag/system`, `tag/interface`
 
 Displays the DF folder name in the window title bar.
 
diff --git a/docs/plugins/title-version.rst b/docs/plugins/title-version.rst
index 267179f14..d9d35a85f 100644
--- a/docs/plugins/title-version.rst
+++ b/docs/plugins/title-version.rst
@@ -1,6 +1,6 @@
 title-version
 =============
-Tags:
+**Tags:** `tag/system`, `tag/interface`
 
 Displays the DFHack version on DF's title screen.
 
diff --git a/docs/plugins/trackstop.rst b/docs/plugins/trackstop.rst
index 72466a1bf..cf5a9853f 100644
--- a/docs/plugins/trackstop.rst
+++ b/docs/plugins/trackstop.rst
@@ -1,6 +1,6 @@
 trackstop
 =========
-Tags:
+**Tags:** `tag/fort`, `tag/interface`, `tag/mod`, `tag/buildings`
 
 Adds dynamic configuration options for track stops. When enabled, this plugin
 adds a :kbd:`q` menu for track stops, which is completely blank in vanilla DF.
diff --git a/docs/plugins/tubefill.rst b/docs/plugins/tubefill.rst
index 15a9ba2f2..404a180b2 100644
--- a/docs/plugins/tubefill.rst
+++ b/docs/plugins/tubefill.rst
@@ -1,6 +1,6 @@
 tubefill
 ========
-Tags:
+**Tags:** `tag/fort`, `tag/armok`, `tag/map`
 :dfhack-keybind:`tubefill`
 
 Replentishes mined-out adamantine. Veins that were hollow will be left alone.
diff --git a/docs/plugins/tweak.rst b/docs/plugins/tweak.rst
index fff1a4512..03489845e 100644
--- a/docs/plugins/tweak.rst
+++ b/docs/plugins/tweak.rst
@@ -1,6 +1,6 @@
 tweak
 =====
-Tags:
+**Tags:** `tag/adventure`, `tag/fort`, `tag/interface`, `tag/fps`, `tag/fix`, `tag/armok`
 :dfhack-keybind:`tweak`
 
 Contains various tweaks for minor bugs.
diff --git a/docs/plugins/workNow.rst b/docs/plugins/workNow.rst
index dda3fea5c..895556ce3 100644
--- a/docs/plugins/workNow.rst
+++ b/docs/plugins/workNow.rst
@@ -1,6 +1,6 @@
 workNow
 =======
-Tags:
+**Tags:** `tag/fort`, `tag/auto`, `tag/jobs`
 :dfhack-keybind:`workNow`
 
 Reduce the time that dwarves idle after completing a job. After finishing a job,
diff --git a/docs/plugins/workflow.rst b/docs/plugins/workflow.rst
index cb20ad806..c2a9ea26a 100644
--- a/docs/plugins/workflow.rst
+++ b/docs/plugins/workflow.rst
@@ -1,6 +1,6 @@
 workflow
 ========
-Tags:
+**Tags:** `tag/fort`, `tag/auto`, `tag/jobs`
 :dfhack-keybind:`workflow`
 :dfhack-keybind:`fix-job-postings`
 
diff --git a/docs/plugins/xlsxreader.rst b/docs/plugins/xlsxreader.rst
index d09b69644..123d9920a 100644
--- a/docs/plugins/xlsxreader.rst
+++ b/docs/plugins/xlsxreader.rst
@@ -1,5 +1,6 @@
 xlsxreader
 ==========
+**Tags:** `tag/dev`
 
 Provides a Lua API for reading xlsx files.
 
diff --git a/docs/plugins/zone.rst b/docs/plugins/zone.rst
index 5e01a12ac..9aa34d746 100644
--- a/docs/plugins/zone.rst
+++ b/docs/plugins/zone.rst
@@ -1,6 +1,6 @@
 zone
 ====
-Tags:
+**Tags:** `tag/fort`, `tag/productivity`, `tag/animals`, `tag/buildings`
 :dfhack-keybind:`zone`
 
 Manage activity zones, cages, and the animals therein.

From b3a2a10caac918768bae3e1f41fb97bb3a375e8b Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Fri, 5 Aug 2022 22:05:52 -0700
Subject: [PATCH 439/854] clean up generate doc dirs with ninja clean

---
 .gitignore                                 |  1 +
 CMakeLists.txt                             | 11 ++++++++++-
 docs/changelogs/.gitignore                 |  2 --
 docs/sphinx_extensions/dfhack/changelog.py |  2 ++
 4 files changed, 13 insertions(+), 3 deletions(-)
 delete mode 100644 docs/changelogs/.gitignore

diff --git a/.gitignore b/.gitignore
index 0711d9b17..e91dcab3b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,6 +19,7 @@ docs/changelogs/
 docs/html/
 docs/pdf/
 docs/pseudoxml/
+docs/tags/
 docs/text/
 docs/tools/
 docs/xml/
diff --git a/CMakeLists.txt b/CMakeLists.txt
index a793bcfbb..d8d90b007 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -473,7 +473,16 @@ if(BUILD_DOCS)
     )
 
     set(SPHINX_OUTPUT "${CMAKE_CURRENT_SOURCE_DIR}/docs/html/.buildinfo")
-    set_source_files_properties(${SPHINX_OUTPUT} PROPERTIES GENERATED TRUE)
+    set_property(
+        DIRECTORY PROPERTY ADDITIONAL_CLEAN_FILES TRUE
+        "${CMAKE_CURRENT_SOURCE_DIR}/docs/changelogs"
+        "${CMAKE_CURRENT_SOURCE_DIR}/docs/html"
+        "${CMAKE_CURRENT_SOURCE_DIR}/docs/tags"
+        "${CMAKE_CURRENT_SOURCE_DIR}/docs/text"
+        "${CMAKE_CURRENT_SOURCE_DIR}/docs/tools"
+        "${CMAKE_BINARY_DIR}/docs/html"
+        "${CMAKE_BINARY_DIR}/docs/text"
+    ) 
     add_custom_command(OUTPUT ${SPHINX_OUTPUT}
         COMMAND ${SPHINX_EXECUTABLE}
             -E -q -b html -d "${CMAKE_BINARY_DIR}/docs/html"
diff --git a/docs/changelogs/.gitignore b/docs/changelogs/.gitignore
deleted file mode 100644
index 90de5c70d..000000000
--- a/docs/changelogs/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.txt
-*.rst
diff --git a/docs/sphinx_extensions/dfhack/changelog.py b/docs/sphinx_extensions/dfhack/changelog.py
index 629d6b6de..2f27590fd 100644
--- a/docs/sphinx_extensions/dfhack/changelog.py
+++ b/docs/sphinx_extensions/dfhack/changelog.py
@@ -238,6 +238,8 @@ def generate_changelog(all=False):
     consolidate_changelog(stable_entries)
     consolidate_changelog(dev_entries)
 
+    os.makedirs(os.path.join(DOCS_ROOT, 'changelogs'), mode=0o755, exist_ok=True)
+
     print_changelog(versions, stable_entries, os.path.join(DOCS_ROOT, 'changelogs/news.rst'))
     print_changelog(versions, dev_entries, os.path.join(DOCS_ROOT, 'changelogs/news-dev.rst'))
 

From 1a777257b43f86f547b2f7b586e28d797eb8227f Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Fri, 5 Aug 2022 22:06:02 -0700
Subject: [PATCH 440/854] add get_entry_types API method to helpdb

---
 library/lua/helpdb.lua | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/library/lua/helpdb.lua b/library/lua/helpdb.lua
index a23002e57..bfca996eb 100644
--- a/library/lua/helpdb.lua
+++ b/library/lua/helpdb.lua
@@ -468,6 +468,10 @@ local function get_db_property(entry_name, property)
             textdb[entrydb[entry_name].text_entry][property]
 end
 
+function ge_entry_types(entry)
+    return get_db_property(entry, 'entry_types')
+end
+
 -- returns the ~54 char summary blurb associated with the entry
 function get_entry_short_help(entry)
     return get_db_property(entry, 'short_help')
@@ -637,9 +641,7 @@ function get_commands()
 end
 
 function is_builtin(command)
-    ensure_db()
-    return entrydb[command] and
-            get_db_property(command, 'entry_types')[ENTRY_TYPES.BUILTIN]
+    return is_entry(command) and get_entry_types(command)[ENTRY_TYPES.BUILTIN]
 end
 
 ---------------------------------------------------------------------------

From 3e30b435fdb419a94b0db02f454a66235765a181 Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Fri, 5 Aug 2022 22:20:58 -0700
Subject: [PATCH 441/854] clean up docs build deps

---
 CMakeLists.txt | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index d8d90b007..129fcb16b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -459,12 +459,19 @@ if(BUILD_DOCS)
         "${CMAKE_CURRENT_SOURCE_DIR}/changelog.txt"
     )
     list(FILTER SPHINX_GLOB_RECURSE_DEPS
-        EXCLUDE REGEX "docs/_"
+        EXCLUDE REGEX "docs/changelogs"
     )
-    file(GLOB_RECURSE SPHINX_SCRIPT_DEPS
-        "${CMAKE_CURRENT_SOURCE_DIR}/scripts/*.lua"
-        "${CMAKE_CURRENT_SOURCE_DIR}/scripts/*.rb"
-        "${CMAKE_CURRENT_SOURCE_DIR}/scripts/*.txt"
+    list(FILTER SPHINX_GLOB_RECURSE_DEPS
+        EXCLUDE REGEX "docs/html"
+    )
+    list(FILTER SPHINX_GLOB_RECURSE_DEPS
+        EXCLUDE REGEX "docs/tags"
+    )
+    list(FILTER SPHINX_GLOB_RECURSE_DEPS
+        EXCLUDE REGEX "docs/text"
+    )
+    list(FILTER SPHINX_GLOB_RECURSE_DEPS
+        EXCLUDE REGEX "docs/tools"
     )
     set(SPHINX_DEPS ${SPHINX_GLOB_DEPS} ${SPHINX_GLOB_RECURSE_DEPS} ${SPHINX_SCRIPT_DEPS}
         "${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt"

From d04beb0e4a9b903fce241f15f2f1264701fc99a2 Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Fri, 5 Aug 2022 22:21:14 -0700
Subject: [PATCH 442/854] remove -E for sphinx-build. ninja clean can do it.

---
 CMakeLists.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 129fcb16b..5a650269a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -492,13 +492,13 @@ if(BUILD_DOCS)
     ) 
     add_custom_command(OUTPUT ${SPHINX_OUTPUT}
         COMMAND ${SPHINX_EXECUTABLE}
-            -E -q -b html -d "${CMAKE_BINARY_DIR}/docs/html"
+            -q -b html -d "${CMAKE_BINARY_DIR}/docs/html"
             "${CMAKE_CURRENT_SOURCE_DIR}"
             "${CMAKE_CURRENT_SOURCE_DIR}/docs/html"
             -w "${CMAKE_BINARY_DIR}/docs/html/_sphinx-warnings.txt"
             -j auto
         COMMAND ${SPHINX_EXECUTABLE}
-            -E -q -b text -d "${CMAKE_BINARY_DIR}/docs/text"
+            -q -b text -d "${CMAKE_BINARY_DIR}/docs/text"
             "${CMAKE_CURRENT_SOURCE_DIR}"
             "${CMAKE_CURRENT_SOURCE_DIR}/docs/text"
             -w "${CMAKE_BINARY_DIR}/docs/text/_sphinx-warnings.txt"

From 625b4d439df84d0ad45dfc52795031e6d0ca9b2b Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Fri, 5 Aug 2022 22:31:39 -0700
Subject: [PATCH 443/854] fix typo in API function name

---
 library/lua/helpdb.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/library/lua/helpdb.lua b/library/lua/helpdb.lua
index bfca996eb..7bc95bc75 100644
--- a/library/lua/helpdb.lua
+++ b/library/lua/helpdb.lua
@@ -468,7 +468,7 @@ local function get_db_property(entry_name, property)
             textdb[entrydb[entry_name].text_entry][property]
 end
 
-function ge_entry_types(entry)
+function get_entry_types(entry)
     return get_db_property(entry, 'entry_types')
 end
 

From 6700a8d9222a00ff91accd9336734124f569d2c8 Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Fri, 5 Aug 2022 22:31:51 -0700
Subject: [PATCH 444/854] add missing keybinds for filltraffic plugin

---
 docs/plugins/filltraffic.rst | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/docs/plugins/filltraffic.rst b/docs/plugins/filltraffic.rst
index 5a3beaab7..acc4dabc8 100644
--- a/docs/plugins/filltraffic.rst
+++ b/docs/plugins/filltraffic.rst
@@ -4,7 +4,10 @@
 filltraffic
 ===========
 **Tags:** `tag/fort`, `tag/productivity`, `tag/design`, `tag/map`
-:dfhack-keybind:``
+:dfhack-keybind:`filltraffic`
+:dfhack-keybind:`alltraffic`
+:dfhack-keybind:`restrictice`
+:dfhack-keybind:`restrictliquids`
 
 Usage:
 

From 02a8f63ffc542b5d9f4f63b2bd7962ef31fcf095 Mon Sep 17 00:00:00 2001
From: "pre-commit-ci[bot]"
 <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Date: Sat, 6 Aug 2022 05:38:19 +0000
Subject: [PATCH 445/854] [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci
---
 CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5a650269a..74bad7fa5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -489,7 +489,7 @@ if(BUILD_DOCS)
         "${CMAKE_CURRENT_SOURCE_DIR}/docs/tools"
         "${CMAKE_BINARY_DIR}/docs/html"
         "${CMAKE_BINARY_DIR}/docs/text"
-    ) 
+    )
     add_custom_command(OUTPUT ${SPHINX_OUTPUT}
         COMMAND ${SPHINX_EXECUTABLE}
             -q -b html -d "${CMAKE_BINARY_DIR}/docs/html"

From c73200bf66dc4e93d6de6e572229e2d9c0cbad5a Mon Sep 17 00:00:00 2001
From: DFHack-Urist via GitHub Actions
 <63161697+DFHack-Urist@users.noreply.github.com>
Date: Sat, 6 Aug 2022 07:16:47 +0000
Subject: [PATCH 446/854] Auto-update submodules

scripts: master
---
 scripts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts b/scripts
index 6a66be4fa..f37c0d022 160000
--- a/scripts
+++ b/scripts
@@ -1 +1 @@
-Subproject commit 6a66be4facd1d5a7b3ab4cb61c34c678d19e0795
+Subproject commit f37c0d022135ca10fb5375c4e56e11215bf208ae

From ac175affbc2d2a5928a941239cba656bf886996c Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Sat, 6 Aug 2022 12:22:27 -0400
Subject: [PATCH 447/854] Make renderer-msg draw somewhat more reliably

From g_src (enabler.cpp: renderer::display()), either update_all() or
update_tile() is called at least once per frame
---
 plugins/devel/renderer-msg.cpp | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/plugins/devel/renderer-msg.cpp b/plugins/devel/renderer-msg.cpp
index e6a33114f..4d5da09a6 100644
--- a/plugins/devel/renderer-msg.cpp
+++ b/plugins/devel/renderer-msg.cpp
@@ -23,13 +23,22 @@ struct scdata {
 };
 
 struct renderer_msg : public Renderer::renderer_wrap {
-    virtual void update_tile (int32_t x, int32_t y) {
+    virtual void update_tile(int32_t x, int32_t y) override {
+        draw_message();
+        renderer_wrap::update_tile(x, y);
+    }
+
+    virtual void update_all() override {
+        draw_message();
+        renderer_wrap::update_all();
+    }
+
+    void draw_message() {
         static std::string str = std::string("DFHack: ") + plugin_name + " active";
-        Screen::paintString(Screen::Pen(' ', 9, 0), 0, gps->dimy - 1, str);
+        Screen::paintString(Screen::Pen(' ', COLOR_LIGHTCYAN, COLOR_GREEN), 0, gps->dimy - 1, str);
         for (int32_t i = 0; i < gps->dimx; ++i)
             ((scdata*)screen)[i * gps->dimy + gps->dimy - 1].bg = 2;
-        renderer_wrap::update_tile(x, y);
-    };
+    }
 };
 
 DFhackCExport command_result plugin_init (color_ostream &out, std::vector <PluginCommand> &commands)

From 69a84c23c2da0190ee25a10332f31e29183a1c89 Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Sat, 6 Aug 2022 12:33:25 -0400
Subject: [PATCH 448/854] renderer-msg: draw less often

suggested by Quietust
---
 plugins/devel/renderer-msg.cpp | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/plugins/devel/renderer-msg.cpp b/plugins/devel/renderer-msg.cpp
index 4d5da09a6..1f26886c6 100644
--- a/plugins/devel/renderer-msg.cpp
+++ b/plugins/devel/renderer-msg.cpp
@@ -23,6 +23,8 @@ struct scdata {
 };
 
 struct renderer_msg : public Renderer::renderer_wrap {
+    bool message_dirty = true;  // force redraw when renderer is installed
+
     virtual void update_tile(int32_t x, int32_t y) override {
         draw_message();
         renderer_wrap::update_tile(x, y);
@@ -33,11 +35,20 @@ struct renderer_msg : public Renderer::renderer_wrap {
         renderer_wrap::update_all();
     }
 
+    virtual void render() override {
+        message_dirty = true;
+        renderer_wrap::render();
+    }
+
     void draw_message() {
-        static std::string str = std::string("DFHack: ") + plugin_name + " active";
-        Screen::paintString(Screen::Pen(' ', COLOR_LIGHTCYAN, COLOR_GREEN), 0, gps->dimy - 1, str);
-        for (int32_t i = 0; i < gps->dimx; ++i)
-            ((scdata*)screen)[i * gps->dimy + gps->dimy - 1].bg = 2;
+        if (message_dirty) {
+            static std::string str = std::string("DFHack: ") + plugin_name + " active";
+            Screen::paintString(Screen::Pen(' ', COLOR_LIGHTCYAN, COLOR_GREEN), 0, gps->dimy - 1, str);
+            for (int32_t i = 0; i < gps->dimx; ++i)
+                ((scdata*)screen)[i * gps->dimy + gps->dimy - 1].bg = 2;
+
+            message_dirty = false;
+        }
     }
 };
 

From 9098914ce47471d8a368e07ae46ccad2074959b5 Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Sat, 6 Aug 2022 22:47:38 -0400
Subject: [PATCH 449/854] Add --offline option to docs/build.py to disable
 image downloads

---
 conf.py       | 16 ++++++++++++++++
 docs/build.py | 10 +++++++++-
 2 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/conf.py b/conf.py
index 08c2e6bd8..dd7be9792 100644
--- a/conf.py
+++ b/conf.py
@@ -24,6 +24,22 @@ import sphinx
 import sys
 
 
+if os.environ.get('DFHACK_DOCS_BUILD_OFFLINE'):
+    # block attempted image downloads, particularly for the PDF builder
+    def request_disabled(*args, **kwargs):
+        raise RuntimeError('Offline build - network request blocked')
+
+    import urllib3.util
+    urllib3.util.create_connection = request_disabled
+
+    import urllib3.connection
+    urllib3.connection.HTTPConnection.connect = request_disabled
+
+    import requests
+    requests.request = request_disabled
+    requests.get = request_disabled
+
+
 # -- Support :dfhack-keybind:`command` ------------------------------------
 # this is a custom directive that pulls info from default keybindings
 
diff --git a/docs/build.py b/docs/build.py
index 582279bcb..6a63ed59e 100755
--- a/docs/build.py
+++ b/docs/build.py
@@ -63,6 +63,8 @@ def parse_args(source_args):
         help='Number of Sphinx threads to run [environment variable: JOBS; default: "auto"]')
     parser.add_argument('--debug', action='store_true',
         help='Log commands that are run, etc.')
+    parser.add_argument('--offline', action='store_true',
+        help='Disable network connections')
     args, forward_args = _parse_known_args(parser, source_args)
 
     # work around weirdness with list args
@@ -79,6 +81,11 @@ if __name__ == '__main__':
         exit(1)
 
     args, forward_args = parse_args(sys.argv[1:])
+
+    sphinx_env = os.environ.copy()
+    if args.offline:
+        sphinx_env['DFHACK_DOCS_BUILD_OFFLINE'] = '1'
+
     for format_name in args.format:
         command = [args.sphinx] + OUTPUT_FORMATS[format_name].args + ['-j', args.jobs]
         if args.clean:
@@ -88,5 +95,6 @@ if __name__ == '__main__':
         if args.debug:
             print('Building:', format_name)
             print('Running:', command)
-        subprocess.call(command)
+        subprocess.run(command, check=True, env=sphinx_env)
+
         print('')

From 153fef934b612d58b2e1692ae1eb315205c121c2 Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Sat, 6 Aug 2022 23:32:00 -0700
Subject: [PATCH 450/854] clean up Label tests

---
 test/library/gui/widgets.Label.lua | 24 +++---------------------
 1 file changed, 3 insertions(+), 21 deletions(-)

diff --git a/test/library/gui/widgets.Label.lua b/test/library/gui/widgets.Label.lua
index 49a75a235..4e6222e3a 100644
--- a/test/library/gui/widgets.Label.lua
+++ b/test/library/gui/widgets.Label.lua
@@ -1,13 +1,6 @@
--- test -dhack/scripts/devel/tests -twidgets.Label
-
 local gui = require('gui')
 local widgets = require('gui.widgets')
 
-local xtest = {} -- use to temporarily disable tests (change `function xtest.somename` to `function xxtest.somename`)
-local wait = function(n)
-    delay(n or 30) -- enable for debugging the tests
-end
-
 local fs = defclass(fs, gui.FramedScreen)
 fs.ATTRS = {
     frame_style = gui.GREY_LINE_FRAME,
@@ -18,7 +11,7 @@ fs.ATTRS = {
     focus_path = 'test-framed-screen',
 }
 
-function test.Label_correct_frame_body_with_scroll_icons()
+function test.correct_frame_body_with_scroll_icons()
     local t = {}
     for i = 1, 12 do
         t[#t+1] = tostring(i)
@@ -31,19 +24,15 @@ function test.Label_correct_frame_body_with_scroll_icons()
                 view_id = 'text',
                 frame_inset = 0,
                 text = t,
-                --show_scroll_icons = 'right',
             },
         }
     end
 
     local o = fs{}
-    --o:show()
-    --wait()
     expect.eq(o.subviews.text.frame_body.width, 9, "Label's frame_body.x2 and .width should be one smaller because of show_scroll_icons.")
-    --o:dismiss()
 end
 
-function test.Label_correct_frame_body_with_few_text_lines()
+function test.correct_frame_body_with_few_text_lines()
     local t = {}
     for i = 1, 10 do
         t[#t+1] = tostring(i)
@@ -56,19 +45,15 @@ function test.Label_correct_frame_body_with_few_text_lines()
                 view_id = 'text',
                 frame_inset = 0,
                 text = t,
-                --show_scroll_icons = 'right',
             },
         }
     end
 
     local o = fs{}
-    --o:show()
-    --wait()
     expect.eq(o.subviews.text.frame_body.width, 10, "Label's frame_body.x2 and .width should not change with show_scroll_icons = false.")
-    --o:dismiss()
 end
 
-function test.Label_correct_frame_body_without_show_scroll_icons()
+function test.correct_frame_body_without_show_scroll_icons()
     local t = {}
     for i = 1, 12 do
         t[#t+1] = tostring(i)
@@ -87,8 +72,5 @@ function test.Label_correct_frame_body_without_show_scroll_icons()
     end
 
     local o = fs{}
-    --o:show()
-    --wait()
     expect.eq(o.subviews.text.frame_body.width, 10, "Label's frame_body.x2 and .width should not change with show_scroll_icons = false.")
-    --o:dismiss()
 end

From a8d0cc798036901a8ccbd7ba4c0b730e94787fce Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Sat, 6 Aug 2022 23:48:25 -0700
Subject: [PATCH 451/854] support scrolling by half pages in Label

---
 docs/Lua API.rst                   | 17 ++++++++---
 library/lua/gui/widgets.lua        | 18 ++++++++----
 test/library/gui/widgets.Label.lua | 46 ++++++++++++++++++++++++++++--
 3 files changed, 69 insertions(+), 12 deletions(-)

diff --git a/docs/Lua API.rst b/docs/Lua API.rst
index 94eaa1165..d436bdd5c 100644
--- a/docs/Lua API.rst	
+++ b/docs/Lua API.rst	
@@ -3928,11 +3928,14 @@ It has the following attributes:
 :auto_width: Sets self.frame.w from the text width.
 :on_click: A callback called when the label is clicked (optional)
 :on_rclick: A callback called when the label is right-clicked (optional)
-:scroll_keys: Specifies which keys the label should react to as a table. Default is ``STANDARDSCROLL`` (up or down arrows, page up or down).
+:scroll_keys: Specifies which keys the label should react to as a table. The table should map
+    keys to the number of lines to scroll as positive or negative integers or one of the keywords
+    supported by the ``scroll`` method. The default is up/down arrows scrolling by one line and page
+    up/down scrolling by one page.
 :show_scroll_icons: Controls scroll icons' behaviour: ``false`` for no icons, ``'right'`` or ``'left'`` for
-     icons next to the text in an additional column (``frame_inset`` is adjusted to have ``.r`` or ``.l`` greater than ``0``),
-     ``nil`` same as ``'right'`` but changes ``frame_inset`` only if a scroll icon is actually necessary
-     (if ``getTextHeight()`` is greater than ``frame_body.height``). Default is ``nil``.
+    icons next to the text in an additional column (``frame_inset`` is adjusted to have ``.r`` or ``.l`` greater than ``0``),
+    ``nil`` same as ``'right'`` but changes ``frame_inset`` only if a scroll icon is actually necessary
+    (if ``getTextHeight()`` is greater than ``frame_body.height``). Default is ``nil``.
 :up_arrow_icon: The symbol for scroll up arrow. Default is ``string.char(24)`` (``↑``).
 :down_arrow_icon: The symbol for scroll down arrow. Default is ``string.char(25)`` (``↓``).
 :scroll_icon_pen: Specifies the pen for scroll icons. Default is ``COLOR_LIGHTCYAN``.
@@ -4024,6 +4027,12 @@ The Label widget implements the following methods:
 
   Computes the width of the text.
 
+* ``label:scroll(nlines)``
+
+  This method takes the number of lines to scroll as positive or negative
+  integers or one of the following keywords: ``+page``, ``-page``,
+  ``+halfpage``, or ``-halfpage``.
+
 WrappedLabel class
 ------------------
 
diff --git a/library/lua/gui/widgets.lua b/library/lua/gui/widgets.lua
index 5765992af..3ac74bb52 100644
--- a/library/lua/gui/widgets.lua
+++ b/library/lua/gui/widgets.lua
@@ -652,6 +652,19 @@ function Label:onRenderFrame(dc, rect)
 end
 
 function Label:scroll(nlines)
+    if type(nlines) == 'string' then
+        if nlines == '+page' then
+            nlines = self.frame_body.height
+        elseif nlines == '-page' then
+            nlines = -self.frame_body.height
+        elseif nlines == '+halfpage' then
+            nlines = math.ceil(self.frame_body.height/2)
+        elseif nlines == '-halfpage' then
+            nlines = -math.ceil(self.frame_body.height/2)
+        else
+            error(('unhandled scroll keyword: "%s"'):format(nlines))
+        end
+    end
     local n = self.start_line_num + nlines
     n = math.min(n, self:getTextHeight() - self.frame_body.height + 1)
     n = math.max(n, 1)
@@ -668,11 +681,6 @@ function Label:onInput(keys)
     end
     for k,v in pairs(self.scroll_keys) do
         if keys[k] then
-            if v == '+page' then
-                v = self.frame_body.height
-            elseif v == '-page' then
-                v = -self.frame_body.height
-            end
             self:scroll(v)
         end
     end
diff --git a/test/library/gui/widgets.Label.lua b/test/library/gui/widgets.Label.lua
index 4e6222e3a..9a5d462fa 100644
--- a/test/library/gui/widgets.Label.lua
+++ b/test/library/gui/widgets.Label.lua
@@ -18,7 +18,7 @@ function test.correct_frame_body_with_scroll_icons()
         t[#t+1] = NEWLINE
     end
 
-    function fs:init(args)
+    function fs:init()
         self:addviews{
             widgets.Label{
                 view_id = 'text',
@@ -39,7 +39,7 @@ function test.correct_frame_body_with_few_text_lines()
         t[#t+1] = NEWLINE
     end
 
-    function fs:init(args)
+    function fs:init()
         self:addviews{
             widgets.Label{
                 view_id = 'text',
@@ -60,7 +60,7 @@ function test.correct_frame_body_without_show_scroll_icons()
         t[#t+1] = NEWLINE
     end
 
-    function fs:init(args)
+    function fs:init()
         self:addviews{
             widgets.Label{
                 view_id = 'text',
@@ -74,3 +74,43 @@ function test.correct_frame_body_without_show_scroll_icons()
     local o = fs{}
     expect.eq(o.subviews.text.frame_body.width, 10, "Label's frame_body.x2 and .width should not change with show_scroll_icons = false.")
 end
+
+function test.scroll()
+    local t = {}
+    for i = 1, 12 do
+        t[#t+1] = tostring(i)
+        t[#t+1] = NEWLINE
+    end
+
+    function fs:init()
+        self:addviews{
+            widgets.Label{
+                view_id = 'text',
+                frame_inset = 0,
+                text = t,
+            },
+        }
+    end
+
+    local o = fs{frame_height=3}
+    local txt = o.subviews.text
+    expect.eq(1, txt.start_line_num)
+    
+    txt:scroll(1)
+    expect.eq(2, txt.start_line_num)
+    txt:scroll('+page')
+    expect.eq(5, txt.start_line_num)
+    txt:scroll('+halfpage')
+    expect.eq(7, txt.start_line_num)
+    txt:scroll('-halfpage')
+    expect.eq(5, txt.start_line_num)
+    txt:scroll('-page')
+    expect.eq(2, txt.start_line_num)
+    txt:scroll(-1)
+    expect.eq(1, txt.start_line_num)
+
+    txt:scroll(-1)
+    expect.eq(1, txt.start_line_num)
+    txt:scroll(100)
+    expect.eq(10, txt.start_line_num)
+end

From f78e4276f985ca532a265f2e477ed0f4a772b7f9 Mon Sep 17 00:00:00 2001
From: "pre-commit-ci[bot]"
 <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Date: Sun, 7 Aug 2022 15:27:14 +0000
Subject: [PATCH 452/854] [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci
---
 test/library/gui/widgets.Label.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/library/gui/widgets.Label.lua b/test/library/gui/widgets.Label.lua
index 9a5d462fa..6b0097d1e 100644
--- a/test/library/gui/widgets.Label.lua
+++ b/test/library/gui/widgets.Label.lua
@@ -95,7 +95,7 @@ function test.scroll()
     local o = fs{frame_height=3}
     local txt = o.subviews.text
     expect.eq(1, txt.start_line_num)
-    
+
     txt:scroll(1)
     expect.eq(2, txt.start_line_num)
     txt:scroll('+page')

From ef56addb1476c3039757a312d11db405c159d0b5 Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Sun, 7 Aug 2022 22:13:46 -0700
Subject: [PATCH 453/854] prep for new format; accept pipe as tag separator

---
 library/lua/helpdb.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/library/lua/helpdb.lua b/library/lua/helpdb.lua
index 7bc95bc75..a6c635ee0 100644
--- a/library/lua/helpdb.lua
+++ b/library/lua/helpdb.lua
@@ -211,7 +211,7 @@ local function update_entry(entry, iterator, opts)
         ::continue::
     end
     entry.tags = {}
-    for _,tag in ipairs(tags:split('[ ,]+')) do
+    for _,tag in ipairs(tags:split('[ ,|]+')) do
         entry.tags[tag] = true
     end
     if #lines > 0 then

From 8930f30b72c2c4d3486a70ab05ee350c55295ef9 Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Sun, 7 Aug 2022 22:36:47 -0700
Subject: [PATCH 454/854] remove unuseful command from automelt

---
 plugins/automelt.cpp | 20 ++------------------
 1 file changed, 2 insertions(+), 18 deletions(-)

diff --git a/plugins/automelt.cpp b/plugins/automelt.cpp
index 852b324d6..4bbb727d7 100644
--- a/plugins/automelt.cpp
+++ b/plugins/automelt.cpp
@@ -250,19 +250,6 @@ IMPLEMENT_VMETHOD_INTERPOSE(melt_hook, feed);
 IMPLEMENT_VMETHOD_INTERPOSE(melt_hook, render);
 
 
-static command_result automelt_cmd(color_ostream &out, vector <string> & parameters)
-{
-    if (!parameters.empty())
-    {
-        if (parameters.size() == 1 && toLower(parameters[0])[0] == 'v')
-        {
-            out << "Automelt" << endl << "Version: " << PLUGIN_VERSION << endl;
-        }
-    }
-
-    return CR_OK;
-}
-
 DFhackCExport command_result plugin_onstatechange(color_ostream &out, state_change_event event)
 {
     switch (event)
@@ -296,15 +283,12 @@ DFhackCExport command_result plugin_enable(color_ostream &out, bool enable)
 
 DFhackCExport command_result plugin_init ( color_ostream &out, std::vector <PluginCommand> &commands)
 {
-    commands.push_back(
-        PluginCommand(
-        "automelt", "Automatically melt metal items in marked stockpiles.",
-        automelt_cmd, false, ""));
-
     return CR_OK;
 }
 
 DFhackCExport command_result plugin_shutdown ( color_ostream &out )
 {
+    // ensure we disengage our hooks
+    plugin_enable(out, false);
     return CR_OK;
 }

From 22de8f61397eb3a2be38f291ef22cb8f4598d07e Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Sun, 7 Aug 2022 22:50:47 -0700
Subject: [PATCH 455/854] add secondary hotkey for gui/launcher

---
 data/init/dfhack.keybindings.init | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/data/init/dfhack.keybindings.init b/data/init/dfhack.keybindings.init
index f38840e06..c8785eba7 100644
--- a/data/init/dfhack.keybindings.init
+++ b/data/init/dfhack.keybindings.init
@@ -8,7 +8,9 @@
 # Generic dwarfmode bindings #
 ##############################
 
+# the GUI command launcher (two bindings since some keyboards don't have `)
 keybinding add ` gui/launcher
+keybinding add Ctrl-Shift-D gui/launcher
 
 # show all current key bindings
 keybinding add Ctrl-F1 hotkeys
@@ -42,7 +44,7 @@ keybinding add Ctrl-K autodump-destroy-item
 # quicksave, only in main dwarfmode screen and menu page
 keybinding add Ctrl-Alt-S@dwarfmode/Default quicksave
 
-# gui/quickfort script - apply pre-made blueprints to the map
+# apply blueprints to the map (Alt-F for compatibility with LNP Quickfort)
 keybinding add Ctrl-Shift-Q@dwarfmode gui/quickfort
 keybinding add Alt-F@dwarfmode gui/quickfort
 

From 7274a8cd2a08f84dec341e5906f12767f9789790 Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Sun, 7 Aug 2022 23:35:00 -0700
Subject: [PATCH 456/854] use docs/build.py to do the docs build

and add sphinx extension python files to the build deps
---
 CMakeLists.txt | 16 +++-------------
 1 file changed, 3 insertions(+), 13 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 74bad7fa5..1f11dc93a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -457,6 +457,7 @@ if(BUILD_DOCS)
     file(GLOB_RECURSE SPHINX_GLOB_RECURSE_DEPS
         "${CMAKE_CURRENT_SOURCE_DIR}/*.rst"
         "${CMAKE_CURRENT_SOURCE_DIR}/changelog.txt"
+        "${CMAKE_CURRENT_SOURCE_DIR}/docs/*py"
     )
     list(FILTER SPHINX_GLOB_RECURSE_DEPS
         EXCLUDE REGEX "docs/changelogs"
@@ -476,7 +477,6 @@ if(BUILD_DOCS)
     set(SPHINX_DEPS ${SPHINX_GLOB_DEPS} ${SPHINX_GLOB_RECURSE_DEPS} ${SPHINX_SCRIPT_DEPS}
         "${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt"
         "${CMAKE_CURRENT_SOURCE_DIR}/conf.py"
-        "${CMAKE_CURRENT_SOURCE_DIR}/docs/gen_changelog.py"
     )
 
     set(SPHINX_OUTPUT "${CMAKE_CURRENT_SOURCE_DIR}/docs/html/.buildinfo")
@@ -491,18 +491,8 @@ if(BUILD_DOCS)
         "${CMAKE_BINARY_DIR}/docs/text"
     )
     add_custom_command(OUTPUT ${SPHINX_OUTPUT}
-        COMMAND ${SPHINX_EXECUTABLE}
-            -q -b html -d "${CMAKE_BINARY_DIR}/docs/html"
-            "${CMAKE_CURRENT_SOURCE_DIR}"
-            "${CMAKE_CURRENT_SOURCE_DIR}/docs/html"
-            -w "${CMAKE_BINARY_DIR}/docs/html/_sphinx-warnings.txt"
-            -j auto
-        COMMAND ${SPHINX_EXECUTABLE}
-            -q -b text -d "${CMAKE_BINARY_DIR}/docs/text"
-            "${CMAKE_CURRENT_SOURCE_DIR}"
-            "${CMAKE_CURRENT_SOURCE_DIR}/docs/text"
-            -w "${CMAKE_BINARY_DIR}/docs/text/_sphinx-warnings.txt"
-            -j auto
+        COMMAND "${CMAKE_CURRENT_SOURCE_DIR}/docs/build.py"
+            html text --sphinx="${SPHINX_EXECUTABLE}" -- -q 
         DEPENDS ${SPHINX_DEPS}
         COMMENT "Building documentation with Sphinx"
     )

From 8f332c5925a9a4059c6868c7e96a4911f50c798f Mon Sep 17 00:00:00 2001
From: "pre-commit-ci[bot]"
 <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Date: Mon, 8 Aug 2022 06:39:11 +0000
Subject: [PATCH 457/854] [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci
---
 CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1f11dc93a..c341735c9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -492,7 +492,7 @@ if(BUILD_DOCS)
     )
     add_custom_command(OUTPUT ${SPHINX_OUTPUT}
         COMMAND "${CMAKE_CURRENT_SOURCE_DIR}/docs/build.py"
-            html text --sphinx="${SPHINX_EXECUTABLE}" -- -q 
+            html text --sphinx="${SPHINX_EXECUTABLE}" -- -q
         DEPENDS ${SPHINX_DEPS}
         COMMENT "Building documentation with Sphinx"
     )

From c44c8721c9ec2a2040edbda97c610afc405436a0 Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Wed, 27 Jul 2022 02:17:21 -0400
Subject: [PATCH 458/854] Initial attempt at dfhack-tool directive

Doesn't appear to produce headings that can be used as link targets...
---
 conf.py                                    |  1 +
 docs/plugins/3dveins.rst                   |  3 ++
 docs/sphinx_extensions/dfhack/tool_docs.py | 52 ++++++++++++++++++++++
 docs/sphinx_extensions/dfhack/util.py      | 13 ++++++
 4 files changed, 69 insertions(+)
 create mode 100644 docs/sphinx_extensions/dfhack/tool_docs.py

diff --git a/conf.py b/conf.py
index dd7be9792..e8ff8392b 100644
--- a/conf.py
+++ b/conf.py
@@ -237,6 +237,7 @@ extensions = [
     'sphinx.ext.extlinks',
     'dfhack.changelog',
     'dfhack.lexer',
+    'dfhack.tool_docs',
 ]
 
 sphinx_major_version = sphinx.version_info[0]
diff --git a/docs/plugins/3dveins.rst b/docs/plugins/3dveins.rst
index 680d44c6e..9cd678709 100644
--- a/docs/plugins/3dveins.rst
+++ b/docs/plugins/3dveins.rst
@@ -3,6 +3,9 @@
 **Tags:** `tag/fort`, `tag/mod`, `tag/map`
 :dfhack-keybind:`3dveins`
 
+.. dfhack-tool:: 3dveins
+    :tags: foo, bar
+
 :index:`Rewrite layer veins to expand in 3D space.
 <3dveins; Rewrite layer veins to expand in 3D space.>` Existing, flat veins
 are removed and new 3D veins that naturally span z-levels are generated in
diff --git a/docs/sphinx_extensions/dfhack/tool_docs.py b/docs/sphinx_extensions/dfhack/tool_docs.py
new file mode 100644
index 000000000..ac06a6576
--- /dev/null
+++ b/docs/sphinx_extensions/dfhack/tool_docs.py
@@ -0,0 +1,52 @@
+# useful references:
+#   https://www.sphinx-doc.org/en/master/extdev/appapi.html
+#   https://www.sphinx-doc.org/en/master/development/tutorials/recipe.html
+#   https://www.sphinx-doc.org/en/master/usage/restructuredtext/basics.html#rst-directives
+
+import docutils.nodes as nodes
+# import docutils.parsers.rst.directives as rst_directives
+import sphinx
+import sphinx.directives
+
+import dfhack.util
+
+class DFHackToolDirective(sphinx.directives.ObjectDescription):
+    has_content = False
+    required_arguments = 1
+    option_spec = {
+        'tags': dfhack.util.directive_arg_str_list,
+    }
+
+    def run(self):
+        tool_name = self.get_signatures()[0]
+
+        tag_nodes = [nodes.strong(text='Tags: ')]
+        for tag in self.options['tags']:
+            tag_nodes += [
+                nodes.literal(tag, tag),
+                nodes.inline(text=' | '),
+            ]
+        tag_nodes.pop()
+
+        return [
+            nodes.title(text=tool_name),
+            nodes.paragraph('', '', *tag_nodes),
+        ]
+
+    # simpler but always renders as "inline code" (and less customizable)
+    # def handle_signature(self, sig, signode):
+    #     signode += addnodes.desc_name(text=sig)
+    #     return sig
+
+
+def register(app):
+    app.add_directive('dfhack-tool', DFHackToolDirective)
+
+def setup(app):
+    app.connect('builder-inited', register)
+
+    return {
+        'version': '0.1',
+        'parallel_read_safe': True,
+        'parallel_write_safe': True,
+    }
diff --git a/docs/sphinx_extensions/dfhack/util.py b/docs/sphinx_extensions/dfhack/util.py
index 71a432da4..61f38b043 100644
--- a/docs/sphinx_extensions/dfhack/util.py
+++ b/docs/sphinx_extensions/dfhack/util.py
@@ -5,3 +5,16 @@ DOCS_ROOT = os.path.join(DFHACK_ROOT, 'docs')
 
 if not os.path.isdir(DOCS_ROOT):
     raise ReferenceError('docs root not found: %s' % DOCS_ROOT)
+
+# directive argument helpers (supplementing docutils.parsers.rst.directives)
+def directive_arg_str_list(argument):
+    """
+    Converts a space- or comma-separated list of values into a Python list
+    of strings.
+    (Directive option conversion function.)
+    """
+    if ',' in argument:
+        entries = argument.split(',')
+    else:
+        entries = argument.split()
+    return [entry.strip() for entry in entries]

From d96260556eb7e92d3f0b3f61defdecbe38892a41 Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Wed, 27 Jul 2022 03:18:51 -0400
Subject: [PATCH 459/854] Make title visible by putting it in its own section

---
 docs/plugins/3dveins.rst                   | 6 +++---
 docs/sphinx_extensions/dfhack/tool_docs.py | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/docs/plugins/3dveins.rst b/docs/plugins/3dveins.rst
index 9cd678709..7ae2324eb 100644
--- a/docs/plugins/3dveins.rst
+++ b/docs/plugins/3dveins.rst
@@ -1,10 +1,10 @@
 3dveins
 =======
-**Tags:** `tag/fort`, `tag/mod`, `tag/map`
-:dfhack-keybind:`3dveins`
 
 .. dfhack-tool:: 3dveins
-    :tags: foo, bar
+    :tags: fort, mod, map
+
+:dfhack-keybind:`3dveins`
 
 :index:`Rewrite layer veins to expand in 3D space.
 <3dveins; Rewrite layer veins to expand in 3D space.>` Existing, flat veins
diff --git a/docs/sphinx_extensions/dfhack/tool_docs.py b/docs/sphinx_extensions/dfhack/tool_docs.py
index ac06a6576..dcda81d8d 100644
--- a/docs/sphinx_extensions/dfhack/tool_docs.py
+++ b/docs/sphinx_extensions/dfhack/tool_docs.py
@@ -29,7 +29,7 @@ class DFHackToolDirective(sphinx.directives.ObjectDescription):
         tag_nodes.pop()
 
         return [
-            nodes.title(text=tool_name),
+            nodes.section('', nodes.title(text=tool_name)),
             nodes.paragraph('', '', *tag_nodes),
         ]
 

From 89a88e94a9794bc488114c73e670de0080e539c0 Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Wed, 27 Jul 2022 22:02:08 -0400
Subject: [PATCH 460/854] Allow empty :tags:, give section a name to prevent
 errors

---
 docs/sphinx_extensions/dfhack/tool_docs.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/sphinx_extensions/dfhack/tool_docs.py b/docs/sphinx_extensions/dfhack/tool_docs.py
index dcda81d8d..79516e0d8 100644
--- a/docs/sphinx_extensions/dfhack/tool_docs.py
+++ b/docs/sphinx_extensions/dfhack/tool_docs.py
@@ -21,7 +21,7 @@ class DFHackToolDirective(sphinx.directives.ObjectDescription):
         tool_name = self.get_signatures()[0]
 
         tag_nodes = [nodes.strong(text='Tags: ')]
-        for tag in self.options['tags']:
+        for tag in self.options.get('tags', []):
             tag_nodes += [
                 nodes.literal(tag, tag),
                 nodes.inline(text=' | '),
@@ -29,7 +29,7 @@ class DFHackToolDirective(sphinx.directives.ObjectDescription):
         tag_nodes.pop()
 
         return [
-            nodes.section('', nodes.title(text=tool_name)),
+            nodes.section('', nodes.title(text=tool_name), ids=[tool_name]),
             nodes.paragraph('', '', *tag_nodes),
         ]
 

From e47c681e9c252f0f4599f5c2f7b41ea13e4f05f3 Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Thu, 4 Aug 2022 02:07:52 -0400
Subject: [PATCH 461/854] Use write_file_if_changed() in changelog.py

Speeds up incremental builds significantly
---
 conf.py                                    | 25 ++++------------------
 docs/sphinx_extensions/dfhack/changelog.py |  4 ++--
 docs/sphinx_extensions/dfhack/util.py      | 20 +++++++++++++++++
 3 files changed, 26 insertions(+), 23 deletions(-)

diff --git a/conf.py b/conf.py
index e8ff8392b..49d005f46 100644
--- a/conf.py
+++ b/conf.py
@@ -14,9 +14,7 @@ serve to show the default.
 
 # pylint:disable=redefined-builtin
 
-import contextlib
 import datetime
-import io
 import os
 import re
 import shlex  # pylint:disable=unused-import
@@ -46,6 +44,10 @@ if os.environ.get('DFHACK_DOCS_BUILD_OFFLINE'):
 from docutils import nodes
 from docutils.parsers.rst import roles
 
+sys.path.append(os.path.join(os.path.abspath(os.path.dirname(__file__)), 'docs', 'sphinx_extensions'))
+from dfhack.util import write_file_if_changed
+
+
 def get_keybinds(root, files, keybindings):
     """Add keybindings in the specified files to the
     given keybindings dict.
@@ -145,23 +147,6 @@ def get_tags():
     return tags
 
 
-@contextlib.contextmanager
-def write_file_if_changed(path):
-    with io.StringIO() as buffer:
-        yield buffer
-        new_contents = buffer.getvalue()
-
-    try:
-        with open(path, 'r') as infile:
-            old_contents = infile.read()
-    except IOError:
-        old_contents = None
-
-    if old_contents != new_contents:
-        with open(path, 'w') as outfile:
-            outfile.write(new_contents)
-
-
 def generate_tag_indices():
     os.makedirs('docs/tags', mode=0o755, exist_ok=True)
     with write_file_if_changed('docs/tags/index.rst') as topidx:
@@ -225,8 +210,6 @@ generate_tag_indices()
 
 # -- General configuration ------------------------------------------------
 
-sys.path.append(os.path.join(os.path.abspath(os.path.dirname(__file__)), 'docs', 'sphinx_extensions'))
-
 # If your documentation needs a minimal Sphinx version, state it here.
 needs_sphinx = '1.8'
 
diff --git a/docs/sphinx_extensions/dfhack/changelog.py b/docs/sphinx_extensions/dfhack/changelog.py
index 2f27590fd..0cd732988 100644
--- a/docs/sphinx_extensions/dfhack/changelog.py
+++ b/docs/sphinx_extensions/dfhack/changelog.py
@@ -6,7 +6,7 @@ import sys
 
 from sphinx.errors import ExtensionError, SphinxError, SphinxWarning
 
-from dfhack.util import DFHACK_ROOT, DOCS_ROOT
+from dfhack.util import DFHACK_ROOT, DOCS_ROOT, write_file_if_changed
 
 CHANGELOG_PATHS = (
     'docs/changelog.txt',
@@ -172,7 +172,7 @@ def consolidate_changelog(all_entries):
 
 def print_changelog(versions, all_entries, path, replace=True, prefix=''):
     # all_entries: version -> section -> entry
-    with open(path, 'w') as f:
+    with write_file_if_changed(path) as f:
         def write(line):
             if replace:
                 line = replace_text(line, REPLACEMENTS)
diff --git a/docs/sphinx_extensions/dfhack/util.py b/docs/sphinx_extensions/dfhack/util.py
index 61f38b043..91f0accbe 100644
--- a/docs/sphinx_extensions/dfhack/util.py
+++ b/docs/sphinx_extensions/dfhack/util.py
@@ -1,3 +1,5 @@
+import contextlib
+import io
 import os
 
 DFHACK_ROOT = os.path.dirname(os.path.dirname(os.path.dirname(os.path.dirname(os.path.abspath(__file__)))))
@@ -6,6 +8,24 @@ DOCS_ROOT = os.path.join(DFHACK_ROOT, 'docs')
 if not os.path.isdir(DOCS_ROOT):
     raise ReferenceError('docs root not found: %s' % DOCS_ROOT)
 
+
+@contextlib.contextmanager
+def write_file_if_changed(path):
+    with io.StringIO() as buffer:
+        yield buffer
+        new_contents = buffer.getvalue()
+
+    try:
+        with open(path, 'r') as infile:
+            old_contents = infile.read()
+    except IOError:
+        old_contents = None
+
+    if old_contents != new_contents:
+        with open(path, 'w') as outfile:
+            outfile.write(new_contents)
+
+
 # directive argument helpers (supplementing docutils.parsers.rst.directives)
 def directive_arg_str_list(argument):
     """

From de5f4d356679db170f823d806c81b2b1f3b2ef18 Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Sat, 6 Aug 2022 16:24:56 -0400
Subject: [PATCH 462/854] Default to document basename in dfhack-tool directive

---
 docs/plugins/3dveins.rst                   |  2 +-
 docs/sphinx_extensions/dfhack/tool_docs.py | 12 +++++-------
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/docs/plugins/3dveins.rst b/docs/plugins/3dveins.rst
index 7ae2324eb..f1149eb98 100644
--- a/docs/plugins/3dveins.rst
+++ b/docs/plugins/3dveins.rst
@@ -1,7 +1,7 @@
 3dveins
 =======
 
-.. dfhack-tool:: 3dveins
+.. dfhack-tool::
     :tags: fort, mod, map
 
 :dfhack-keybind:`3dveins`
diff --git a/docs/sphinx_extensions/dfhack/tool_docs.py b/docs/sphinx_extensions/dfhack/tool_docs.py
index 79516e0d8..fd6ed0946 100644
--- a/docs/sphinx_extensions/dfhack/tool_docs.py
+++ b/docs/sphinx_extensions/dfhack/tool_docs.py
@@ -12,13 +12,16 @@ import dfhack.util
 
 class DFHackToolDirective(sphinx.directives.ObjectDescription):
     has_content = False
-    required_arguments = 1
+    required_arguments = 0
     option_spec = {
         'tags': dfhack.util.directive_arg_str_list,
     }
 
     def run(self):
-        tool_name = self.get_signatures()[0]
+        if self.arguments:
+            tool_name = self.arguments[0]
+        else:
+            tool_name = self.env.docname.split('/')[-1]
 
         tag_nodes = [nodes.strong(text='Tags: ')]
         for tag in self.options.get('tags', []):
@@ -33,11 +36,6 @@ class DFHackToolDirective(sphinx.directives.ObjectDescription):
             nodes.paragraph('', '', *tag_nodes),
         ]
 
-    # simpler but always renders as "inline code" (and less customizable)
-    # def handle_signature(self, sig, signode):
-    #     signode += addnodes.desc_name(text=sig)
-    #     return sig
-
 
 def register(app):
     app.add_directive('dfhack-tool', DFHackToolDirective)

From bb2ca0cc1666c8a33ef3dcfb4f11073c4830b746 Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Sat, 6 Aug 2022 16:59:45 -0400
Subject: [PATCH 463/854] Render dfhack-tool as admonition

Getting a section header integrated is complicated, so might as well emulate
Mediawiki with a box-like element instead
---
 docs/sphinx_extensions/dfhack/tool_docs.py | 9 +++++++--
 docs/styles/dfhack.css                     | 5 +++++
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/docs/sphinx_extensions/dfhack/tool_docs.py b/docs/sphinx_extensions/dfhack/tool_docs.py
index fd6ed0946..809bd48b8 100644
--- a/docs/sphinx_extensions/dfhack/tool_docs.py
+++ b/docs/sphinx_extensions/dfhack/tool_docs.py
@@ -32,8 +32,13 @@ class DFHackToolDirective(sphinx.directives.ObjectDescription):
         tag_nodes.pop()
 
         return [
-            nodes.section('', nodes.title(text=tool_name), ids=[tool_name]),
-            nodes.paragraph('', '', *tag_nodes),
+            nodes.admonition('', *[
+                nodes.paragraph('', '', *[
+                    nodes.strong('', 'Tool: '),
+                    nodes.inline('', tool_name),
+                ]),
+                nodes.paragraph('', '', *tag_nodes),
+            ], classes=['dfhack-tool-summary']),
         ]
 
 
diff --git a/docs/styles/dfhack.css b/docs/styles/dfhack.css
index 9b6e523ef..e24ce1c67 100644
--- a/docs/styles/dfhack.css
+++ b/docs/styles/dfhack.css
@@ -60,3 +60,8 @@ div.body {
 span.pre {
     overflow-wrap: break-word;
 }
+
+.dfhack-tool-summary p {
+    margin-top: 0;
+    margin-bottom: 0.5em;
+}

From 12b3363b2ca1c8417c2a1fb20f5806709bc58f76 Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Sat, 6 Aug 2022 17:26:33 -0400
Subject: [PATCH 464/854] Make dfhack-tool tags link to tag descriptions

---
 docs/sphinx_extensions/dfhack/tool_docs.py | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/docs/sphinx_extensions/dfhack/tool_docs.py b/docs/sphinx_extensions/dfhack/tool_docs.py
index 809bd48b8..65da95181 100644
--- a/docs/sphinx_extensions/dfhack/tool_docs.py
+++ b/docs/sphinx_extensions/dfhack/tool_docs.py
@@ -6,6 +6,7 @@
 import docutils.nodes as nodes
 # import docutils.parsers.rst.directives as rst_directives
 import sphinx
+import sphinx.addnodes as addnodes
 import sphinx.directives
 
 import dfhack.util
@@ -26,7 +27,13 @@ class DFHackToolDirective(sphinx.directives.ObjectDescription):
         tag_nodes = [nodes.strong(text='Tags: ')]
         for tag in self.options.get('tags', []):
             tag_nodes += [
-                nodes.literal(tag, tag),
+                addnodes.pending_xref(tag, nodes.inline(text=tag), **{
+                    'reftype': 'ref',
+                    'refdomain': 'std',
+                    'reftarget': 'tag/' + tag,
+                    'refexplicit': False,
+                    'refwarn': True,
+                }),
                 nodes.inline(text=' | '),
             ]
         tag_nodes.pop()

From d19ffa18060807dd58ede04e12cb54867d156950 Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Sat, 6 Aug 2022 23:08:51 -0400
Subject: [PATCH 465/854] Add stub dfhack-command directive, refactor to
 support

---
 docs/plugins/3dveins.rst                   |  2 +
 docs/sphinx_extensions/dfhack/tool_docs.py | 49 +++++++++++++++-------
 2 files changed, 37 insertions(+), 14 deletions(-)

diff --git a/docs/plugins/3dveins.rst b/docs/plugins/3dveins.rst
index f1149eb98..86a00b51c 100644
--- a/docs/plugins/3dveins.rst
+++ b/docs/plugins/3dveins.rst
@@ -4,6 +4,8 @@
 .. dfhack-tool::
     :tags: fort, mod, map
 
+.. dfhack-command::
+
 :dfhack-keybind:`3dveins`
 
 :index:`Rewrite layer veins to expand in 3D space.
diff --git a/docs/sphinx_extensions/dfhack/tool_docs.py b/docs/sphinx_extensions/dfhack/tool_docs.py
index 65da95181..9100375b3 100644
--- a/docs/sphinx_extensions/dfhack/tool_docs.py
+++ b/docs/sphinx_extensions/dfhack/tool_docs.py
@@ -11,19 +11,37 @@ import sphinx.directives
 
 import dfhack.util
 
-class DFHackToolDirective(sphinx.directives.ObjectDescription):
+class DFHackToolDirectiveBase(sphinx.directives.ObjectDescription):
     has_content = False
     required_arguments = 0
-    option_spec = {
-        'tags': dfhack.util.directive_arg_str_list,
-    }
 
-    def run(self):
+    def get_name_or_docname(self):
         if self.arguments:
-            tool_name = self.arguments[0]
+            return self.arguments[0]
         else:
-            tool_name = self.env.docname.split('/')[-1]
+            return self.env.docname.split('/')[-1]
+
+    def make_labeled_paragraph(self, label, content):
+        return nodes.paragraph('', '', *[
+            nodes.strong('', '{}: '.format(label)),
+            nodes.inline('', content),
+        ])
+
+    def make_nodes(self):
+        raise NotImplementedError
+
+    def run(self):
+        return [
+            nodes.admonition('', *self.make_nodes(), classes=['dfhack-tool-summary']),
+        ]
 
+
+class DFHackToolDirective(DFHackToolDirectiveBase):
+    option_spec = {
+        'tags': dfhack.util.directive_arg_str_list,
+    }
+
+    def make_nodes(self):
         tag_nodes = [nodes.strong(text='Tags: ')]
         for tag in self.options.get('tags', []):
             tag_nodes += [
@@ -39,18 +57,21 @@ class DFHackToolDirective(sphinx.directives.ObjectDescription):
         tag_nodes.pop()
 
         return [
-            nodes.admonition('', *[
-                nodes.paragraph('', '', *[
-                    nodes.strong('', 'Tool: '),
-                    nodes.inline('', tool_name),
-                ]),
-                nodes.paragraph('', '', *tag_nodes),
-            ], classes=['dfhack-tool-summary']),
+            self.make_labeled_paragraph('Tool', self.get_name_or_docname()),
+            nodes.paragraph('', '', *tag_nodes),
+        ]
+
+
+class DFHackCommandDirective(DFHackToolDirectiveBase):
+    def make_nodes(self):
+        return [
+            self.make_labeled_paragraph('Command', self.get_name_or_docname()),
         ]
 
 
 def register(app):
     app.add_directive('dfhack-tool', DFHackToolDirective)
+    app.add_directive('dfhack-command', DFHackCommandDirective)
 
 def setup(app):
     app.connect('builder-inited', register)

From b3d79f87cbb77e49d688400b6d588cd1f6b94f7e Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Sat, 6 Aug 2022 23:12:26 -0400
Subject: [PATCH 466/854] Fix optional name override

---
 docs/sphinx_extensions/dfhack/tool_docs.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/sphinx_extensions/dfhack/tool_docs.py b/docs/sphinx_extensions/dfhack/tool_docs.py
index 9100375b3..4911bd454 100644
--- a/docs/sphinx_extensions/dfhack/tool_docs.py
+++ b/docs/sphinx_extensions/dfhack/tool_docs.py
@@ -14,6 +14,7 @@ import dfhack.util
 class DFHackToolDirectiveBase(sphinx.directives.ObjectDescription):
     has_content = False
     required_arguments = 0
+    optional_arguments = 1
 
     def get_name_or_docname(self):
         if self.arguments:

From 39e928845879cea0f2ed9461f22dcde1403ad081 Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Sat, 6 Aug 2022 23:11:12 -0400
Subject: [PATCH 467/854] Render commands as literals

---
 docs/sphinx_extensions/dfhack/tool_docs.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/docs/sphinx_extensions/dfhack/tool_docs.py b/docs/sphinx_extensions/dfhack/tool_docs.py
index 4911bd454..35e4de700 100644
--- a/docs/sphinx_extensions/dfhack/tool_docs.py
+++ b/docs/sphinx_extensions/dfhack/tool_docs.py
@@ -22,10 +22,10 @@ class DFHackToolDirectiveBase(sphinx.directives.ObjectDescription):
         else:
             return self.env.docname.split('/')[-1]
 
-    def make_labeled_paragraph(self, label, content):
+    def make_labeled_paragraph(self, label, content, label_class=nodes.strong, content_class=nodes.inline):
         return nodes.paragraph('', '', *[
-            nodes.strong('', '{}: '.format(label)),
-            nodes.inline('', content),
+            label_class('', '{}: '.format(label)),
+            content_class('', content),
         ])
 
     def make_nodes(self):
@@ -66,7 +66,7 @@ class DFHackToolDirective(DFHackToolDirectiveBase):
 class DFHackCommandDirective(DFHackToolDirectiveBase):
     def make_nodes(self):
         return [
-            self.make_labeled_paragraph('Command', self.get_name_or_docname()),
+            self.make_labeled_paragraph('Command', self.get_name_or_docname(), content_class=nodes.literal),
         ]
 
 

From 5ef36d210fae15c4715d87680421f9e1559f6f65 Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Sun, 7 Aug 2022 01:03:15 -0400
Subject: [PATCH 468/854] Render implicit dfhack-command alongside dfhack-tool
 unless :no-command: is passed

---
 docs/plugins/3dveins.rst                   |  2 --
 docs/sphinx_extensions/dfhack/tool_docs.py | 28 +++++++++++++++-------
 2 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/docs/plugins/3dveins.rst b/docs/plugins/3dveins.rst
index 86a00b51c..f1149eb98 100644
--- a/docs/plugins/3dveins.rst
+++ b/docs/plugins/3dveins.rst
@@ -4,8 +4,6 @@
 .. dfhack-tool::
     :tags: fort, mod, map
 
-.. dfhack-command::
-
 :dfhack-keybind:`3dveins`
 
 :index:`Rewrite layer veins to expand in 3D space.
diff --git a/docs/sphinx_extensions/dfhack/tool_docs.py b/docs/sphinx_extensions/dfhack/tool_docs.py
index 35e4de700..28876c36a 100644
--- a/docs/sphinx_extensions/dfhack/tool_docs.py
+++ b/docs/sphinx_extensions/dfhack/tool_docs.py
@@ -3,8 +3,10 @@
 #   https://www.sphinx-doc.org/en/master/development/tutorials/recipe.html
 #   https://www.sphinx-doc.org/en/master/usage/restructuredtext/basics.html#rst-directives
 
+from typing import List
+
 import docutils.nodes as nodes
-# import docutils.parsers.rst.directives as rst_directives
+import docutils.parsers.rst.directives as rst_directives
 import sphinx
 import sphinx.addnodes as addnodes
 import sphinx.directives
@@ -22,27 +24,31 @@ class DFHackToolDirectiveBase(sphinx.directives.ObjectDescription):
         else:
             return self.env.docname.split('/')[-1]
 
-    def make_labeled_paragraph(self, label, content, label_class=nodes.strong, content_class=nodes.inline):
+    @staticmethod
+    def make_labeled_paragraph(label, content, label_class=nodes.strong, content_class=nodes.inline) -> nodes.paragraph:
         return nodes.paragraph('', '', *[
             label_class('', '{}: '.format(label)),
             content_class('', content),
         ])
 
-    def make_nodes(self):
+    @staticmethod
+    def wrap_box(*children: List[nodes.Node]) -> nodes.Admonition:
+        return nodes.admonition('', *children, classes=['dfhack-tool-summary'])
+
+    def render_content(self) -> List[nodes.Node]:
         raise NotImplementedError
 
     def run(self):
-        return [
-            nodes.admonition('', *self.make_nodes(), classes=['dfhack-tool-summary']),
-        ]
+        return [self.wrap_box(*self.render_content())]
 
 
 class DFHackToolDirective(DFHackToolDirectiveBase):
     option_spec = {
         'tags': dfhack.util.directive_arg_str_list,
+        'no-command': rst_directives.flag,
     }
 
-    def make_nodes(self):
+    def render_content(self) -> List[nodes.Node]:
         tag_nodes = [nodes.strong(text='Tags: ')]
         for tag in self.options.get('tags', []):
             tag_nodes += [
@@ -62,9 +68,15 @@ class DFHackToolDirective(DFHackToolDirectiveBase):
             nodes.paragraph('', '', *tag_nodes),
         ]
 
+    def run(self):
+        out = DFHackToolDirectiveBase.run(self)
+        if 'no-command' not in self.options:
+            out += [self.wrap_box(*DFHackCommandDirective.render_content(self))]
+        return out
+
 
 class DFHackCommandDirective(DFHackToolDirectiveBase):
-    def make_nodes(self):
+    def render_content(self) -> List[nodes.Node]:
         return [
             self.make_labeled_paragraph('Command', self.get_name_or_docname(), content_class=nodes.literal),
         ]

From ed95db27f5bd7b13e556fc2ca15b4f68f38cdcb7 Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Sun, 7 Aug 2022 01:37:14 -0400
Subject: [PATCH 469/854] Move dfhack-keybind role to tool_docs.py and call
 from dfhack-command

---
 conf.py                                    | 67 +---------------------
 docs/sphinx_extensions/dfhack/tool_docs.py | 66 ++++++++++++++++++++-
 2 files changed, 67 insertions(+), 66 deletions(-)

diff --git a/conf.py b/conf.py
index 49d005f46..775f94b68 100644
--- a/conf.py
+++ b/conf.py
@@ -21,6 +21,8 @@ import shlex  # pylint:disable=unused-import
 import sphinx
 import sys
 
+sys.path.append(os.path.join(os.path.abspath(os.path.dirname(__file__)), 'docs', 'sphinx_extensions'))
+from dfhack.util import write_file_if_changed
 
 if os.environ.get('DFHACK_DOCS_BUILD_OFFLINE'):
     # block attempted image downloads, particularly for the PDF builder
@@ -38,71 +40,6 @@ if os.environ.get('DFHACK_DOCS_BUILD_OFFLINE'):
     requests.get = request_disabled
 
 
-# -- Support :dfhack-keybind:`command` ------------------------------------
-# this is a custom directive that pulls info from default keybindings
-
-from docutils import nodes
-from docutils.parsers.rst import roles
-
-sys.path.append(os.path.join(os.path.abspath(os.path.dirname(__file__)), 'docs', 'sphinx_extensions'))
-from dfhack.util import write_file_if_changed
-
-
-def get_keybinds(root, files, keybindings):
-    """Add keybindings in the specified files to the
-    given keybindings dict.
-    """
-    for file in files:
-        with open(os.path.join(root, file)) as f:
-            lines = [l.replace('keybinding add', '').strip() for l in f.readlines()
-                     if l.startswith('keybinding add')]
-        for k in lines:
-            first, command = k.split(' ', 1)
-            bind, context = (first.split('@') + [''])[:2]
-            if ' ' not in command:
-                command = command.replace('"', '')
-            tool = command.split(' ')[0].replace('"', '')
-            keybindings[tool] = keybindings.get(tool, []) + [
-                (command, bind.split('-'), context)]
-
-def get_all_keybinds(root_dir):
-    """Get the implemented keybinds, and return a dict of
-    {tool: [(full_command, keybinding, context), ...]}.
-    """
-    keybindings = dict()
-    for root, _, files in os.walk(root_dir):
-        get_keybinds(root, files, keybindings)
-    return keybindings
-
-KEYBINDS = get_all_keybinds('data/init')
-
-
-# pylint:disable=unused-argument,dangerous-default-value,too-many-arguments
-def dfhack_keybind_role_func(role, rawtext, text, lineno, inliner,
-                             options={}, content=[]):
-    """Custom role parser for DFHack default keybinds."""
-    roles.set_classes(options)
-    if text not in KEYBINDS:
-        return [], []
-    newnode = nodes.paragraph()
-    for cmd, key, ctx in KEYBINDS[text]:
-        n = nodes.paragraph()
-        newnode += n
-        n += nodes.strong('Keybinding:', 'Keybinding:')
-        n += nodes.inline(' ', ' ')
-        for k in key:
-            n += nodes.inline(k, k, classes=['kbd'])
-        if cmd != text:
-            n += nodes.inline(' -> ', ' -> ')
-            n += nodes.literal(cmd, cmd, classes=['guilabel'])
-        if ctx:
-            n += nodes.inline(' in ', ' in ')
-            n += nodes.literal(ctx, ctx)
-    return [newnode], []
-
-
-roles.register_canonical_role('dfhack-keybind', dfhack_keybind_role_func)
-
 # -- Autodoc for DFhack plugins and scripts -------------------------------
 
 def doc_dir(dirname, files, prefix):
diff --git a/docs/sphinx_extensions/dfhack/tool_docs.py b/docs/sphinx_extensions/dfhack/tool_docs.py
index 28876c36a..d1bdec8bf 100644
--- a/docs/sphinx_extensions/dfhack/tool_docs.py
+++ b/docs/sphinx_extensions/dfhack/tool_docs.py
@@ -3,6 +3,7 @@
 #   https://www.sphinx-doc.org/en/master/development/tutorials/recipe.html
 #   https://www.sphinx-doc.org/en/master/usage/restructuredtext/basics.html#rst-directives
 
+import os
 from typing import List
 
 import docutils.nodes as nodes
@@ -13,6 +14,63 @@ import sphinx.directives
 
 import dfhack.util
 
+
+_KEYBINDS = {}
+
+def scan_keybinds(root, files, keybindings):
+    """Add keybindings in the specified files to the
+    given keybindings dict.
+    """
+    for file in files:
+        with open(os.path.join(root, file)) as f:
+            lines = [l.replace('keybinding add', '').strip() for l in f.readlines()
+                     if l.startswith('keybinding add')]
+        for k in lines:
+            first, command = k.split(' ', 1)
+            bind, context = (first.split('@') + [''])[:2]
+            if ' ' not in command:
+                command = command.replace('"', '')
+            tool = command.split(' ')[0].replace('"', '')
+            keybindings[tool] = keybindings.get(tool, []) + [
+                (command, bind.split('-'), context)]
+
+def scan_all_keybinds(root_dir):
+    """Get the implemented keybinds, and return a dict of
+    {tool: [(full_command, keybinding, context), ...]}.
+    """
+    keybindings = dict()
+    for root, _, files in os.walk(root_dir):
+        scan_keybinds(root, files, keybindings)
+    return keybindings
+
+
+def render_dfhack_keybind(command) -> List[nodes.paragraph]:
+    if command not in _KEYBINDS:
+        return []
+    newnode = nodes.paragraph()
+    for keycmd, key, ctx in _KEYBINDS[command]:
+        n = nodes.paragraph()
+        newnode += n
+        n += nodes.strong('Keybinding:', 'Keybinding:')
+        n += nodes.inline(' ', ' ')
+        for k in key:
+            n += nodes.inline(k, k, classes=['kbd'])
+        if keycmd != command:
+            n += nodes.inline(' -> ', ' -> ')
+            n += nodes.literal(keycmd, keycmd, classes=['guilabel'])
+        if ctx:
+            n += nodes.inline(' in ', ' in ')
+            n += nodes.literal(ctx, ctx)
+    return [newnode]
+
+
+# pylint:disable=unused-argument,dangerous-default-value,too-many-arguments
+def dfhack_keybind_role(role, rawtext, text, lineno, inliner,
+                        options={}, content=[]):
+    """Custom role parser for DFHack default keybinds."""
+    return render_dfhack_keybind(text), []
+
+
 class DFHackToolDirectiveBase(sphinx.directives.ObjectDescription):
     has_content = False
     required_arguments = 0
@@ -77,14 +135,20 @@ class DFHackToolDirective(DFHackToolDirectiveBase):
 
 class DFHackCommandDirective(DFHackToolDirectiveBase):
     def render_content(self) -> List[nodes.Node]:
+        command = self.get_name_or_docname()
         return [
-            self.make_labeled_paragraph('Command', self.get_name_or_docname(), content_class=nodes.literal),
+            self.make_labeled_paragraph('Command', command, content_class=nodes.literal),
+            *render_dfhack_keybind(command),
         ]
 
 
 def register(app):
     app.add_directive('dfhack-tool', DFHackToolDirective)
     app.add_directive('dfhack-command', DFHackCommandDirective)
+    app.add_role('dfhack-keybind', dfhack_keybind_role)
+
+    _KEYBINDS.update(scan_all_keybinds(os.path.join(dfhack.util.DFHACK_ROOT, 'data', 'init')))
+
 
 def setup(app):
     app.connect('builder-inited', register)

From 5a14992aca93e896c334980ae0b104128508d0bd Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Sun, 7 Aug 2022 01:44:02 -0400
Subject: [PATCH 470/854] Use new directives for a few plugins

---
 docs/plugins/3dveins.rst  |  2 --
 docs/plugins/autodump.rst | 11 +++++++----
 docs/plugins/autogems.rst |  8 ++++++--
 docs/plugins/automelt.rst |  5 ++++-
 4 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/docs/plugins/3dveins.rst b/docs/plugins/3dveins.rst
index f1149eb98..b14f6145d 100644
--- a/docs/plugins/3dveins.rst
+++ b/docs/plugins/3dveins.rst
@@ -4,8 +4,6 @@
 .. dfhack-tool::
     :tags: fort, mod, map
 
-:dfhack-keybind:`3dveins`
-
 :index:`Rewrite layer veins to expand in 3D space.
 <3dveins; Rewrite layer veins to expand in 3D space.>` Existing, flat veins
 are removed and new 3D veins that naturally span z-levels are generated in
diff --git a/docs/plugins/autodump.rst b/docs/plugins/autodump.rst
index 53ed7f1ba..dc60946b1 100644
--- a/docs/plugins/autodump.rst
+++ b/docs/plugins/autodump.rst
@@ -1,9 +1,12 @@
 autodump
 ========
-**Tags:** `tag/fort`, `tag/auto`, `tag/fps`, `tag/items`, `tag/stockpiles`
-:dfhack-keybind:`autodump`
-:dfhack-keybind:`autodump-destroy-here`
-:dfhack-keybind:`autodump-destroy-item`
+
+.. dfhack-tool::
+    :tags: fort, auto, fps, items, stockpiles
+
+.. dfhack-command:: autodump-destroy-here
+
+.. dfhack-command:: autodump-destroy-item
 
 :index:`Automatically set items in a stockpile to be dumped.
 <autodump (plugin); Automatically set items in a stockpile to be dumped.>` When
diff --git a/docs/plugins/autogems.rst b/docs/plugins/autogems.rst
index bcff93ba6..3ceed0bec 100644
--- a/docs/plugins/autogems.rst
+++ b/docs/plugins/autogems.rst
@@ -1,7 +1,11 @@
 autogems
 ========
-**Tags:** `tag/fort`, `tag/auto`, `tag/jobs`
-:dfhack-keybind:`autogems-reload`
+
+.. dfhack-tool:: autogems
+    :tags: fort, auto, jobs
+    :no-command:
+
+.. dfhack-command:: autogems-reload
 
 :index:`Automatically cut rough gems. <autogems; Automatically cut rough gems.>`
 This plugin periodically scans your stocks of rough gems and creates manager
diff --git a/docs/plugins/automelt.rst b/docs/plugins/automelt.rst
index 190bffc06..0ca9f82e9 100644
--- a/docs/plugins/automelt.rst
+++ b/docs/plugins/automelt.rst
@@ -1,6 +1,9 @@
 automelt
 ========
-**Tags:** `tag/fort`, `tag/auto`, `tag/items`, `tag/stockpiles`
+
+.. dfhack-tool::
+    :tags: fort, auto, items, stockpiles
+    :no-command:
 
 :index:`Quickly designate items to be melted.
 <automelt; Quickly designate items to be melted.>` When `enabled <enable>`, this

From 7651d301d244033fc392eafef2985f245e9e4dd5 Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Sun, 7 Aug 2022 01:51:38 -0400
Subject: [PATCH 471/854] Remove extra paragraph around keybindings

---
 docs/sphinx_extensions/dfhack/tool_docs.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/docs/sphinx_extensions/dfhack/tool_docs.py b/docs/sphinx_extensions/dfhack/tool_docs.py
index d1bdec8bf..920bef98e 100644
--- a/docs/sphinx_extensions/dfhack/tool_docs.py
+++ b/docs/sphinx_extensions/dfhack/tool_docs.py
@@ -45,12 +45,11 @@ def scan_all_keybinds(root_dir):
 
 
 def render_dfhack_keybind(command) -> List[nodes.paragraph]:
+    out = []
     if command not in _KEYBINDS:
-        return []
-    newnode = nodes.paragraph()
+        return out
     for keycmd, key, ctx in _KEYBINDS[command]:
         n = nodes.paragraph()
-        newnode += n
         n += nodes.strong('Keybinding:', 'Keybinding:')
         n += nodes.inline(' ', ' ')
         for k in key:
@@ -61,7 +60,8 @@ def render_dfhack_keybind(command) -> List[nodes.paragraph]:
         if ctx:
             n += nodes.inline(' in ', ' in ')
             n += nodes.literal(ctx, ctx)
-    return [newnode]
+        out.append(n)
+    return out
 
 
 # pylint:disable=unused-argument,dangerous-default-value,too-many-arguments

From 6b32e008b3bfd9eb73535ae69ea82fbf73cc14d0 Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Sun, 7 Aug 2022 02:16:38 -0400
Subject: [PATCH 472/854] Attempt to port keybinding documentation verification
 to new extension

Likely requires a sphinx Domain to work with parallel builds properly
---
 conf.py                                    | 15 ---------------
 docs/sphinx_extensions/dfhack/tool_docs.py | 15 +++++++++++++++
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/conf.py b/conf.py
index 775f94b68..ff4cdc59d 100644
--- a/conf.py
+++ b/conf.py
@@ -126,24 +126,9 @@ def write_tool_docs():
             outfile.write(include)
 
 
-def all_keybinds_documented():
-    """Check that all keybindings are documented with the :dfhack-keybind:
-    directive somewhere."""
-    undocumented_binds = set(KEYBINDS)
-    tools = set(i[0] for i in DOC_ALL_DIRS)
-    for t in tools:
-        with open(('./docs/tools/{}.rst').format(t)) as f:
-            tool_binds = set(re.findall(':dfhack-keybind:`(.*?)`', f.read()))
-            undocumented_binds -= tool_binds
-    if undocumented_binds:
-        raise ValueError('The following DFHack commands have undocumented '
-                         'keybindings: {}'.format(sorted(undocumented_binds)))
-
-
 # Actually call the docs generator and run test
 write_tool_docs()
 generate_tag_indices()
-#all_keybinds_documented() # comment out while we're transitioning
 
 # -- General configuration ------------------------------------------------
 
diff --git a/docs/sphinx_extensions/dfhack/tool_docs.py b/docs/sphinx_extensions/dfhack/tool_docs.py
index 920bef98e..8c843dce0 100644
--- a/docs/sphinx_extensions/dfhack/tool_docs.py
+++ b/docs/sphinx_extensions/dfhack/tool_docs.py
@@ -3,6 +3,7 @@
 #   https://www.sphinx-doc.org/en/master/development/tutorials/recipe.html
 #   https://www.sphinx-doc.org/en/master/usage/restructuredtext/basics.html#rst-directives
 
+import logging
 import os
 from typing import List
 
@@ -15,7 +16,10 @@ import sphinx.directives
 import dfhack.util
 
 
+logger = sphinx.util.logging.getLogger(__name__)
+
 _KEYBINDS = {}
+_KEYBINDS_RENDERED = set()  # commands whose keybindings have been rendered
 
 def scan_keybinds(root, files, keybindings):
     """Add keybindings in the specified files to the
@@ -45,6 +49,7 @@ def scan_all_keybinds(root_dir):
 
 
 def render_dfhack_keybind(command) -> List[nodes.paragraph]:
+    _KEYBINDS_RENDERED.add(command)
     out = []
     if command not in _KEYBINDS:
         return out
@@ -64,6 +69,13 @@ def render_dfhack_keybind(command) -> List[nodes.paragraph]:
     return out
 
 
+def check_missing_keybinds():
+    # FIXME: _KEYBINDS_RENDERED is empty in the parent process under parallel builds
+    # consider moving to a sphinx Domain to solve this properly
+    for missing_command in sorted(set(_KEYBINDS.keys()) - _KEYBINDS_RENDERED):
+        logger.warning('Undocumented keybindings for command: %s', missing_command)
+
+
 # pylint:disable=unused-argument,dangerous-default-value,too-many-arguments
 def dfhack_keybind_role(role, rawtext, text, lineno, inliner,
                         options={}, content=[]):
@@ -153,6 +165,9 @@ def register(app):
 def setup(app):
     app.connect('builder-inited', register)
 
+    # TODO: re-enable once detection is corrected
+    # app.connect('build-finished', lambda *_: check_missing_keybinds())
+
     return {
         'version': '0.1',
         'parallel_read_safe': True,

From 1e7ce2602e492e8cbe8b466686f2403a24bf6f1f Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Sun, 7 Aug 2022 18:18:51 -0400
Subject: [PATCH 473/854] Shrink tool/command boxes somewhat

---
 docs/styles/dfhack.css | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/docs/styles/dfhack.css b/docs/styles/dfhack.css
index e24ce1c67..4102e6412 100644
--- a/docs/styles/dfhack.css
+++ b/docs/styles/dfhack.css
@@ -61,7 +61,13 @@ span.pre {
     overflow-wrap: break-word;
 }
 
-.dfhack-tool-summary p {
+div.dfhack-tool-summary {
+    margin: 10px 0;
+    padding: 10px 15px;
+}
+
+div.dfhack-tool-summary p {
     margin-top: 0;
     margin-bottom: 0.5em;
+    line-height: 1em;
 }

From 6e29ddf2d312fb157105d340ff37aade0cd1fbac Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Mon, 8 Aug 2022 02:19:07 -0400
Subject: [PATCH 474/854] Move space out of <strong> node for better text
 rendering

---
 docs/sphinx_extensions/dfhack/tool_docs.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/docs/sphinx_extensions/dfhack/tool_docs.py b/docs/sphinx_extensions/dfhack/tool_docs.py
index 8c843dce0..04318816b 100644
--- a/docs/sphinx_extensions/dfhack/tool_docs.py
+++ b/docs/sphinx_extensions/dfhack/tool_docs.py
@@ -97,7 +97,8 @@ class DFHackToolDirectiveBase(sphinx.directives.ObjectDescription):
     @staticmethod
     def make_labeled_paragraph(label, content, label_class=nodes.strong, content_class=nodes.inline) -> nodes.paragraph:
         return nodes.paragraph('', '', *[
-            label_class('', '{}: '.format(label)),
+            label_class('', '{}:'.format(label)),
+            nodes.inline(text=' '),
             content_class('', content),
         ])
 
@@ -119,7 +120,7 @@ class DFHackToolDirective(DFHackToolDirectiveBase):
     }
 
     def render_content(self) -> List[nodes.Node]:
-        tag_nodes = [nodes.strong(text='Tags: ')]
+        tag_nodes = [nodes.strong(text='Tags:'), nodes.inline(text=' ')]
         for tag in self.options.get('tags', []):
             tag_nodes += [
                 addnodes.pending_xref(tag, nodes.inline(text=tag), **{

From daf3bc516be17e6fc953cad9e8274fc7504568d6 Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Mon, 8 Aug 2022 02:29:22 -0400
Subject: [PATCH 475/854] Switch to <topic> to fix line breaks in text output

No visible change in HTML output; PDF looks different but still acceptable
---
 docs/sphinx_extensions/dfhack/tool_docs.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/sphinx_extensions/dfhack/tool_docs.py b/docs/sphinx_extensions/dfhack/tool_docs.py
index 04318816b..42d995ff2 100644
--- a/docs/sphinx_extensions/dfhack/tool_docs.py
+++ b/docs/sphinx_extensions/dfhack/tool_docs.py
@@ -104,7 +104,7 @@ class DFHackToolDirectiveBase(sphinx.directives.ObjectDescription):
 
     @staticmethod
     def wrap_box(*children: List[nodes.Node]) -> nodes.Admonition:
-        return nodes.admonition('', *children, classes=['dfhack-tool-summary'])
+        return nodes.topic('', *children, classes=['dfhack-tool-summary'])
 
     def render_content(self) -> List[nodes.Node]:
         raise NotImplementedError

From e6b5d5b0c1904f0a8f384aff70117a80f2f3f721 Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Mon, 8 Aug 2022 17:35:58 -0400
Subject: [PATCH 476/854] Remove commas from tag lists

---
 docs/plugins/3dveins.rst  | 2 +-
 docs/plugins/autodump.rst | 2 +-
 docs/plugins/autogems.rst | 2 +-
 docs/plugins/automelt.rst | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/docs/plugins/3dveins.rst b/docs/plugins/3dveins.rst
index b14f6145d..63f6cfd8d 100644
--- a/docs/plugins/3dveins.rst
+++ b/docs/plugins/3dveins.rst
@@ -2,7 +2,7 @@
 =======
 
 .. dfhack-tool::
-    :tags: fort, mod, map
+    :tags: fort mod map
 
 :index:`Rewrite layer veins to expand in 3D space.
 <3dveins; Rewrite layer veins to expand in 3D space.>` Existing, flat veins
diff --git a/docs/plugins/autodump.rst b/docs/plugins/autodump.rst
index dc60946b1..3e8d291a0 100644
--- a/docs/plugins/autodump.rst
+++ b/docs/plugins/autodump.rst
@@ -2,7 +2,7 @@ autodump
 ========
 
 .. dfhack-tool::
-    :tags: fort, auto, fps, items, stockpiles
+    :tags: fort auto fps items stockpiles
 
 .. dfhack-command:: autodump-destroy-here
 
diff --git a/docs/plugins/autogems.rst b/docs/plugins/autogems.rst
index 3ceed0bec..11575aa7a 100644
--- a/docs/plugins/autogems.rst
+++ b/docs/plugins/autogems.rst
@@ -2,7 +2,7 @@ autogems
 ========
 
 .. dfhack-tool:: autogems
-    :tags: fort, auto, jobs
+    :tags: fort auto jobs
     :no-command:
 
 .. dfhack-command:: autogems-reload
diff --git a/docs/plugins/automelt.rst b/docs/plugins/automelt.rst
index 0ca9f82e9..6c42cbb7e 100644
--- a/docs/plugins/automelt.rst
+++ b/docs/plugins/automelt.rst
@@ -2,7 +2,7 @@ automelt
 ========
 
 .. dfhack-tool::
-    :tags: fort, auto, items, stockpiles
+    :tags: fort auto items stockpiles
     :no-command:
 
 :index:`Quickly designate items to be melted.

From 2d60c543fd867f787e891061531ca7fd4b289572 Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Mon, 8 Aug 2022 21:22:55 -0400
Subject: [PATCH 477/854] Remove "Tool:" line

---
 docs/sphinx_extensions/dfhack/tool_docs.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/docs/sphinx_extensions/dfhack/tool_docs.py b/docs/sphinx_extensions/dfhack/tool_docs.py
index 42d995ff2..ff4bfc9b1 100644
--- a/docs/sphinx_extensions/dfhack/tool_docs.py
+++ b/docs/sphinx_extensions/dfhack/tool_docs.py
@@ -135,7 +135,6 @@ class DFHackToolDirective(DFHackToolDirectiveBase):
         tag_nodes.pop()
 
         return [
-            self.make_labeled_paragraph('Tool', self.get_name_or_docname()),
             nodes.paragraph('', '', *tag_nodes),
         ]
 

From f9930b313aec99beac4257426f0ee969fccca681 Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Tue, 9 Aug 2022 22:37:24 -0700
Subject: [PATCH 478/854] migrate all docs to the new directives

add a summary option for tools and commands so we can output them with
their tags and keybindings at the top of the file.
---
 docs/builtins/alias.rst                     | 16 ++---
 docs/builtins/cls.rst                       | 15 +++--
 docs/builtins/devel/dump-rpc.rst            |  9 +--
 docs/builtins/die.rst                       | 13 ++--
 docs/builtins/disable.rst                   | 10 +--
 docs/builtins/enable.rst                    | 16 ++---
 docs/builtins/fpause.rst                    |  9 +--
 docs/builtins/help.rst                      | 10 +--
 docs/builtins/hide.rst                      | 12 ++--
 docs/builtins/keybinding.rst                | 13 ++--
 docs/builtins/kill-lua.rst                  | 10 +--
 docs/builtins/load.rst                      | 10 +--
 docs/builtins/ls.rst                        |  7 +-
 docs/builtins/plug.rst                      | 17 +++--
 docs/builtins/reload.rst                    | 11 ++--
 docs/builtins/sc-script.rst                 | 12 ++--
 docs/builtins/script.rst                    | 12 ++--
 docs/builtins/show.rst                      | 14 ++--
 docs/builtins/tags.rst                      | 11 ++--
 docs/builtins/type.rst                      | 13 ++--
 docs/builtins/unload.rst                    |  7 +-
 docs/plugins/3dveins.rst                    |  9 ++-
 docs/plugins/RemoteFortressReader.rst       | 19 ++++--
 docs/plugins/add-spatter.rst                | 19 +++---
 docs/plugins/autobutcher.rst                | 13 ++--
 docs/plugins/autochop.rst                   | 10 +--
 docs/plugins/autoclothing.rst               | 11 ++--
 docs/plugins/autodump.rst                   | 20 +++---
 docs/plugins/autofarm.rst                   | 16 ++---
 docs/plugins/autogems.rst                   | 15 ++---
 docs/plugins/autohauler.rst                 | 17 ++---
 docs/plugins/autolabor.rst                  | 12 ++--
 docs/plugins/automaterial.rst               | 13 ++--
 docs/plugins/automelt.rst                   |  9 ++-
 docs/plugins/autonestbox.rst                | 25 +++++---
 docs/plugins/autotrade.rst                  | 14 ++--
 docs/plugins/blueprint.rst                  | 13 ++--
 docs/plugins/building-hacks.rst             |  6 +-
 docs/plugins/buildingplan.rst               | 10 +--
 docs/plugins/burrows.rst                    | 21 +++---
 docs/plugins/changeitem.rst                 | 20 +++---
 docs/plugins/changelayer.rst                | 15 +++--
 docs/plugins/changevein.rst                 | 14 ++--
 docs/plugins/cleanconst.rst                 | 17 ++---
 docs/plugins/cleaners.rst                   | 32 ++++++----
 docs/plugins/cleanowned.rst                 | 17 ++---
 docs/plugins/command-prompt.rst             |  7 +-
 docs/plugins/confirm.rst                    | 12 ++--
 docs/plugins/createitem.rst                 | 13 ++--
 docs/plugins/cursecheck.rst                 |  7 +-
 docs/plugins/cxxrandom.rst                  |  6 +-
 docs/plugins/debug.rst                      | 14 ++--
 docs/plugins/deramp.rst                     | 10 +--
 docs/plugins/dig-now.rst                    | 16 ++---
 docs/plugins/dig.rst                        | 71 ++++++++++++---------
 docs/plugins/digFlood.rst                   | 19 +++---
 docs/plugins/diggingInvaders.rst            |  7 +-
 docs/plugins/dwarfmonitor.rst               | 10 +--
 docs/plugins/dwarfvet.rst                   |  7 +-
 docs/plugins/embark-assistant.rst           | 17 ++---
 docs/plugins/embark-tools.rst               |  7 +-
 docs/plugins/eventful.rst                   |  6 +-
 docs/plugins/fastdwarf.rst                  |  6 +-
 docs/plugins/filltraffic.rst                | 40 ++++++------
 docs/plugins/fix-unit-occupancy.rst         | 10 +--
 docs/plugins/fixveins.rst                   | 10 +--
 docs/plugins/flows.rst                      | 10 +--
 docs/plugins/follow.rst                     | 12 ++--
 docs/plugins/forceequip.rst                 | 17 ++---
 docs/plugins/generated-creature-renamer.rst | 20 ++++--
 docs/plugins/getplants.rst                  | 10 +--
 docs/plugins/hotkeys.rst                    | 11 ++--
 docs/plugins/infiniteSky.rst                | 11 ++--
 docs/plugins/isoworldremote.rst             |  8 ++-
 docs/plugins/jobutils.rst                   | 18 ++++--
 docs/plugins/labormanager.rst               | 14 ++--
 docs/plugins/lair.rst                       |  9 +--
 docs/plugins/liquids.rst                    | 10 ++-
 docs/plugins/luasocket.rst                  |  6 +-
 docs/plugins/manipulator.rst                |  9 ++-
 docs/plugins/map-render.rst                 |  6 +-
 docs/plugins/misery.rst                     |  6 +-
 docs/plugins/mode.rst                       |  6 +-
 docs/plugins/mousequery.rst                 |  6 +-
 docs/plugins/nestboxes.rst                  | 13 ++--
 docs/plugins/orders.rst                     |  6 +-
 docs/plugins/pathable.rst                   | 10 +--
 docs/plugins/petcapRemover.rst              | 21 +++---
 docs/plugins/plants.rst                     | 10 ++-
 docs/plugins/power-meter.rst                | 12 ++--
 docs/plugins/probe.rst                      | 14 ++--
 docs/plugins/prospector.rst                 | 14 ++--
 docs/plugins/regrass.rst                    | 11 ++--
 docs/plugins/rename.rst                     |  8 ++-
 docs/plugins/rendermax.rst                  | 10 +--
 docs/plugins/resume.rst                     | 21 +++---
 docs/plugins/reveal.rst                     | 34 ++++++----
 docs/plugins/ruby.rst                       | 15 +++--
 docs/plugins/search.rst                     | 14 ++--
 docs/plugins/seedwatch.rst                  |  6 +-
 docs/plugins/showmood.rst                   |  6 +-
 docs/plugins/siege-engine.rst               | 11 ++--
 docs/plugins/sort.rst                       | 14 ++--
 docs/plugins/spectate.rst                   |  6 +-
 docs/plugins/steam-engine.rst               | 11 ++--
 docs/plugins/stockflow.rst                  | 12 ++--
 docs/plugins/stockpiles.rst                 | 26 +++++---
 docs/plugins/stocks.rst                     |  9 +--
 docs/plugins/stonesense.rst                 | 10 +--
 docs/plugins/strangemood.rst                |  6 +-
 docs/plugins/tailor.rst                     | 17 ++---
 docs/plugins/tiletypes.rst                  | 26 +++++---
 docs/plugins/title-folder.rst               |  6 +-
 docs/plugins/title-version.rst              |  6 +-
 docs/plugins/trackstop.rst                  | 14 ++--
 docs/plugins/tubefill.rst                   |  8 ++-
 docs/plugins/tweak.rst                      |  6 +-
 docs/plugins/workNow.rst                    | 12 ++--
 docs/plugins/workflow.rst                   | 12 ++--
 docs/plugins/xlsxreader.rst                 |  6 +-
 docs/plugins/zone.rst                       |  6 +-
 docs/sphinx_extensions/dfhack/tool_docs.py  | 11 +++-
 122 files changed, 913 insertions(+), 665 deletions(-)

diff --git a/docs/builtins/alias.rst b/docs/builtins/alias.rst
index 6efaf0776..84a761556 100644
--- a/docs/builtins/alias.rst
+++ b/docs/builtins/alias.rst
@@ -1,13 +1,13 @@
 alias
 =====
-**Tags:** `tag/system`
-:dfhack-keybind:`alias`
-
-:index:`Configure helper aliases for other DFHack commands.
-<alias; Configure helper aliases for other DFHack commands.>` Aliases are
-resolved immediately after built-in commands, which means that an alias cannot
-override a built-in command, but can override a command implemented by a plugin
-or script.
+
+.. dfhack-tool::
+    :summary: Configure helper aliases for other DFHack commands.
+    :tags: system
+
+Aliases are resolved immediately after built-in commands, which means that an
+alias cannot override a built-in command, but can override a command implemented
+by a plugin or script.
 
 Usage:
 
diff --git a/docs/builtins/cls.rst b/docs/builtins/cls.rst
index d6a245081..2aad049b4 100644
--- a/docs/builtins/cls.rst
+++ b/docs/builtins/cls.rst
@@ -1,8 +1,13 @@
 cls
 ===
-**Tags:** `tag/system`
-:dfhack-keybind:`cls`
 
-:index:`Clear the terminal screen. <cls; Clear the terminal screen.>` Can also
-be invoked as ``clear``. Note that this command does not delete command history.
-It just clears the text on the screen.
+.. dfhack-tool::
+    :summary: Clear the terminal screen.
+    :tags: system
+
+Can also be invoked as ``clear``. Note that this command does not delete command
+history. It just clears the text on the screen.
+
+Usage::
+
+    cls
diff --git a/docs/builtins/devel/dump-rpc.rst b/docs/builtins/devel/dump-rpc.rst
index 65d4dae57..977b6e33c 100644
--- a/docs/builtins/devel/dump-rpc.rst
+++ b/docs/builtins/devel/dump-rpc.rst
@@ -1,10 +1,11 @@
 devel/dump-rpc
 ==============
-Tags: `tag/system`
-:dfhack-keybind:`devel/dump-rpc`
 
-:index:`Write RPC endpoint information to the specified file.
-<devel/dump-rpc; Writes RPC endpoint information to the specified file.>`
+.. dfhack-tool::
+    :summary: Dump RPC endpoint info.
+    :tags: dev
+
+Write RPC endpoint information to the specified file.
 
 Usage::
 
diff --git a/docs/builtins/die.rst b/docs/builtins/die.rst
index db487da0e..b4873abc5 100644
--- a/docs/builtins/die.rst
+++ b/docs/builtins/die.rst
@@ -1,7 +1,12 @@
 die
 ===
-**Tags:** `tag/system`
-:dfhack-keybind:`die`
 
-:index:`Instantly exit DF without saving.
-<die; Instantly exit DF without saving.>`
+.. dfhack-tool::
+    :summary: Instantly exit DF without saving.
+    :tags: system
+
+Use to exit DF quickly and safely.
+
+Usage::
+
+    die
diff --git a/docs/builtins/disable.rst b/docs/builtins/disable.rst
index 758b6ff8f..e109e69e1 100644
--- a/docs/builtins/disable.rst
+++ b/docs/builtins/disable.rst
@@ -1,11 +1,11 @@
 disable
 =======
-**Tags:** `tag/system`
-:dfhack-keybind:`disable`
 
-:index:`Deactivate a DFHack tool that has some persistent effect.
-<disable; Deactivate a DFHack tool that has some persistent effect.>` See the
-`enable` command for more info.
+.. dfhack-tool::
+    :summary: Deactivate a DFHack tool that has some persistent effect.
+    :tags: system
+
+See the `enable` command for more info.
 
 Usage::
 
diff --git a/docs/builtins/enable.rst b/docs/builtins/enable.rst
index 8705bc4ef..63b0bdc5f 100644
--- a/docs/builtins/enable.rst
+++ b/docs/builtins/enable.rst
@@ -1,14 +1,14 @@
 enable
 ======
-**Tags:** `tag/system`
-:dfhack-keybind:`enable`
 
-:index:`Activate a DFHack tool that has some persistent effect.
-<enable; Activate a DFHack tool that has some persistent effect.>` Many plugins
-and scripts can be in a distinct enabled or disabled state. Some of them
-activate and deactivate automatically depending on the contents of the world
-raws. Others store their state in world data. However a number of them have to
-be enabled globally, and the init file is the right place to do it.
+.. dfhack-tool::
+    :summary: Activate a DFHack tool that has some persistent effect.
+    :tags: system
+
+Many plugins and scripts can be in a distinct enabled or disabled state. Some
+of them activate and deactivate automatically depending on the contents of the
+world raws. Others store their state in world data. However a number of them
+have to be enabled globally, and the init file is the right place to do it.
 
 Most such plugins or scripts support the built-in ``enable`` and `disable`
 commands. Calling them at any time without arguments prints a list of enabled
diff --git a/docs/builtins/fpause.rst b/docs/builtins/fpause.rst
index beb783e82..2e8f851f7 100644
--- a/docs/builtins/fpause.rst
+++ b/docs/builtins/fpause.rst
@@ -1,10 +1,11 @@
 fpause
 ======
-**Tags:** `tag/system`
-:dfhack-keybind:`fpause`
 
-:index:`Forces DF to pause. <fpause; Forces DF to pause.>` This is useful when
-your FPS drops below 1 and you lose control of the game.
+.. dfhack-tool::
+    :summary: Forces DF to pause.
+    :tags: system
+
+This is useful when your FPS drops below 1 and you lose control of the game.
 
 Usage::
 
diff --git a/docs/builtins/help.rst b/docs/builtins/help.rst
index 4195f2eaa..e1e913747 100644
--- a/docs/builtins/help.rst
+++ b/docs/builtins/help.rst
@@ -1,11 +1,11 @@
 help
 ====
-**Tags:** `tag/system`
-:dfhack-keybind:`help`
 
-:index:`Display help about a command or plugin.
-<help; Display help about a command or plugin.>` Can also be invoked as ``?``
-or ``man`` (short for "manual").
+.. dfhack-tool::
+    :summary: Display help about a command or plugin.
+    :tags: system
+
+Can also be invoked as ``?`` or ``man`` (short for "manual").
 
 Usage::
 
diff --git a/docs/builtins/hide.rst b/docs/builtins/hide.rst
index 087d87726..0ec8f36df 100644
--- a/docs/builtins/hide.rst
+++ b/docs/builtins/hide.rst
@@ -1,12 +1,12 @@
 hide
 ====
-**Tags:** `tag/system`
-:dfhack-keybind:`hide`
 
-:index:`Hide the DFHack terminal window.
-<hide; Hide the DFHack terminal window.>` You can show it again with the `show`
-command, though you'll need to use it from a `keybinding` set beforehand or the
-in-game `command-prompt`.
+.. dfhack-tool::
+    :summary: Hide the DFHack terminal window.
+    :tags: system
+
+You can show it again with the `show` command, though you'll need to use it from
+a `keybinding` set beforehand or the in-game `command-prompt`.
 
 Only available on Windows.
 
diff --git a/docs/builtins/keybinding.rst b/docs/builtins/keybinding.rst
index fd857a42b..5ce8145f4 100644
--- a/docs/builtins/keybinding.rst
+++ b/docs/builtins/keybinding.rst
@@ -1,12 +1,13 @@
 keybinding
 ==========
-**Tags:** `tag/system`
-:dfhack-keybind:`keybinding`
 
-:index:`Create hotkeys that will run DFHack commands.
-<keybinding; Create hotkeys that will run DFHack commands.>` Like any other
-command, it can be used at any time from the console, but bindings are not
-remembered between runs of the game unless re-created in `dfhack.init`.
+.. dfhack-tool::
+    :summary: Create hotkeys that will run DFHack commands.
+    :tags: system
+
+Like any other command, it can be used at any time from the console, but
+bindings are not remembered between runs of the game unless re-created in
+`dfhack.init`.
 
 Hotkeys can be any combinations of Ctrl/Alt/Shift with A-Z, 0-9, F1-F12, or
 ``\``` (the key below the ``Esc`` key.
diff --git a/docs/builtins/kill-lua.rst b/docs/builtins/kill-lua.rst
index 129268fa8..4de0ab7d1 100644
--- a/docs/builtins/kill-lua.rst
+++ b/docs/builtins/kill-lua.rst
@@ -1,11 +1,11 @@
 kill-lua
 ========
-**Tags:** `tag/system`
-:dfhack-keybind:`kill-lua`
 
-:index:`Gracefully stops any currently-running Lua scripts.
-<kill-lua; Gracefully stops any currently-running Lua scripts.>` Use this
-command to stop a misbehaving script that appears to be stuck.
+.. dfhack-tool::
+    :summary: Gracefully stop any currently-running Lua scripts.
+    :tags: system
+
+Use this command to stop a misbehaving script that appears to be stuck.
 
 Usage::
 
diff --git a/docs/builtins/load.rst b/docs/builtins/load.rst
index cd3aed2c0..d253144a8 100644
--- a/docs/builtins/load.rst
+++ b/docs/builtins/load.rst
@@ -1,11 +1,11 @@
 load
 ====
-**Tags:** `tag/system`
-:dfhack-keybind:`load`
 
-:index:`Load and register a plugin library.
-<load; Load and register a plugin library.>` Also see `unload` and `reload` for
-related actions.
+.. dfhack-tool::
+    :summary: Load and register a plugin library.
+    :tags: system
+
+Also see `unload` and `reload` for related actions.
 
 Usage::
 
diff --git a/docs/builtins/ls.rst b/docs/builtins/ls.rst
index f03e3e533..702c8bae5 100644
--- a/docs/builtins/ls.rst
+++ b/docs/builtins/ls.rst
@@ -1,9 +1,10 @@
 ls
 ==
-**Tags:** `tag/system`
-:dfhack-keybind:`ls`
 
-:index:`List available DFHack commands. <ls; List available DFHack commands.>`
+.. dfhack-tool::
+    :summary: List available DFHack commands.
+    :tags: system
+
 In order to group related commands, each command is associated with a list of
 tags. You can filter the listed commands by a tag or a substring of the
 command name. Can also be invoked as ``dir``.
diff --git a/docs/builtins/plug.rst b/docs/builtins/plug.rst
index 76e31c432..e10c154e5 100644
--- a/docs/builtins/plug.rst
+++ b/docs/builtins/plug.rst
@@ -1,14 +1,13 @@
 plug
 ====
-**Tags:** `tag/system`
-:dfhack-keybind:`plug`
 
-:index:`List available plugins and whether they are enabled.
-<plug; List available plugins and whether they are enabled.>`
+.. dfhack-tool::
+    :summary: List available plugins and whether they are enabled.
+    :tags: system
 
-Usage:
+Usage::
 
-``plug``
-    Lists available plugins and whether they are enabled.
-``plug <plugin> [<plugin> ...]``
-    Lists only the named plugins.
+    plug [<plugin> [<plugin> ...]]
+
+If run with parameters, it lists only the named plugins. Otherwise it will list
+all available plugins.
diff --git a/docs/builtins/reload.rst b/docs/builtins/reload.rst
index 8449c713d..1429e1038 100644
--- a/docs/builtins/reload.rst
+++ b/docs/builtins/reload.rst
@@ -1,11 +1,12 @@
 reload
 ======
-**Tags:** `tag/system`
-:dfhack-keybind:`reload`
 
-:index:`Reload a loaded plugin. <reload; Reload a loaded plugin.>` Developers
-use this command to reload a plugin that they are actively modifying. Also see
-`load` and `unload` for related actions.
+.. dfhack-tool::
+    :summary: Reload a loaded plugin.
+    :tags: system
+
+Developers use this command to reload a plugin that they are actively modifying.
+Also see `load` and `unload` for related actions.
 
 Usage::
 
diff --git a/docs/builtins/sc-script.rst b/docs/builtins/sc-script.rst
index 17c0efe25..b3255cb9f 100644
--- a/docs/builtins/sc-script.rst
+++ b/docs/builtins/sc-script.rst
@@ -1,12 +1,12 @@
 sc-script
 =========
-**Tags:** `tag/system`
-:dfhack-keybind:`sc-script`
 
-:index:`Run commands when game state changes occur.
-<sc-script; Run commands when game state changes occur.>` This is similar to
-the static `init-files` but is slightly more flexible since it can be set
-dynamically.
+.. dfhack-tool::
+    :summary: Run commands when game state changes occur.
+    :tags: system
+
+This is similar to the static `init-files` but is slightly more flexible since
+it can be set dynamically.
 
 Usage:
 
diff --git a/docs/builtins/script.rst b/docs/builtins/script.rst
index e5576ed50..fbcebff6c 100644
--- a/docs/builtins/script.rst
+++ b/docs/builtins/script.rst
@@ -1,12 +1,12 @@
 script
 ======
-**Tags:** `tag/system`
-:dfhack-keybind:`script`
 
-:index:`Execute a batch file of DFHack commands.
-<script; Execute a batch file of DFHack commands.>` It reads a text file and
-runs each line as a DFHack command as if it had been typed in by the user --
-treating the input like `an init file <init-files>`.
+.. dfhack-tool::
+    :summary: Execute a batch file of DFHack commands.
+    :tags: system
+
+It reads a text file and runs each line as a DFHack command as if it had been
+typed in by the user -- treating the input like `an init file <init-files>`.
 
 Some other tools, such as `autobutcher` and `workflow`, export their settings as
 the commands to create them - which can later be reloaded with ``script``.
diff --git a/docs/builtins/show.rst b/docs/builtins/show.rst
index fde642726..7002d5aff 100644
--- a/docs/builtins/show.rst
+++ b/docs/builtins/show.rst
@@ -1,13 +1,13 @@
 show
 ====
-**Tags:** `tag/system`
-:dfhack-keybind:`show`
 
-:index:`Unhides the DFHack terminal window.
-<show; Unhides the DFHack terminal window.>` Useful if you have hidden the
-terminal with `hide` and you want it back. Since the terminal window won't be
-available to run this command, you'll need to use it from a `keybinding` set
-beforehand or the in-game `command-prompt`.
+.. dfhack-tool::
+    :summary: Unhides the DFHack terminal window.
+    :tags: system
+
+Useful if you have hidden the terminal with `hide` and you want it back. Since
+the terminal window won't be available to run this command, you'll need to use
+it from a `keybinding` set beforehand or the in-game `command-prompt`.
 
 Only available on Windows.
 
diff --git a/docs/builtins/tags.rst b/docs/builtins/tags.rst
index 024677cff..93a094149 100644
--- a/docs/builtins/tags.rst
+++ b/docs/builtins/tags.rst
@@ -1,11 +1,12 @@
 tags
 ====
-**Tags:** `tag/system`
-:dfhack-keybind:`tags`
 
-:index:`List the strings that DFHack tools can be tagged with.
-<tags; List the strings that DFHack tools can be tagged with.>` You can find
-groups of related tools by passing the tag name to the `ls` command.
+.. dfhack-tool::
+    :summary: List the strings that DFHack tools can be tagged with.
+    :tags: system
+
+You can find groups of related tools by passing the tag name to the `ls`
+command.
 
 Usage::
 
diff --git a/docs/builtins/type.rst b/docs/builtins/type.rst
index d7cf9588e..3336cae5f 100644
--- a/docs/builtins/type.rst
+++ b/docs/builtins/type.rst
@@ -1,12 +1,13 @@
 type
 ====
-**Tags:** `tag/system`
-:dfhack-keybind:`type`
 
-:index:`Describe how a command is implemented.
-<type; Describe how a command is implemented.>` DFHack commands can be provided
-by plugins, scripts, or by the core library itself. The ``type`` command can
-tell you which is the source of a particular command.
+.. dfhack-tool::
+    :summary: Describe how a command is implemented.
+    :tags: system
+
+DFHack commands can be provided by plugins, scripts, or by the core library
+itself. The ``type`` command can tell you which is the source of a particular
+command.
 
 Usage::
 
diff --git a/docs/builtins/unload.rst b/docs/builtins/unload.rst
index e79d624ec..132732a7f 100644
--- a/docs/builtins/unload.rst
+++ b/docs/builtins/unload.rst
@@ -1,9 +1,10 @@
 unload
 ======
-**Tags:** `tag/system`
-:dfhack-keybind:`unload`
 
-:index:`Unload a plugin from memory. <unload; Unload a plugin from memory.>`
+.. dfhack-tool::
+    :summary: Unload a plugin from memory.
+    :tags: system
+
 Also see `load` and `reload` for related actions.
 
 Usage::
diff --git a/docs/plugins/3dveins.rst b/docs/plugins/3dveins.rst
index 63f6cfd8d..c60582310 100644
--- a/docs/plugins/3dveins.rst
+++ b/docs/plugins/3dveins.rst
@@ -2,13 +2,12 @@
 =======
 
 .. dfhack-tool::
+    :summary: Rewrite layer veins to expand in 3D space.
     :tags: fort mod map
 
-:index:`Rewrite layer veins to expand in 3D space.
-<3dveins; Rewrite layer veins to expand in 3D space.>` Existing, flat veins
-are removed and new 3D veins that naturally span z-levels are generated in
-their place. The transformation preserves the mineral counts reported by
-`prospect`.
+Existing, flat veins are removed and new 3D veins that naturally span z-levels
+are generated in their place. The transformation preserves the mineral counts
+reported by `prospect`.
 
 Usage::
 
diff --git a/docs/plugins/RemoteFortressReader.rst b/docs/plugins/RemoteFortressReader.rst
index da8c3570e..f849266c2 100644
--- a/docs/plugins/RemoteFortressReader.rst
+++ b/docs/plugins/RemoteFortressReader.rst
@@ -1,12 +1,19 @@
 RemoteFortressReader
 ====================
-**Tags:** `tag/dev`
-:dfhack-keybind:`RemoteFortressReader_version`
-:dfhack-keybind:`load-art-image-chunk`
 
-:index:`Backend for Armok Vision.
-<RemoteFortressReader; Backend for Armok Vision.>` Provides an API for realtime
-remote fortress visualization. See :forums:`Armok Vision <146473>`.
+.. dfhack-tool::
+    :summary: Backend for Armok Vision.
+    :tags: dev
+    :no-command:
+
+.. dfhack-command:: RemoteFortressReader_version
+    :summary: Print the loaded RemoteFortressReader version.
+
+.. dfhack-command:: load-art-image-chunk
+    :summary: Gets an art image chunk by index.
+
+This plugin provides an API for realtime remote fortress visualization. See
+:forums:`Armok Vision <146473>`.
 
 Usage:
 
diff --git a/docs/plugins/add-spatter.rst b/docs/plugins/add-spatter.rst
index ed3675132..06739291e 100644
--- a/docs/plugins/add-spatter.rst
+++ b/docs/plugins/add-spatter.rst
@@ -1,11 +1,14 @@
 add-spatter
 ===========
-**Tags:** `tag/adventure`, `tag/fort`, `tag/mod`, `tag/items`
 
-:index:`Make tagged reactions produce contaminants.
-<add-spatter; Make tagged reactions produce contaminants.>` Give some use to all
-those poisons that can be bought from caravans! The plugin automatically enables
-itself when you load a world with reactions that include names starting with
-``SPATTER_ADD_``. These reactions will then produce contaminants on items
-instead of improvements. The contaminants are immune to being washed away by
-water or destroyed by `clean`.
+.. dfhack-tool::
+    :summary: Make tagged reactions produce contaminants.
+    :tags: adventure fort mod items
+    :no-command:
+
+Give some use to all those poisons that can be bought from caravans! The plugin
+automatically enables itself when you load a world with reactions that include
+names starting with ``SPATTER_ADD_``, so there are no commands to run to use it.
+These reactions will then produce contaminants on items instead of improvements.
+The contaminants are immune to being washed away by water or destroyed by
+`clean`.
diff --git a/docs/plugins/autobutcher.rst b/docs/plugins/autobutcher.rst
index 7a960012e..9379ae9c1 100644
--- a/docs/plugins/autobutcher.rst
+++ b/docs/plugins/autobutcher.rst
@@ -1,12 +1,13 @@
 autobutcher
 ===========
-**Tags:** `tag/fort`, `tag/auto`, `tag/fps`, `tag/animals`
-:dfhack-keybind:`autobutcher`
 
-Automatically butcher excess livestock. This plugin monitors how many pets you
-have of each gender and age and assigns excess lifestock for slaughter. Requires
-that you add the target race(s) to a watch list. Units will be ignored if they
-are:
+.. dfhack-tool::
+    :summary: Automatically butcher excess livestock.
+    :tags: fort auto fps animals
+
+This plugin monitors how many pets you have of each gender and age and assigns
+excess lifestock for slaughter. It requires that you add the target race(s) to a
+watch list. Units will be ignored if they are:
 
 * Untamed
 * Nicknamed (for custom protection; you can use the `rename` ``unit`` tool
diff --git a/docs/plugins/autochop.rst b/docs/plugins/autochop.rst
index 6b0b7125e..b445384fb 100644
--- a/docs/plugins/autochop.rst
+++ b/docs/plugins/autochop.rst
@@ -1,10 +1,12 @@
 autochop
 ========
-**Tags:** `tag/fort`, `tag/auto`
 
-:index:`Auto-harvest trees when low on stockpiled logs.
-<autochop; Auto-harvest trees when low on stockpiled logs.>` This plugin can
-designate trees for chopping when your stocks are low on logs.
+.. dfhack-tool::
+    :summary: Auto-harvest trees when low on stockpiled logs.
+    :tags: fort auto
+    :no-command:
+
+This plugin can designate trees for chopping when your stocks are low on logs.
 
 Usage::
 
diff --git a/docs/plugins/autoclothing.rst b/docs/plugins/autoclothing.rst
index 3feb22520..a5b57dfb1 100644
--- a/docs/plugins/autoclothing.rst
+++ b/docs/plugins/autoclothing.rst
@@ -1,11 +1,12 @@
 autoclothing
 ============
-**Tags:** `tag/fort`, `tag/auto`, `tag/jobs`
-:dfhack-keybind:`autoclothing`
 
-:index:`Automatically manage clothing work orders.
-<autoclothing; Automatically manage clothing work orders.>` It allows you to
-set how many of each clothing type every citizen should have.
+.. dfhack-tool::
+    :summary: Automatically manage clothing work orders.
+    :tags: fort auto jobs
+
+This command allows you to set how many of each clothing type every citizen
+should have.
 
 Usage::
 
diff --git a/docs/plugins/autodump.rst b/docs/plugins/autodump.rst
index 3e8d291a0..0fd7ee23c 100644
--- a/docs/plugins/autodump.rst
+++ b/docs/plugins/autodump.rst
@@ -2,15 +2,20 @@ autodump
 ========
 
 .. dfhack-tool::
+    :summary: Automatically set items in a stockpile to be dumped.
     :tags: fort auto fps items stockpiles
+    :no-command:
+
+.. dfhack-command:: autodump
+    :summary: Teleports items marked for dumping to the cursor position.
 
 .. dfhack-command:: autodump-destroy-here
+    :summary: Destroy items marked for dumping under the cursor.
 
 .. dfhack-command:: autodump-destroy-item
+    :summary: Destroys the selected item.
 
-:index:`Automatically set items in a stockpile to be dumped.
-<autodump (plugin); Automatically set items in a stockpile to be dumped.>` When
-`enabled <enable>`, this plugin adds an option to the :kbd:`q` menu for
+When `enabled <enable>`, this plugin adds an option to the :kbd:`q` menu for
 stockpiles. When the ``autodump`` option is selected for the stockpile, any
 items placed in the stockpile will automatically be designated to be dumped.
 
@@ -44,8 +49,7 @@ Options
     called again with this option before the game is resumed, it cancels
     pending destroy actions.
 ``destroy-here``
-    :index:`Destroy items marked for dumping under the cursor.
-    <autodump-destroy-here; Destroy items marked for dumping under the cursor.>`
+    Destroy items marked for dumping under the cursor.
 ``visible``
     Only process items that are not hidden.
 ``hidden``
@@ -57,10 +61,8 @@ Examples
 --------
 
 ``autodump``
-    :index:`Teleports items marked for dumping to the cursor position.
-    <autodump; Teleports items marked for dumping to the cursor position.>`
+    Teleports items marked for dumping to the cursor position.
 ``autodump destroy``
     Destroys all unforbidden items marked for dumping
 ``autodump-destroy-item``
-    :index:`Destroys the selected item.
-    <autodump-destroy-item; Destroys the selected item.>`
+    Destroys the selected item.
diff --git a/docs/plugins/autofarm.rst b/docs/plugins/autofarm.rst
index bfe8ad717..44077eb89 100644
--- a/docs/plugins/autofarm.rst
+++ b/docs/plugins/autofarm.rst
@@ -1,13 +1,13 @@
 autofarm
 ========
-**Tags:** `tag/fort`, `tag/auto`, `tag/buildings`
-:dfhack-keybind:`autofarm`
-
-:index:`Automatically manage farm crop selection.
-<autofarm; Automatically manage farm crop selection.>` This plugin periodically
-scans your plant stocks and assigns crops to your farm plots based on which
-plant stocks are low (as long as you have the appropriate seeds). The target
-threshold for each crop type is configurable.
+
+.. dfhack-tool::
+    :summary: Automatically manage farm crop selection.
+    :tags: fort auto buildings
+
+Periodically scan your plant stocks and assign crops to your farm plots based on
+which plant stocks are low (as long as you have the appropriate seeds). The
+target threshold for each crop type is configurable.
 
 Usage:
 
diff --git a/docs/plugins/autogems.rst b/docs/plugins/autogems.rst
index 11575aa7a..f95d74fea 100644
--- a/docs/plugins/autogems.rst
+++ b/docs/plugins/autogems.rst
@@ -1,15 +1,16 @@
 autogems
 ========
 
-.. dfhack-tool:: autogems
+.. dfhack-tool::
+    :summary: Automatically cut rough gems.
     :tags: fort auto jobs
     :no-command:
 
 .. dfhack-command:: autogems-reload
+    :summary: Reloads the autogems configuration file.
 
-:index:`Automatically cut rough gems. <autogems; Automatically cut rough gems.>`
-This plugin periodically scans your stocks of rough gems and creates manager
-orders for cutting them at a Jeweler's Workshop.
+Automatically cut rough gems. This plugin periodically scans your stocks of
+rough gems and creates manager orders for cutting them at a Jeweler's Workshop.
 
 Usage:
 
@@ -17,10 +18,8 @@ Usage:
     Enables the plugin and starts autocutting gems according to its
     configuration.
 ``autogems-reload``
-    :index:`Reloads the autogems configuration file.
-    <autogems-reload; Reloads the autogems configuration file.>` You might need
-    to do this if you have manually modified the contents while the game is
-    running.
+    Reloads the autogems configuration file. You might need to do this if you
+    have manually modified the contents while the game is running.
 
 Run `gui/autogems` for a configuration UI, or access the ``Auto Cut Gems``
 option from the Current Workshop Orders screen (:kbd:`o`-:kbd:`W`).
diff --git a/docs/plugins/autohauler.rst b/docs/plugins/autohauler.rst
index e0e1b2bac..1a4a96c8f 100644
--- a/docs/plugins/autohauler.rst
+++ b/docs/plugins/autohauler.rst
@@ -1,13 +1,14 @@
 autohauler
 ==========
-**Tags:** `tag/fort`, `tag/auto`, `tag/labors`
-:dfhack-keybind:`autohauler`
-
-:index:`Automatically manage hauling labors.
-<autohauler; Automatically manage hauling labors.>` Similar to `autolabor`, but
-instead of managing all labors, ``autohauler`` only addresses hauling labors,
-leaving the assignment of skilled labors entirely up to you. You can use the
-in-game `manipulator` UI or an external tool like Dwarf Therapist to do so.
+
+.. dfhack-tool::
+    :summary: Automatically manage hauling labors.
+    :tags: fort auto labors
+
+Similar to `autolabor`, but instead of managing all labors, ``autohauler`` only
+addresses hauling labors, leaving the assignment of skilled labors entirely up
+to you. You can use the in-game `manipulator` UI or an external tool like Dwarf
+Therapist to do so.
 
 Idle dwarves who are not on active military duty will be assigned the hauling
 labors; everyone else (including those currently hauling) will have the hauling
diff --git a/docs/plugins/autolabor.rst b/docs/plugins/autolabor.rst
index 1d02fcfe8..d2fe49e87 100644
--- a/docs/plugins/autolabor.rst
+++ b/docs/plugins/autolabor.rst
@@ -1,12 +1,12 @@
 autolabor
 =========
-**Tags:** `tag/fort`, `tag/auto`, `tag/labors`
-:dfhack-keybind:`autolabor`
 
-:index:`Automatically manage dwarf labors.
-<autolabor; Automatically manage dwarf labors.>` Autolabor attempts to keep as
-many dwarves as possible busy while allowing dwarves to specialize in specific
-skills.
+.. dfhack-tool::
+    :summary: Automatically manage dwarf labors.
+    :tags: fort auto labors
+
+Autolabor attempts to keep as many dwarves as possible busy while allowing
+dwarves to specialize in specific skills.
 
 Autolabor frequently checks how many jobs of each type are available and sets
 labors proportionally in order to get them all done quickly. Labors with
diff --git a/docs/plugins/automaterial.rst b/docs/plugins/automaterial.rst
index 1c237f260..513a963d2 100644
--- a/docs/plugins/automaterial.rst
+++ b/docs/plugins/automaterial.rst
@@ -1,11 +1,14 @@
 automaterial
 ============
-**Tags:** `tag/fort`, `tag/productivity`, `tag/design`, `tag/buildings`, `tag/map`
 
-:index:`Sorts building materials by recent usage.
-<automaterial; Sorts building materials by recent usage.>` This makes building
-constructions (walls, floors, fortifications, etc) much easier by saving you
-from having to trawl through long lists of materials each time you place one.
+.. dfhack-tool::
+    :summary: Sorts building materials by recent usage.
+    :tags: fort productivity design buildings map
+    :no-command:
+
+This plugin makes building constructions (walls, floors, fortifications, etc)
+much easier by saving you from having to trawl through long lists of materials
+each time you place one.
 
 It moves the last used material for a given construction type to the top of the
 list, if there are any left. So if you build a wall with chalk blocks, the next
diff --git a/docs/plugins/automelt.rst b/docs/plugins/automelt.rst
index 6c42cbb7e..508fdaeaf 100644
--- a/docs/plugins/automelt.rst
+++ b/docs/plugins/automelt.rst
@@ -2,14 +2,13 @@ automelt
 ========
 
 .. dfhack-tool::
+    :summary: Quickly designate items to be melted.
     :tags: fort auto items stockpiles
     :no-command:
 
-:index:`Quickly designate items to be melted.
-<automelt; Quickly designate items to be melted.>` When `enabled <enable>`, this
-plugin adds an option to the :kbd:`q` menu for stockpiles. When the ``automelt``
-option is selected for the stockpile, any items placed in the stockpile will
-automatically be designated to be melted.
+When `enabled <enable>`, this plugin adds an option to the :kbd:`q` menu for
+stockpiles. When the ``automelt`` option is selected for the stockpile, any
+items placed in the stockpile will automatically be designated to be melted.
 
 Usage::
 
diff --git a/docs/plugins/autonestbox.rst b/docs/plugins/autonestbox.rst
index 2f874c452..b82a1a207 100644
--- a/docs/plugins/autonestbox.rst
+++ b/docs/plugins/autonestbox.rst
@@ -1,16 +1,21 @@
 autonestbox
 ===========
-**Tags:** `tag/fort`, `tag/auto`, `tag/animals`
-:dfhack-keybind:`autonestbox`
 
-Auto-assign egg-laying female pets to nestbox zones. Requires that you create
-pen/pasture zones above nestboxes. If the pen is bigger than 1x1, the nestbox
-must be in the top left corner. Only 1 unit will be assigned per pen, regardless
-of the size. The age of the units is currently not checked since most birds grow
-up quite fast. Egg layers who are also grazers will be ignored, since confining
-them to a 1x1 pasture is not a good idea. Only tame and domesticated own units
-are processed since pasturing half-trained wild egg layers could destroy your
-neat nestbox zones when they revert to wild.
+.. dfhack-tool::
+    :summary: Auto-assign egg-laying female pets to nestbox zones.
+    :tags: fort auto animals
+
+To use this feature, you must create pen/pasture zones above nestboxes. If the
+pen is bigger than 1x1, the nestbox must be in the top left corner. Only 1 unit
+will be assigned per pen, regardless of the size. Egg layers who are also
+grazers will be ignored, since confining them to a 1x1 pasture is not a good
+idea. Only tame and domesticated own units are processed since pasturing
+half-trained wild egg layers could destroy your neat nestbox zones when they
+revert to wild.
+
+Note that the age of the units is not checked, so you might get some egg-laying
+kids assigned to the nestbox zones. Most birds grow up quite fast, though, so
+they should be adults and laying eggs soon enough.
 
 Usage:
 
diff --git a/docs/plugins/autotrade.rst b/docs/plugins/autotrade.rst
index 35657fc88..f27fab122 100644
--- a/docs/plugins/autotrade.rst
+++ b/docs/plugins/autotrade.rst
@@ -1,12 +1,14 @@
 autotrade
 =========
-**Tags:** `tag/fort`, `tag/auto`, `tag/items`, `tag/stockpiles`
 
-:index:`Quickly designate items to be traded.
-<autotrade; Quickly designate items to be traded.>` When `enabled <enable>`,
-this plugin adds an option to the :kbd:`q` menu for stockpiles. When the
-``autotrade`` option is selected for the stockpile, any items placed in the
-stockpile will automatically be designated to be traded.
+.. dfhack-tool::
+    :summary: Quickly designate items to be traded.
+    :tags: fort auto items stockpiles
+    :no-command:
+
+When `enabled <enable>`, this plugin adds an option to the :kbd:`q` menu for
+stockpiles. When the ``autotrade`` option is selected for the stockpile, any
+items placed in the stockpile will automatically be designated to be traded.
 
 Usage::
 
diff --git a/docs/plugins/blueprint.rst b/docs/plugins/blueprint.rst
index 48ffdd883..8654aa1ec 100644
--- a/docs/plugins/blueprint.rst
+++ b/docs/plugins/blueprint.rst
@@ -1,12 +1,13 @@
 blueprint
 =========
-**Tags:** `tag/fort`, `tag/design`, `tag/quickfort`, `tag/map`
-:dfhack-keybind:`blueprint`
 
-:index:`Record a live game map in a quickfort blueprint.
-<blueprint; Record a live game map in a quickfort blueprint.>` With
-``blueprint``, you can export the structure of a portion of your fortress in a
-blueprint file that you (or anyone else) can later play back with `quickfort`.
+.. dfhack-tool::
+    :summary: Record a live game map in a quickfort blueprint.
+    :tags: fort design quickfort map
+
+With ``blueprint``, you can export the structure of a portion of your fortress
+in a blueprint file that you (or anyone else) can later play back with
+`quickfort`.
 
 Blueprints are ``.csv`` or ``.xlsx`` files created in the ``blueprints``
 subdirectory of your DF folder. The map area to turn into a blueprint is either
diff --git a/docs/plugins/building-hacks.rst b/docs/plugins/building-hacks.rst
index 1f8ee1b2b..cd8835f37 100644
--- a/docs/plugins/building-hacks.rst
+++ b/docs/plugins/building-hacks.rst
@@ -1,7 +1,9 @@
 building-hacks
 ==============
-**Tags:** `tag/fort`, `tag/mod`, `tag/buildings`
 
-Provides a Lua API for creating powered workshops.
+.. dfhack-tool::
+    :summary: Provides a Lua API for creating powered workshops.
+    :tags: fort mod buildings
+    :no-command:
 
 See `building-hacks-api` for more details.
diff --git a/docs/plugins/buildingplan.rst b/docs/plugins/buildingplan.rst
index be95dc6f1..ea9d78f64 100644
--- a/docs/plugins/buildingplan.rst
+++ b/docs/plugins/buildingplan.rst
@@ -1,11 +1,11 @@
 buildingplan
 ============
-**Tags:** `tag/fort`, `tag/design`, `tag/quickfort`, `tag/buildings`, `tag/map`
-:dfhack-keybind:`buildingplan`
 
-:index:`Plan building construction before you have materials.
-<buildingplan; Plan building construction before you have materials.>` This
-plugin adds a planning mode for building placement. You can then place
+.. dfhack-tool::
+    :summary: Plan building construction before you have materials.
+    :tags: fort design quickfort buildings map
+
+This plugin adds a planning mode for building placement. You can then place
 furniture, constructions, and other buildings before the required materials are
 available, and they will be created in a suspended state. Buildingplan will
 periodically scan for appropriate items, and the jobs will be unsuspended when
diff --git a/docs/plugins/burrows.rst b/docs/plugins/burrows.rst
index 4728e2cd5..92e62f08b 100644
--- a/docs/plugins/burrows.rst
+++ b/docs/plugins/burrows.rst
@@ -1,24 +1,23 @@
 burrows
 =======
-**Tags:** `tag/fort`, `tag/auto`, `tag/productivity`, `tag/units`
-:dfhack-keybind:`burrow`
 
-:index:`Auto-expand burrows as you dig.
-<burrows (plugin); Auto-expand burrows as you dig.>` When a wall inside a burrow
-with a name ending in ``+`` is dug out, the burrow will be extended to
-newly-revealed adjacent walls. Note that digging 1-wide corridors with the miner
-inside the burrow is **SLOW**.
+.. dfhack-tool::
+    :summary: Auto-expand burrows as you dig.
+    :tags: fort auto productivity units
+    :no-command:
 
-You can also use the ``burrow`` command to
-:index:`quickly add units/tiles to burrows.
-<burrow; Quickly add units/tiles to burrows.>`
+.. dfhack-command:: burrow
+    :summary: Quickly add units/tiles to burrows.
+
+When a wall inside a burrow with a name ending in ``+`` is dug out, the burrow
+will be extended to newly-revealed adjacent walls.
 
 Usage:
 
 ``burrow enable auto-grow``
     When a wall inside a burrow with a name ending in '+' is dug out, the burrow
     will be extended to newly-revealed adjacent walls. This final '+' may be
-    omitted in burrow name args of other ``burrows`` commands. Note that digging
+    omitted in burrow name args of other ``burrow`` commands. Note that digging
     1-wide corridors with the miner inside the burrow is SLOW.
 ``burrow disable auto-grow``
     Disables auto-grow processing.
diff --git a/docs/plugins/changeitem.rst b/docs/plugins/changeitem.rst
index 68c53f821..e49698822 100644
--- a/docs/plugins/changeitem.rst
+++ b/docs/plugins/changeitem.rst
@@ -1,15 +1,15 @@
 changeitem
 ==========
-**Tags:** `tag/adventure`, `tag/fort`, `tag/armok`, `tag/items`
-:dfhack-keybind:`changeitem`
-
-:index:`Change item material and base quality.
-<changeitem; Change item material and base quality.>` By default, a change is
-only allowed if the existing and desired item materials are of the same subtype
-(for example wood -> wood, stone -> stone, etc). But since some transformations
-work pretty well and may be desired you can override this with ``force``. Note
-that forced changes can possibly result in items that crafters and haulers
-refuse to touch.
+
+.. dfhack-tool::
+    :summary: Change item material or base quality.
+    :tags: adventure fort armok items
+
+By default, a change is only allowed if the existing and desired item materials
+are of the same subtype (for example wood -> wood, stone -> stone, etc). But
+since some transformations work pretty well and may be desired you can override
+this with ``force``. Note that forced changes can possibly result in items that
+crafters and haulers refuse to touch.
 
 Usage:
 
diff --git a/docs/plugins/changelayer.rst b/docs/plugins/changelayer.rst
index 1267fbdac..e44d6f317 100644
--- a/docs/plugins/changelayer.rst
+++ b/docs/plugins/changelayer.rst
@@ -1,13 +1,14 @@
 changelayer
 ===========
-**Tags:** `tag/fort`, `tag/armok`, `tag/map`
-:dfhack-keybind:`changelayer`
 
-:index:`Change the material of an entire geology layer.
-<changelayer; Change the material of an entire geology layer.>` Note that one
-layer can stretch across many z-levels, and changes to the geology layer will
-affect all surrounding regions, not just your embark! Mineral veins and gem
-clusters will not be affected. Use `changevein` if you want to modify those.
+.. dfhack-tool::
+    :summary: Change the material of an entire geology layer.
+    :tags: fort armok map
+
+Note that one layer can stretch across many z-levels, and changes to the geology
+layer will affect all surrounding regions, not just your embark! Mineral veins
+and gem clusters will not be affected. Use `changevein` if you want to modify
+those.
 
 tl;dr: You will end up with changing large areas in one go, especially if you
 use it in lower z levels. Use this command with care!
diff --git a/docs/plugins/changevein.rst b/docs/plugins/changevein.rst
index 96c68de76..4811c416c 100644
--- a/docs/plugins/changevein.rst
+++ b/docs/plugins/changevein.rst
@@ -1,13 +1,13 @@
 changevein
 ==========
-**Tags:** `tag/fort`, `tag/armok`, `tag/map`
-:dfhack-keybind:`changevein`
 
-:index:`Change the material of a mineral inclusion.
-<changevein; Change the material of a mineral inclusion.>` You can change it to
-any incorganic material RAW id. Note that this command only affects tiles within
-the current 16x16 block - for large veins and clusters, you will need to use
-this command multiple times.
+.. dfhack-tool::
+    :summary: Change the material of a mineral inclusion.
+    :tags: fort armok map
+
+You can change a vein to any incorganic material RAW id. Note that this command
+only affects tiles within the current 16x16 block - for large veins and
+clusters, you will need to use this command multiple times.
 
 You can use the `probe` command to discover the material RAW ids for existing
 veins that you want to duplicate.
diff --git a/docs/plugins/cleanconst.rst b/docs/plugins/cleanconst.rst
index c47a8c6dd..9c0309105 100644
--- a/docs/plugins/cleanconst.rst
+++ b/docs/plugins/cleanconst.rst
@@ -1,13 +1,14 @@
 cleanconst
 ==========
-**Tags:** `tag/fort`, `tag/fps`, `tag/map`
-:dfhack-keybind:`cleanconst`
-
-:index:`Cleans up construction materials.
-<cleanconst; Cleans up construction materials.>` This tool alters all
-constructions on the map so that they spawn their building component when they
-are disassembled, allowing their actual build items to be safely deleted. This
-can improve FPS when you have many constructions on the map.
+
+.. dfhack-tool::
+    :summary: Cleans up construction materials.
+    :tags: fort fps map
+
+This tool alters all constructions on the map so that they spawn their building
+component when they are disassembled, allowing their actual build items to be
+safely deleted. This can improve FPS when you have many constructions on the
+map.
 
 Usage::
 
diff --git a/docs/plugins/cleaners.rst b/docs/plugins/cleaners.rst
index 20fa792db..42e585da1 100644
--- a/docs/plugins/cleaners.rst
+++ b/docs/plugins/cleaners.rst
@@ -3,15 +3,22 @@
 
 cleaners
 ========
-**Tags:** `tag/adventure`, `tag/fort`, `tag/fps`, `tag/items`, `tag/map`, `tag/units`
-:dfhack-keybind:`clean`
-:dfhack-keybind:`spotclean`
 
-:index:`Removes contaminants.  <clean; Removes contaminants.>` More
-specifically, it cleans all the splatter that get scattered all over the map and
-that clings to your items and units. In an old fortress, cleaning with this tool
-can significantly reduce FPS lag. It can also spoil your !!FUN!!, so think
-before you use it.
+.. dfhack-tool::
+    :summary: Provides commands for cleaning spatter from the map.
+    :tags: adventure fort fps items map units
+    :no-command:
+
+.. dfhack-command:: clean
+    :summary: Removes contaminants.
+
+.. dfhack-command:: spotclean
+    :summary: Remove all contaminants from the tile under the cursor.
+
+This plugin provides commands that clean the splatter that get scattered all
+over the map and that clings to your items and units. In an old fortress,
+cleaning with this tool can significantly reduce FPS lag! It can also spoil your
+!!FUN!!, so think before you use it.
 
 Usage::
 
@@ -21,11 +28,10 @@ Usage::
 By default, cleaning the map leaves mud and snow alone. Note that cleaning units
 includes hostiles, and that cleaning items removes poisons from weapons.
 
-``spotclean`` works like ``clean map snow mud``,
-:index:`removing all contaminants from the tile under the cursor.
-<clean; Remove all contaminants from the tile under the cursor.>` This is ideal
-if you just want to clean a specific tile but don't want the `clean` command to
-remove all the glorious blood from your entranceway.
+``spotclean`` works like ``clean map snow mud``, removing all contaminants from
+the tile under the cursor. This is ideal if you just want to clean a specific
+tile but don't want the `clean` command to remove all the glorious blood from
+your entranceway.
 
 Examples
 --------
diff --git a/docs/plugins/cleanowned.rst b/docs/plugins/cleanowned.rst
index 409c39345..7271ce402 100644
--- a/docs/plugins/cleanowned.rst
+++ b/docs/plugins/cleanowned.rst
@@ -1,13 +1,14 @@
 cleanowned
 ==========
-**Tags:** `tag/fort`, `tag/productivity`, `tag/items`
-:dfhack-keybind:`cleanowned`
-
-:index:`Confiscates and dumps garbage owned by dwarves.
-<cleanowned; Confiscates and dumps garbage owned by dwarves.>` This tool gets
-dwarves to give up ownership of scattered items and items with heavy wear and
-then marks those items for dumping. Now you can finally get your dwarves to give
-up their rotten food and tattered loincloths and go get new ones!
+
+.. dfhack-tool::
+    :summary: Confiscates and dumps garbage owned by dwarves.
+    :tags: fort productivity items
+
+This tool gets dwarves to give up ownership of scattered items and items with
+heavy wear and then marks those items for dumping. Now you can finally get your
+dwarves to give up their rotten food and tattered loincloths and go get new
+ones!
 
 Usage::
 
diff --git a/docs/plugins/command-prompt.rst b/docs/plugins/command-prompt.rst
index 312734b97..278741f36 100644
--- a/docs/plugins/command-prompt.rst
+++ b/docs/plugins/command-prompt.rst
@@ -1,10 +1,9 @@
 command-prompt
 ==============
-**Tags:** `tag/system`
-:dfhack-keybind:`command-prompt`
 
-:index:`An in-game DFHack terminal where you can enter other commands.
-<command-prompt; An in-game DFHack terminal where you can enter other commands.>`
+.. dfhack-tool::
+    :summary: An in-game DFHack terminal where you can run other commands.
+    :tags: system
 
 Usage::
 
diff --git a/docs/plugins/confirm.rst b/docs/plugins/confirm.rst
index de2556b6f..aef18c9c0 100644
--- a/docs/plugins/confirm.rst
+++ b/docs/plugins/confirm.rst
@@ -1,12 +1,12 @@
 confirm
 =======
-**Tags:** `tag/fort`, `tag/interface`
-:dfhack-keybind:`confirm`
 
-:index:`Adds confirmation dialogs for destructive actions.
-<confirm; Adds confirmation dialogs for destructive actions.>` Now you can get
-the chance to avoid seizing goods from traders or deleting a hauling route in
-case you hit the key accidentally.
+.. dfhack-tool::
+    :summary: Adds confirmation dialogs for destructive actions.
+    :tags: fort interface
+
+Now you can get the chance to avoid seizing goods from traders or deleting a
+hauling route in case you hit the key accidentally.
 
 Usage:
 
diff --git a/docs/plugins/createitem.rst b/docs/plugins/createitem.rst
index 38f072e62..dfd286395 100644
--- a/docs/plugins/createitem.rst
+++ b/docs/plugins/createitem.rst
@@ -1,12 +1,13 @@
 createitem
 ==========
-**Tags:** `tag/adventure`, `tag/fort`, `tag/armok`, `tag/items`
-:dfhack-keybind:`createitem`
 
-:index:`Create arbitrary items. <createitem; Create arbitrary items.>` You can
-create new items of any type and made of any material. A unit must be selected
-in-game to use this command. By default, items created are spawned at the feet
-of the selected unit.
+.. dfhack-tool::
+    :summary: Create arbitrary items.
+    :tags: adventure fort armok items
+
+You can create new items of any type and made of any material. A unit must be
+selected in-game to use this command. By default, items created are spawned at
+the feet of the selected unit.
 
 Specify the item and material information as you would indicate them in custom
 reaction raws, with the following differences:
diff --git a/docs/plugins/cursecheck.rst b/docs/plugins/cursecheck.rst
index ecb4dbd2f..b2e2943ba 100644
--- a/docs/plugins/cursecheck.rst
+++ b/docs/plugins/cursecheck.rst
@@ -1,9 +1,10 @@
 cursecheck
 ==========
-**Tags:** `tag/system`, `tag/interface`
-:dfhack-keybind:`cursecheck`
 
-:index:`Check for cursed creatures. <cursecheck; Check for cursed creatures.>`
+.. dfhack-tool::
+    :summary: Check for cursed creatures.
+    :tags: system interface
+
 This command checks a single map tile (or the whole map/world) for cursed
 creatures (ghosts, vampires, necromancers, werebeasts, zombies, etc.).
 
diff --git a/docs/plugins/cxxrandom.rst b/docs/plugins/cxxrandom.rst
index 0016fb8d0..19788e4a4 100644
--- a/docs/plugins/cxxrandom.rst
+++ b/docs/plugins/cxxrandom.rst
@@ -1,7 +1,9 @@
 cxxrandom
 =========
-**Tags:** `tag/dev`
 
-Provides a Lua API for random distributions.
+.. dfhack-tool::
+    :summary: Provides a Lua API for random distributions.
+    :tags: dev
+    :no-command:
 
 See `cxxrandom-api` for details.
diff --git a/docs/plugins/debug.rst b/docs/plugins/debug.rst
index 4cc94b217..a9e601c77 100644
--- a/docs/plugins/debug.rst
+++ b/docs/plugins/debug.rst
@@ -1,11 +1,15 @@
 debug
 =====
-**Tags:** `tag/dev`
-:dfhack-keybind:`debugfilter`
 
-:index:`Configure verbosity of DFHack debug output.
-<debugfilter; Configure verbosity of DFHack debug output.>` Debug output is
-grouped by plugin name, category name, and verbosity level.
+.. dfhack-tool::
+    :summary: Provides commands for controlling debug log verbosity.
+    :tags: dev
+    :no-command:
+
+.. dfhack-command:: debugfilter
+    :summary: Configure verbosity of DFHack debug output.
+
+Debug output is grouped by plugin name, category name, and verbosity level.
 
 The verbosity levels are:
 
diff --git a/docs/plugins/deramp.rst b/docs/plugins/deramp.rst
index 6126d2828..4bb96ef0a 100644
--- a/docs/plugins/deramp.rst
+++ b/docs/plugins/deramp.rst
@@ -1,11 +1,11 @@
 deramp
 ======
-**Tags:** `tag/fort`, `tag/armok`, `tag/map`
-:dfhack-keybind:`deramp`
 
-:index:`Removes all ramps designated for removal from the map.
-<deramp; Removes all ramps designated for removal from the map.>` It also
-removes any "floating" down ramps that can remain after a cave-in.
+.. dfhack-tool::
+    :summary: Removes all ramps designated for removal from the map.
+    :tags: fort armok map
+
+It also removes any "floating" down ramps that can remain after a cave-in.
 
 Usage::
 
diff --git a/docs/plugins/dig-now.rst b/docs/plugins/dig-now.rst
index 7d3beedc0..0562e000a 100644
--- a/docs/plugins/dig-now.rst
+++ b/docs/plugins/dig-now.rst
@@ -1,14 +1,14 @@
 dig-now
 =======
-**Tags:** `tag/fort`, `tag/armok`, `tag/map`
-:dfhack-keybind:`dig-now`
 
-:index:`Instantly complete dig designations.
-<dig-now; Instantly complete dig designations.>` This tool will magically
-complete non-marker dig designations, modifying tile shapes and creating
-boulders, ores, and gems as if a miner were doing the mining or engraving. By
-default, the entire map is processed and boulder generation follows standard
-game rules, but the behavior is configurable.
+.. dfhack-tool::
+    :summary: Instantly complete dig designations.
+    :tags: fort armok map
+
+This tool will magically complete non-marker dig designations, modifying tile
+shapes and creating boulders, ores, and gems as if a miner were doing the mining
+or engraving. By default, the entire map is processed and boulder generation
+follows standard game rules, but the behavior is configurable.
 
 Note that no units will get mining or engraving experience for the dug/engraved
 tiles.
diff --git a/docs/plugins/dig.rst b/docs/plugins/dig.rst
index f4e0c8acb..1761b7085 100644
--- a/docs/plugins/dig.rst
+++ b/docs/plugins/dig.rst
@@ -3,47 +3,58 @@
 
 dig
 ===
-**Tags:** `tag/fort`, `tag/productivity`, `tag/design`, `tag/map`
-:dfhack-keybind:`digv`
-:dfhack-keybind:`digvx`
-:dfhack-keybind:`digl`
-:dfhack-keybind:`diglx`
-:dfhack-keybind:`digcircle`
-:dfhack-keybind:`digtype`
-:dfhack-keybind:`digexp`
 
-Make complicated dig patterns easy.
+.. dfhack-tool::
+    :summary: Provides commands for designating tiles for digging.
+    :tags: fort productivity design map
+    :no-command:
+
+.. dfhack-command:: digv
+    :summary: Designate all of the selected vein for digging.
+
+.. dfhack-command:: digvx
+    :summary: Dig a vein across z-levels, digging stairs as needed.
+
+.. dfhack-command:: digl
+    :summary: Dig all of the selected layer stone.
+
+.. dfhack-command:: diglx
+    :summary: Dig layer stone across z-levels, digging stairs as needed.
+
+.. dfhack-command:: digcircle
+    :summary: Designate circles.
+
+.. dfhack-command:: digtype
+    :summary: Designate all vein tiles of the selected type.
+
+.. dfhack-command:: digexp
+    :summary: Designate dig patterns for exploratory mining.
+
+This plugin provides commands to make complicated dig patterns easy.
 
 Usage:
 
 ``digv [x] [-p<number>]``
-    :index:`Designate all of the selected vein for digging.
-    <digv; Designate all of the selected vein for digging.>`
+    Designate all of the selected vein for digging.
 ``digvx [-p<number>]``
-    :index:`Dig a vein across z-levels, digging stairs as needed.
-    <digvx; Dig a vein across z-levels, digging stairs as needed.>`
-    This is an alias for ``digv x``.
+    Dig a vein across z-levels, digging stairs as needed. This is an alias for
+    ``digv x``.
 ``digl [x] [undo] [-p<number>]``
-    :index:`Dig all of the selected layer stone.
-    <digl; Dig all of the selected layer stone.>` If ``undo`` is specified,
-    removes the designation instead (for if you accidentally set 50 levels at
-    once).
+    Dig all of the selected layer stone. If ``undo`` is specified, removes the
+    designation instead (for if you accidentally set 50 levels at once).
 ``diglx [-p<number>]``
-    :index:`Dig layer stone across z-levels, digging stairs as needed.
-    <diglx; Dig layer stone across z-levels, digging stairs as needed.>` This
-    is an alias for ``digl x``.
+    Dig layer stone across z-levels, digging stairs as needed. This is an alias
+    for ``digl x``.
 ``digcircle [<diameter>] [<solidity>] [<action>] [<designation>] [-p<number>]``
-    :index:`Designate circles. <digcircles; Designate circles.>` The diameter
-    is the number of tiles across the center of the circle that you want to dig.
-    See the `digcircle`_ section below for options.
+    Designate circles. The diameter is the number of tiles across the center of
+    the circle that you want to dig. See the `digcircle`_ section below for
+    options.
 ``digtype [<designation>] [-p<number>]``
-    :index:`Designate all vein tiles of the selected type.
-    <digtype; Designate all vein tiles of the selected type.>` See the `digtype`_
-    section below for options.
+    Designate all vein tiles of the selected type. See the `digtype`_ section
+    below for options.
 ``digexp [<pattern>] [<filter>] [-p<number>]``
-    :index:`Designate dig patterns for exploratory mining.
-    <digexp; Designate dig patterns for exploratory mining.>` See the `digexp`_
-    section below for options
+    Designate dig patterns for exploratory mining. See the `digexp`_ section
+    below for options.
 
 All commands support specifying the priority of the dig designations with
 ``-p<number>``, where the number is from 1 to 7. If a priority is not specified,
diff --git a/docs/plugins/digFlood.rst b/docs/plugins/digFlood.rst
index 1a17c32a7..60bbc9423 100644
--- a/docs/plugins/digFlood.rst
+++ b/docs/plugins/digFlood.rst
@@ -1,13 +1,16 @@
 digFlood
 ========
-**Tags:** `tag/fort`, `tag/auto`, `tag/map`
-:dfhack-keybind:`digFlood`
-
-:index:`Digs out veins as they are discovered.
-<digFlood; Digs out veins as they are discovered.>` It will only dig out
-appropriate tiles that are adjacent to a just-finished dig job, so if you want
-to autodig a vein that has already been discovered, you may need to manually
-designate one tile of the tile for digging to get started.
+
+.. dfhack-tool::
+    :summary: Digs out veins as they are discovered.
+    :tags: fort auto map
+
+Once you register specific vein types, this tool will automatically designate
+tiles of those types of veins for digging as your miners complete adjacent
+mining jobs. Note that it will *only* dig out tiles that are adjacent to a
+just-finished dig job, so if you want to autodig a vein that has already been
+discovered, you may need to manually designate one tile of the tile for digging
+to get started.
 
 Usage:
 
diff --git a/docs/plugins/diggingInvaders.rst b/docs/plugins/diggingInvaders.rst
index 4891bf8d4..df54e7008 100644
--- a/docs/plugins/diggingInvaders.rst
+++ b/docs/plugins/diggingInvaders.rst
@@ -1,10 +1,9 @@
 diggingInvaders
 ===============
-**Tags:** `tag/fort`, `tag/mod`, `tag/map`
-:dfhack-keybind:`diggingInvaders`
 
-:index:`Invaders dig and destroy to get to your dwarves.
-<diggingInvaders; Invaders dig and destroy to get to your dwarves.>`
+.. dfhack-tool::
+    :summary: Invaders dig and destroy to get to your dwarves.
+    :tags: fort mod map
 
 Usage:
 
diff --git a/docs/plugins/dwarfmonitor.rst b/docs/plugins/dwarfmonitor.rst
index a7f42bb81..73d8a8c19 100644
--- a/docs/plugins/dwarfmonitor.rst
+++ b/docs/plugins/dwarfmonitor.rst
@@ -1,11 +1,11 @@
 dwarfmonitor
 ============
-**Tags:** `tag/fort`, `tag/inspection`, `tag/units`
-:dfhack-keybind:`dwarfmonitor`
 
-:index:`Measure fort happiness and efficiency.
-<dwarfmonitor; Measure fort happiness and efficiency.>` Also show heads-up
-display widgets with live fort statistics.
+.. dfhack-tool::
+    :summary: Measure fort happiness and efficiency.
+    :tags: fort inspection units
+
+It can also show heads-up display widgets with live fort statistics.
 
 Usage:
 
diff --git a/docs/plugins/dwarfvet.rst b/docs/plugins/dwarfvet.rst
index 2db4a9595..f607e85cd 100644
--- a/docs/plugins/dwarfvet.rst
+++ b/docs/plugins/dwarfvet.rst
@@ -1,10 +1,9 @@
 dwarfvet
 ========
-**Tags:** `tag/fort`, `tag/mod`, `tag/animals`
-:dfhack-keybind:`dwarfvet`
 
-:index:`Allows animals to be treated at animal hospitals.
-<dwarfvet; Allows animals to be treated at animal hospitals.>`
+.. dfhack-tool::
+    :summary: Allows animals to be treated at animal hospitals.
+    :tags: fort mod animals
 
 Annoyed your dragons become useless after a minor injury? Well, with dwarfvet,
 injured animals will be treated at an animal hospital, which is simply a hospital
diff --git a/docs/plugins/embark-assistant.rst b/docs/plugins/embark-assistant.rst
index b9a7e4ee2..22c18996a 100644
--- a/docs/plugins/embark-assistant.rst
+++ b/docs/plugins/embark-assistant.rst
@@ -1,14 +1,15 @@
 embark-assistant
 ================
-**Tags:** `tag/fort`, `tag/embark`, `tag/interface`
-:dfhack-keybind:`embark-assistant`
 
-:index:`Embark site selection support.
-<embark-assistant; Embark site selection support.>` Run this command while the
-pre-embark screen is displayed to show extended (and correct(?)) resource
-information for the embark rectangle as well as normally undisplayed sites in
-the current embark region. You will also have access to a site selection tool
-with far more options than DF's vanilla search tool.
+.. dfhack-tool::
+    :summary: Embark site selection support.
+    :tags: fort embark interface
+
+Run this command while the pre-embark screen is displayed to show extended (and
+reasonably correct) resource information for the embark rectangle as well as
+normally undisplayed sites in the current embark region. You will also have
+access to a site selection tool with far more options than DF's vanilla search
+tool.
 
 If you enable the plugin, you'll also be able to invoke ``embark-assistant``
 with the :kbd:`A` key on the pre-embark screen.
diff --git a/docs/plugins/embark-tools.rst b/docs/plugins/embark-tools.rst
index 52532e4f2..58b02d47e 100644
--- a/docs/plugins/embark-tools.rst
+++ b/docs/plugins/embark-tools.rst
@@ -1,10 +1,9 @@
 embark-tools
 ============
-**Tags:** `tag/fort`, `tag/embark`, `tag/interface`
-:dfhack-keybind:`embark-tools`
 
-:index:`Extend the embark screen functionality.
-<embark-tools; Extend the embark screen functionality.>`
+.. dfhack-tool::
+    :summary: Extend the embark screen functionality.
+    :tags: fort embark interface
 
 Usage::
 
diff --git a/docs/plugins/eventful.rst b/docs/plugins/eventful.rst
index 102287b77..d5bd55956 100644
--- a/docs/plugins/eventful.rst
+++ b/docs/plugins/eventful.rst
@@ -1,7 +1,9 @@
 eventful
 ========
-**Tags:** `tag/dev`, `tag/mod`
 
-Provides a Lua API for reacting to in-game events.
+.. dfhack-tool::
+    :summary: Provides a Lua API for reacting to in-game events.
+    :tags: dev mod
+    :no-command:
 
 See `eventful-api` for details.
diff --git a/docs/plugins/fastdwarf.rst b/docs/plugins/fastdwarf.rst
index 2e09b8a4d..7042a71a3 100644
--- a/docs/plugins/fastdwarf.rst
+++ b/docs/plugins/fastdwarf.rst
@@ -1,9 +1,9 @@
 fastdwarf
 =========
-**Tags:** `tag/fort`, `tag/armok`, `tag/units`
-:dfhack-keybind:`fastdwarf`
 
-Dwarves teleport and/or finish jobs instantly.
+.. dfhack-tool::
+    :summary: Dwarves teleport and/or finish jobs instantly.
+    :tags: fort armok units
 
 Usage::
 
diff --git a/docs/plugins/filltraffic.rst b/docs/plugins/filltraffic.rst
index acc4dabc8..ea48fd385 100644
--- a/docs/plugins/filltraffic.rst
+++ b/docs/plugins/filltraffic.rst
@@ -3,24 +3,28 @@
 
 filltraffic
 ===========
-**Tags:** `tag/fort`, `tag/productivity`, `tag/design`, `tag/map`
-:dfhack-keybind:`filltraffic`
-:dfhack-keybind:`alltraffic`
-:dfhack-keybind:`restrictice`
-:dfhack-keybind:`restrictliquids`
-
-Usage:
-
-``filltraffic <designation> [<options>]``
-    Set traffic designations using flood-fill starting at the cursor. Flood
-    filling stops at walls and doors.
-``alltraffic <designation>``
-    Set traffic designations for every single tile of the map - useful for
-    resetting traffic designations.
-``restrictice``
-    Restrict traffic on all tiles on top of visible ice.
-``restrictliquids``
-    Restrict traffic on all visible tiles with liquid.
+
+.. dfhack-tool::
+    :summary: Set traffic designations using flood-fill starting at the cursor.
+    :tags: fort productivity design map
+
+.. dfhack-command:: alltraffic
+    :summary: Set traffic designations for every single tile of the map.
+
+.. dfhack-command:: restrictice
+    :summary: Restrict traffic on all tiles on top of visible ice.
+
+.. dfhack-command:: restrictliquids
+    :summary: Restrict traffic on all visible tiles with liquid.
+
+Usage::
+
+    filltraffic <designation> [<options>]
+    alltraffic <designation>
+    restrictice
+    restrictliquids
+
+For ``filltraffic``, flood filling stops at walls and doors.
 
 Examples
 --------
diff --git a/docs/plugins/fix-unit-occupancy.rst b/docs/plugins/fix-unit-occupancy.rst
index 28479791f..117f97467 100644
--- a/docs/plugins/fix-unit-occupancy.rst
+++ b/docs/plugins/fix-unit-occupancy.rst
@@ -1,10 +1,12 @@
 fix-unit-occupancy
 ==================
-**Tags:** `tag/fort`, `tag/fix`, `tag/map`
-:dfhack-keybind:``
 
-Fix phantom unit occupancy issues. For example, if you see "unit blocking tile"
-messages that you can't account for (:bug:`3499`), this tool can help.
+.. dfhack-tool::
+    :summary: Fix phantom unit occupancy issues.
+    :tags: fort fix map
+
+If you see "unit blocking tile" messages that you can't account for
+(:bug:`3499`), this tool can help.
 
 Usage::
 
diff --git a/docs/plugins/fixveins.rst b/docs/plugins/fixveins.rst
index 873e1770a..045b3c8da 100644
--- a/docs/plugins/fixveins.rst
+++ b/docs/plugins/fixveins.rst
@@ -1,10 +1,12 @@
 fixveins
 ========
-**Tags:** `tag/fort`, `tag/fix`, `tag/map`
-:dfhack-keybind:`fixveins`
 
-Restore missing mineral inclusions. This tool can also remove invalid references
-to mineral inclusions if you broke your embark with tools like `tiletypes`.
+.. dfhack-tool::
+    :summary: Restore missing mineral inclusions.
+    :tags: fort fix map
+
+This tool can also remove invalid references to mineral inclusions if you broke
+your embark with tools like `tiletypes`.
 
 Usage::
 
diff --git a/docs/plugins/flows.rst b/docs/plugins/flows.rst
index a347f00e0..994057878 100644
--- a/docs/plugins/flows.rst
+++ b/docs/plugins/flows.rst
@@ -1,10 +1,12 @@
 flows
 =====
-**Tags:** `tag/fort`, `tag/inspection`, `tag/map`
-:dfhack-keybind:`flows`
 
-Counts map blocks with flowing liquids.. If you suspect that your magma sea
-leaks into HFS, you can use this tool to be sure without revealing the map.
+.. dfhack-tool::
+    :summary: Counts map blocks with flowing liquids.
+    :tags: fort inspection map
+
+If you suspect that your magma sea leaks into HFS, you can use this tool to be
+sure without revealing the map.
 
 Usage::
 
diff --git a/docs/plugins/follow.rst b/docs/plugins/follow.rst
index 5f43e2fdd..b6bc610b2 100644
--- a/docs/plugins/follow.rst
+++ b/docs/plugins/follow.rst
@@ -1,11 +1,13 @@
 follow
 ======
-**Tags:** `tag/fort`, `tag/interface`, `tag/units`
-:dfhack-keybind:`follow`
 
-Make the screen follow the selected unit. Once you exit from the current menu or
-cursor mode, the screen will stay centered on the unit. Handy for watching
-dwarves running around. Deactivated by moving the cursor manually.
+.. dfhack-tool::
+    :summary: Make the screen follow the selected unit.
+    :tags: fort interface units
+
+Once you exit from the current menu or cursor mode, the screen will stay
+centered on the unit. Handy for watching dwarves running around. Deactivated by
+moving the cursor manually.
 
 Usage::
 
diff --git a/docs/plugins/forceequip.rst b/docs/plugins/forceequip.rst
index 51d48390c..acfd8f462 100644
--- a/docs/plugins/forceequip.rst
+++ b/docs/plugins/forceequip.rst
@@ -1,14 +1,15 @@
 forceequip
 ==========
-**Tags:** `tag/adventure`, `tag/fort`, `tag/items`, `tag/units`
-:dfhack-keybind:`forceequip`
 
-Move items into a unit's inventory. This tool is typically used to equip
-specific clothing/armor items onto a dwarf, but can also be used to put armor
-onto a war animal or to add unusual items (such as crowns) to any unit. Make
-sure the unit you want to equip is standing on the target items, which must be
-on the ground and be unforbidden. If multiple units are standing on the same
-tile, the first one will be equipped.
+.. dfhack-tool::
+    :summary: Move items into a unit's inventory.
+    :tags: adventure fort items units
+
+This tool is typically used to equip specific clothing/armor items onto a dwarf,
+but can also be used to put armor onto a war animal or to add unusual items
+(such as crowns) to any unit. Make sure the unit you want to equip is standing
+on the target items, which must be on the ground and be unforbidden. If multiple
+units are standing on the same tile, the first one will be equipped.
 
 The most reliable way to set up the environment for this command is to pile
 target items on a tile of floor with a garbage dump activity zone or the
diff --git a/docs/plugins/generated-creature-renamer.rst b/docs/plugins/generated-creature-renamer.rst
index 39983940b..6af13595a 100644
--- a/docs/plugins/generated-creature-renamer.rst
+++ b/docs/plugins/generated-creature-renamer.rst
@@ -1,12 +1,20 @@
 generated-creature-renamer
 ==========================
-**Tags:** `tag/adventure`, `tag/fort`, `tag/legends`, `tag/units`
-:dfhack-keybind:`list-generated`
-:dfhack-keybind:`save-generated-raws`
 
-Automatically renames generated creatures. Now, forgotten beasts, titans,
-necromancer experiments, etc. will have raw token names that match the
-description given in-game instead of unreadable generated strings.
+.. dfhack-tool::
+    :summary: Automatically renames generated creatures.
+    :tags: adventure fort legends units
+    :no-command:
+
+.. dfhack-command:: list-generated
+    :summary: List the token names of all generated creatures.
+
+.. dfhack-command:: save-generated-raws
+    :summary: Export a creature graphics file for modding.
+
+Now, forgotten beasts, titans, necromancer experiments, etc. will have raw token
+names that match the description given in-game instead of unreadable generated
+strings.
 
 Usage:
 
diff --git a/docs/plugins/getplants.rst b/docs/plugins/getplants.rst
index 21325e8f2..502f6e9ae 100644
--- a/docs/plugins/getplants.rst
+++ b/docs/plugins/getplants.rst
@@ -1,10 +1,12 @@
 getplants
 =========
-**Tags:** `tag/fort`, `tag/productivity`
-:dfhack-keybind:`getplants`
 
-Designate trees for chopping and shrubs for gathering. Specify the types of
-trees to cut down and/or shrubs to gather by their plant names.
+.. dfhack-tool::
+    :summary: Designate trees for chopping and shrubs for gathering.
+    :tags: fort productivity
+
+Specify the types of trees to cut down and/or shrubs to gather by their plant
+names.
 
 Usage:
 
diff --git a/docs/plugins/hotkeys.rst b/docs/plugins/hotkeys.rst
index fbf4a9a76..7d30d486e 100644
--- a/docs/plugins/hotkeys.rst
+++ b/docs/plugins/hotkeys.rst
@@ -1,11 +1,12 @@
 hotkeys
 =======
-**Tags:** `tag/system`, `tag/productivity`, `tag/interface`
-:dfhack-keybind:`hotkeys`
 
-Show all dfhack keybindings in current context. The command opens an in-game
-screen showing which DFHack keybindings are active in the current context.
-See also `hotkey-notes`.
+.. dfhack-tool::
+    :summary: Show all dfhack keybindings for the current context.
+    :tags: system productivity interface
+
+The command opens an in-game screen showing which DFHack keybindings are active
+in the current context. See also `hotkey-notes`.
 
 Usage::
 
diff --git a/docs/plugins/infiniteSky.rst b/docs/plugins/infiniteSky.rst
index ceb08aa0e..46f30c24c 100644
--- a/docs/plugins/infiniteSky.rst
+++ b/docs/plugins/infiniteSky.rst
@@ -1,10 +1,13 @@
 infiniteSky
 ===========
-**Tags:** `tag/fort`, `tag/map`
-:dfhack-keybind:`infiniteSky`
 
-Automatically allocates new z-levels of sky at the top of the map as you build
-up, or on request allocates many levels all at once.
+.. dfhack-tool::
+    :summary: Automatically allocates new z-levels of sky
+    :tags: fort map
+
+If enabled, this plugin will automatically allocate new z-levels of sky at the
+top of the map as you build up. Or it can allocate one or many additional levels
+at your command.
 
 Usage:
 
diff --git a/docs/plugins/isoworldremote.rst b/docs/plugins/isoworldremote.rst
index 84babe66a..1fa439b29 100644
--- a/docs/plugins/isoworldremote.rst
+++ b/docs/plugins/isoworldremote.rst
@@ -1,5 +1,9 @@
 isoworldremote
 ==============
-**Tags:** `tag/dev`, `tag/mod`
 
-Provides a `remote API <remote>` used by Isoworld.
+.. dfhack-tool::
+    :summary: Provides a remote API used by Isoworld.
+    :tags: dev mod
+    :no-command:
+
+See `remote` for related remote APIs.
diff --git a/docs/plugins/jobutils.rst b/docs/plugins/jobutils.rst
index 5dcb0c85f..46b221f89 100644
--- a/docs/plugins/jobutils.rst
+++ b/docs/plugins/jobutils.rst
@@ -2,12 +2,20 @@
 
 jobutils
 ========
-**Tags:** `tag/fort`, `tag/inspection`, `tag/jobs`
-:dfhack-keybind:`job`
-:dfhack-keybind:`job-duplicate`
-:dfhack-keybind:`job-material`
 
-Inspect or modify details of workshop jobs.
+.. dfhack-tool::
+    :summary: Provides commands for interacting with jobs.
+    :tags: fort inspection jobs
+    :no-command:
+
+.. dfhack-command:: job
+    :summary: Inspect or modify details of workshop jobs.
+
+.. dfhack-command:: job-duplicate
+    :summary: Duplicates the highlighted job.
+
+.. dfhack-command:: job-material
+    :summary: Alters the material of the selected job.
 
 Usage:
 
diff --git a/docs/plugins/labormanager.rst b/docs/plugins/labormanager.rst
index 1a25cedae..b168a3b7a 100644
--- a/docs/plugins/labormanager.rst
+++ b/docs/plugins/labormanager.rst
@@ -1,12 +1,14 @@
 labormanager
 ============
-**Tags:** `tag/fort`, `tag/auto`, `tag/labors`
-:dfhack-keybind:`labormanager`
 
-Automatically manage dwarf labors. Labormanager is derived from `autolabor`
-but uses a completely different approach to assigning jobs to dwarves. While
-autolabor tries to keep as many dwarves busy as possible, labormanager instead
-strives to get jobs done as quickly as possible.
+.. dfhack-tool::
+    :summary: Automatically manage dwarf labors.
+    :tags: fort auto labors
+
+Labormanager is derived from `autolabor` but uses a completely different
+approach to assigning jobs to dwarves. While autolabor tries to keep as many
+dwarves busy as possible, labormanager instead strives to get jobs done as
+quickly as possible.
 
 Labormanager frequently scans the current job list, current list of dwarves, and
 the map to determine how many dwarves need to be assigned to what labors in
diff --git a/docs/plugins/lair.rst b/docs/plugins/lair.rst
index 43bb06072..f42cc0777 100644
--- a/docs/plugins/lair.rst
+++ b/docs/plugins/lair.rst
@@ -1,10 +1,11 @@
 lair
 ====
-**Tags:** `tag/fort`, `tag/armok`, `tag/map`
-:dfhack-keybind:`lair`
 
-Mark the map as a monster lair. This avoids item scatter when the fortress is
-abandoned.
+.. dfhack-tool::
+    :summary: Mark the map as a monster lair.
+    :tags: fort armok map
+
+This avoids item scatter when the fortress is abandoned.
 
 Usage:
 
diff --git a/docs/plugins/liquids.rst b/docs/plugins/liquids.rst
index 808089591..a498364fc 100644
--- a/docs/plugins/liquids.rst
+++ b/docs/plugins/liquids.rst
@@ -2,9 +2,13 @@
 
 liquids
 =======
-**Tags:** `tag/adventure`, `tag/fort`, `tag/armok`, `tag/map`
-:dfhack-keybind:`liquids`
-:dfhack-keybind:`liquids-here`
+
+.. dfhack-tool::
+    :summary: Place magma, water or obsidian.
+    :tags: adventure fort armok map
+
+.. dfhack-command:: liquids-here
+    :summary: Spawn liquids on the selected tile.
 
 Place magma, water or obsidian.  See `gui/liquids` for an in-game interface for
 this functionality.
diff --git a/docs/plugins/luasocket.rst b/docs/plugins/luasocket.rst
index cbbf09f7e..24b30c7a6 100644
--- a/docs/plugins/luasocket.rst
+++ b/docs/plugins/luasocket.rst
@@ -1,7 +1,9 @@
 luasocket
 =========
-**Tags:** `tag/dev`, `tag/mod`
 
-Provides a Lua API for accessing network sockets.
+.. dfhack-tool::
+    :summary: Provides a Lua API for accessing network sockets.
+    :tags: dev mod
+    :no-command:
 
 See `luasocket-api` for details.
diff --git a/docs/plugins/manipulator.rst b/docs/plugins/manipulator.rst
index 07d1d4ab6..26223587d 100644
--- a/docs/plugins/manipulator.rst
+++ b/docs/plugins/manipulator.rst
@@ -1,9 +1,12 @@
 manipulator
 ===========
-**Tags:** `tag/fort`, `tag/productivity`, `tag/interface`, `tag/labors`
 
-An in-game labor management interface. It is equivalent to the popular Dwarf
-Therapist utility.
+.. dfhack-tool::
+    :summary: An in-game labor management interface.
+    :tags: fort productivity interface labors
+    :no-command:
+
+It is equivalent to the popular Dwarf Therapist utility.
 
 To activate, open the unit screen and press :kbd:`l`.
 
diff --git a/docs/plugins/map-render.rst b/docs/plugins/map-render.rst
index 6b7f1a5d9..7754af8b7 100644
--- a/docs/plugins/map-render.rst
+++ b/docs/plugins/map-render.rst
@@ -1,7 +1,9 @@
 map-render
 ==========
-**Tags:** `tag/dev`
 
-Provides a Lua API for rerendering portions of the map.
+.. dfhack-tool::
+    :summary: Provides a Lua API for rerendering portions of the map.
+    :tags: dev
+    :no-command:
 
 See `map-render-api` for details.
diff --git a/docs/plugins/misery.rst b/docs/plugins/misery.rst
index 5d11f98cb..af71ae19a 100644
--- a/docs/plugins/misery.rst
+++ b/docs/plugins/misery.rst
@@ -1,9 +1,9 @@
 misery
 ======
-**Tags:** `tag/fort`, `tag/armok`, `tag/units`
-:dfhack-keybind:`misery`
 
-Increase the intensity of negative dwarven thoughts.
+.. dfhack-tool::
+    :summary: Increase the intensity of negative dwarven thoughts.
+    :tags: fort armok units
 
 When enabled, negative thoughts that your dwarves have will multiply by the
 specified factor.
diff --git a/docs/plugins/mode.rst b/docs/plugins/mode.rst
index 8c33d6ec3..db94e6bac 100644
--- a/docs/plugins/mode.rst
+++ b/docs/plugins/mode.rst
@@ -1,9 +1,9 @@
 mode
 ====
-**Tags:** `tag/dev`
-:dfhack-keybind:`mode`
 
-This command lets you see and change the game mode directly.
+.. dfhack-tool::
+    :summary: See and change the game mode.
+    :tags: dev
 
 .. warning::
 
diff --git a/docs/plugins/mousequery.rst b/docs/plugins/mousequery.rst
index 7e01de6d0..eb6550d60 100644
--- a/docs/plugins/mousequery.rst
+++ b/docs/plugins/mousequery.rst
@@ -1,7 +1,9 @@
 mousequery
 ==========
-**Tags:** `tag/fort`, `tag/productivity`, `tag/interface`
-:dfhack-keybind:`mousequery`
+
+.. dfhack-tool::
+    :summary: Adds mouse controls to the DF interface.
+    :tags: fort productivity interface
 
 Adds mouse controls to the DF interface. For example, with ``mousequery`` you
 can click on buildings to configure them, hold the mouse button to draw dig
diff --git a/docs/plugins/nestboxes.rst b/docs/plugins/nestboxes.rst
index 1558a7357..9182eee09 100644
--- a/docs/plugins/nestboxes.rst
+++ b/docs/plugins/nestboxes.rst
@@ -1,11 +1,14 @@
 nestboxes
 =========
-**Tags:** `tag/fort`, `tag/auto`, `tag/animals`
 
-Protect fertile eggs incubating in a nestbox. This plugin will automatically
-scan for and forbid fertile eggs incubating in a nestbox so that dwarves won't
-come to collect them for eating. The eggs will hatch normally, even when
-forbidden.
+.. dfhack-tool::
+    :summary: Protect fertile eggs incubating in a nestbox.
+    :tags: fort auto animals
+    :no-command:
+
+This plugin will automatically scan for and forbid fertile eggs incubating in a
+nestbox so that dwarves won't come to collect them for eating. The eggs will
+hatch normally, even when forbidden.
 
 Usage::
 
diff --git a/docs/plugins/orders.rst b/docs/plugins/orders.rst
index 3be1f82b2..9403c6c8e 100644
--- a/docs/plugins/orders.rst
+++ b/docs/plugins/orders.rst
@@ -1,9 +1,9 @@
 orders
 ======
-**Tags:** `tag/fort`, `tag/productivity`, `tag/jobs`
-:dfhack-keybind:`orders`
 
-Manage manager orders.
+.. dfhack-tool::
+    :summary: Manage manager orders.
+    :tags: fort productivity jobs
 
 Usage:
 
diff --git a/docs/plugins/pathable.rst b/docs/plugins/pathable.rst
index 6368d1c7e..800580017 100644
--- a/docs/plugins/pathable.rst
+++ b/docs/plugins/pathable.rst
@@ -1,8 +1,10 @@
 pathable
 ========
-**Tags:** `tag/dev`, `tag/inspection`, `tag/interface`, `tag/map`
 
-Marks tiles that are reachable from the cursor. This plugin provides a Lua API,
-but no direct commands.
+.. dfhack-tool::
+    :summary: Marks tiles that are reachable from the cursor.
+    :tags: dev inspection interface map
+    :no-command:
 
-See `pathable-api` for details.
+This plugin provides a Lua API, but no direct commands. See `pathable-api` for
+details.
diff --git a/docs/plugins/petcapRemover.rst b/docs/plugins/petcapRemover.rst
index 95a9e60bd..f3d011308 100644
--- a/docs/plugins/petcapRemover.rst
+++ b/docs/plugins/petcapRemover.rst
@@ -1,16 +1,17 @@
 petcapRemover
 =============
-**Tags:** `tag/fort`, `tag/armok`, `tag/animals`
-:dfhack-keybind:`petcapRemover`
 
-Modify the pet population cap. In vanilla DF, pets will not reproduce unless the
-population is below 50 and the number of children of that species is below a
-certain percentage. This plugin allows removing these restrictions and setting
-your own thresholds. Pets still require PET or PET_EXOTIC tags in order to
-reproduce. In order to make population more stable and avoid sudden population
-booms as you go below the raised population cap, this plugin counts pregnancies
-toward the new population cap. It can still go over, but only in the case of
-multiple births.
+.. dfhack-tool::
+    :summary: Modify the pet population cap.
+    :tags: fort armok animals
+
+In vanilla DF, pets will not reproduce unless the population is below 50 and the
+number of children of that species is below a certain percentage. This plugin
+allows removing these restrictions and setting your own thresholds. Pets still
+require PET or PET_EXOTIC tags in order to reproduce. In order to make
+population more stable and avoid sudden population booms as you go below the
+raised population cap, this plugin counts pregnancies toward the new population
+cap. It can still go over, but only in the case of multiple births.
 
 Usage:
 
diff --git a/docs/plugins/plants.rst b/docs/plugins/plants.rst
index 2021bc103..d28119af9 100644
--- a/docs/plugins/plants.rst
+++ b/docs/plugins/plants.rst
@@ -2,10 +2,14 @@
 
 plants
 ======
-**Tags:** `tag/adventure`, `tag/fort`, `tag/armok`, `tag/map`
-:dfhack-keybind:`plant`
 
-Grow shrubs or trees.
+.. dfhack-tool::
+    :summary: Provides commands that interact with plants.
+    :tags: adventure fort armok map
+    :no-command:
+
+.. dfhack-command:: plant
+   :summary: Create a plant or make an existing plant grow up.
 
 Usage:
 
diff --git a/docs/plugins/power-meter.rst b/docs/plugins/power-meter.rst
index 72a49b72c..01e75491a 100644
--- a/docs/plugins/power-meter.rst
+++ b/docs/plugins/power-meter.rst
@@ -1,7 +1,11 @@
 power-meter
 ===========
-**Tags:** `tag/fort`, `tag/mod`, `tag/buildings`
 
-Allow presure plates to measure power. If you run `gui/power-meter` while
-building a pressure plate, the pressure plate can be modified to detect power
-being supplied to gear boxes built in the four adjacent N/S/W/E tiles.
+.. dfhack-tool::
+    :summary: Allow presure plates to measure power.
+    :tags: fort mod buildings
+    :no-command:
+
+If you run `gui/power-meter` while building a pressure plate, the pressure
+plate can be modified to detect power being supplied to gear boxes built in the
+four adjacent N/S/W/E tiles.
diff --git a/docs/plugins/probe.rst b/docs/plugins/probe.rst
index 0285bb821..54436be68 100644
--- a/docs/plugins/probe.rst
+++ b/docs/plugins/probe.rst
@@ -1,11 +1,15 @@
 probe
 =====
-**Tags:** `tag/adventure`, `tag/fort`, `tag/inspection`, `tag/map`
-:dfhack-keybind:`probe`
-:dfhack-keybind:`bprobe`
-:dfhack-keybind:`cprobe`
 
-Display low-level properties of selected objects.
+.. dfhack-tool::
+    :summary: Display low-level properties of the selected tile.
+    :tags: adventure fort inspection map
+
+.. dfhack-command:: bprobe
+    :summary: Display low-level properties of the selected building.
+
+.. dfhack-command:: cprobe
+    :summary: Display low-level properties of the selected unit.
 
 Usage:
 
diff --git a/docs/plugins/prospector.rst b/docs/plugins/prospector.rst
index 7ff3b4313..dc6204c06 100644
--- a/docs/plugins/prospector.rst
+++ b/docs/plugins/prospector.rst
@@ -2,11 +2,17 @@
 
 prospector
 ==========
-**Tags:** `tag/fort`, `tag/embark`, `tag/inspection`, `tag/map`
-:dfhack-keybind:`prospect`
 
-Shows a summary of resources that exist on the map. It can also calculate an
-estimate of resources available in the selected embark area.
+.. dfhack-tool::
+    :summary: Provides commands that help you analyze natural resources.
+    :tags: fort embark inspection map
+    :no-command:
+
+.. dfhack-command:: prospect
+   :summary: Shows a summary of resources that exist on the map.
+
+It can also calculate an estimate of resources available in the selected embark
+area.
 
 Usage::
 
diff --git a/docs/plugins/regrass.rst b/docs/plugins/regrass.rst
index 98590a73e..72f077fcd 100644
--- a/docs/plugins/regrass.rst
+++ b/docs/plugins/regrass.rst
@@ -1,14 +1,15 @@
 regrass
 =======
-**Tags:** `tag/adventure`, `tag/fort`, `tag/armok`, `tag/animals`
-:dfhack-keybind:`regrass`
 
-Regrows all the grass. Use this command if your grazers have eaten everything
-down to the dirt.
+.. dfhack-tool::
+    :summary: Regrows all the grass.
+    :tags: adventure fort armok animals
+
+Use this command if your grazers have eaten everything down to the dirt.
 
 Usage::
 
     regrass [max]
 
-Specify the 'max' option to pack more grass onto a tile than what the game
+Specify the 'max' keyword to pack more grass onto a tile than what the game
 normally allows to give your grazers extra chewing time.
diff --git a/docs/plugins/rename.rst b/docs/plugins/rename.rst
index 34695e19a..02bc04c2c 100644
--- a/docs/plugins/rename.rst
+++ b/docs/plugins/rename.rst
@@ -1,9 +1,11 @@
 rename
 ======
-**Tags:** `tag/adventure`, `tag/fort`, `tag/productivity`
-:dfhack-keybind:`rename`
 
-Easily rename things.  Use `gui/rename` for an in-game interface.
+.. dfhack-tool::
+    :summary: Easily rename things.
+    :tags: adventure fort productivity
+
+Use `gui/rename` for an in-game interface.
 
 Usage:
 
diff --git a/docs/plugins/rendermax.rst b/docs/plugins/rendermax.rst
index 83e9ee461..680676fa3 100644
--- a/docs/plugins/rendermax.rst
+++ b/docs/plugins/rendermax.rst
@@ -1,10 +1,12 @@
 rendermax
 =========
-**Tags:** `tag/adventure`, `tag/fort`, `tag/mod`
-:dfhack-keybind:`rendermax`
 
-Modify the map lighting. This plugin provides a collection of OpenGL lighting
-filters that affect how the map is drawn to the screen.
+.. dfhack-tool::
+    :summary: Modify the map lighting.
+    :tags: adventure fort mod
+
+This plugin provides a collection of OpenGL lighting filters that affect how the
+map is drawn to the screen.
 
 Usage:
 
diff --git a/docs/plugins/resume.rst b/docs/plugins/resume.rst
index 2f28d7083..0713026e4 100644
--- a/docs/plugins/resume.rst
+++ b/docs/plugins/resume.rst
@@ -1,13 +1,18 @@
 resume
 ======
-**Tags:** `tag/fort`, `tag/productivity`
-:dfhack-keybind:`resume`
-
-Color planned buildings based on their suspend status. When enabled, this plugin
-will display a colored 'X' over suspended buildings. When run as a command, it
-can resume all suspended building jobs, allowing you to quickly recover if a
-bunch of jobs were suspended due to the workers getting scared off by wildlife
-or items temporarily blocking buildling sites.
+
+.. dfhack-tool::
+    :summary: Color planned buildings based on their suspend status.
+    :tags: fort productivity
+    :no-command:
+
+.. dfhack-command:: resume
+   :summary: Resume all suspended building jobs.
+
+When enabled, this plugin will display a colored 'X' over suspended buildings.
+When run as a command, it can resume all suspended building jobs, allowing you
+to quickly recover if a bunch of jobs were suspended due to the workers getting
+scared off by wildlife or items temporarily blocking buildling sites.
 
 Usage::
 
diff --git a/docs/plugins/reveal.rst b/docs/plugins/reveal.rst
index fb69d9a02..122280a1e 100644
--- a/docs/plugins/reveal.rst
+++ b/docs/plugins/reveal.rst
@@ -2,17 +2,29 @@
 
 reveal
 ======
-**Tags:** `tag/adventure`, `tag/fort`, `tag/inspection`, `tag/armok`, `tag/map`
-:dfhack-keybind:`reveal`
-:dfhack-keybind:`unreveal`
-:dfhack-keybind:`revforget`
-:dfhack-keybind:`revtoggle`
-:dfhack-keybind:`revflood`
-:dfhack-keybind:`nopause`
-
-Reveals the map. This reveals all z-layers in fort mode. It also works in
-adventure mode, but any of its effects are negated once you move. When you use
-it this way, you don't need to run ``unreveal`` to hide the map again.
+
+.. dfhack-tool::
+    :summary: Reveals the map.
+    :tags: adventure fort inspection armok map
+
+.. dfhack-tool:: unreveal
+   :summary: Hides previously hidden tiles again.
+
+.. dfhack-tool:: revforget
+   :summary: Discard records about what was visible before revealing the map.
+
+.. dfhack-tool:: revtoggle
+   :summary: Switch between reveal and unreveal.
+
+.. dfhack-tool:: revflood
+   :summary: Hide everything, then reveal tiles with a path to the cursor.
+
+.. dfhack-tool:: nopause
+   :summary: Disable pausing.
+
+This reveals all z-layers in fort mode. It also works in adventure mode, but any
+of its effects are negated once you move. When you use it this way, you don't
+need to run ``unreveal`` to hide the map again.
 
 Usage:
 
diff --git a/docs/plugins/ruby.rst b/docs/plugins/ruby.rst
index d3b89d3a9..f808735d4 100644
--- a/docs/plugins/ruby.rst
+++ b/docs/plugins/ruby.rst
@@ -2,12 +2,17 @@
 
 ruby
 ====
-**Tags:** `tag/dev`
-:dfhack-keybind:`rb`
-:dfhack-keybind:`rb_eval`
 
-Allow Ruby scripts to be executed. When invoked as a command, you can Eval() a
-ruby string.
+.. dfhack-tool::
+    :summary: Allow Ruby scripts to be executed as DFHack commands.
+    :tags: dev
+    :no-command:
+
+.. dfhack-command:: rb
+   :summary: Eval() a ruby string.
+
+.. dfhack-command:: rb_eval
+   :summary: Eval() a ruby string.
 
 Usage::
 
diff --git a/docs/plugins/search.rst b/docs/plugins/search.rst
index 41ae1c922..937e09885 100644
--- a/docs/plugins/search.rst
+++ b/docs/plugins/search.rst
@@ -2,12 +2,16 @@
 
 search
 ======
-**Tags:** `tag/fort`, `tag/productivity`, `tag/interface`
 
-Adds search capabilities to the UI. The Stocks, Animals, Trading, Stockpile,
-Noble (assignment candidates), Military (position candidates), Burrows (unit
-list), Rooms, Announcements, Job List, and Unit List screens all get hotkeys
-that allow you to dynamically filter the displayed lists.
+.. dfhack-tool::
+    :summary: Adds search capabilities to the UI.
+    :tags: fort productivity interface
+    :no-command:
+
+Search options are added to the Stocks, Animals, Trading, Stockpile, Noble
+aassignment candidates), Military (position candidates), Burrows (unit list),
+Rooms, Announcements, Job List, and Unit List screens all get hotkeys that allow
+you to dynamically filter the displayed lists.
 
 Usage::
 
diff --git a/docs/plugins/seedwatch.rst b/docs/plugins/seedwatch.rst
index bd51fdd2e..1aaa04ee3 100644
--- a/docs/plugins/seedwatch.rst
+++ b/docs/plugins/seedwatch.rst
@@ -1,9 +1,9 @@
 seedwatch
 =========
-**Tags:** `tag/fort`, `tag/auto`
-:dfhack-keybind:`seedwatch`
 
-Manages seed and plant cooking based on seed stock levels.
+.. dfhack-tool::
+    :summary: Manages seed and plant cooking based on seed stock levels.
+    :tags: fort auto
 
 Each seed type can be assigned a target. If the number of seeds of that type
 falls below that target, then the plants and seeds of that type will be excluded
diff --git a/docs/plugins/showmood.rst b/docs/plugins/showmood.rst
index 42af0e7a8..da67b5803 100644
--- a/docs/plugins/showmood.rst
+++ b/docs/plugins/showmood.rst
@@ -1,9 +1,9 @@
 showmood
 ========
-**Tags:** `tag/fort`, `tag/inspection`, `tag/jobs`
-:dfhack-keybind:`showmood`
 
-Shows all items needed for the active strange mood.
+.. dfhack-tool::
+    :summary: Shows all items needed for the active strange mood.
+    :tags: fort inspection jobs
 
 Usage::
 
diff --git a/docs/plugins/siege-engine.rst b/docs/plugins/siege-engine.rst
index 9255110bd..06ff963b7 100644
--- a/docs/plugins/siege-engine.rst
+++ b/docs/plugins/siege-engine.rst
@@ -1,10 +1,13 @@
 siege-engine
 ============
-**Tags:** `tag/fort`, `tag/mod`, `tag/buildings`
 
-Extend the functionality and usability of siege engines. Siege engines in DF
-haven't been updated since the game was 2D, and can only aim in four
-directions. To make them useful above-ground, this plugin allows you to:
+.. dfhack-tool::
+    :summary: Extend the functionality and usability of siege engines.
+    :tags: fort mod buildings
+    :no-command:
+
+Siege engines in DF haven't been updated since the game was 2D, and can only aim
+in four directions. To make them useful above-ground, this plugin allows you to:
 
 * link siege engines to stockpiles
 * restrict operator skill levels (like workshops)
diff --git a/docs/plugins/sort.rst b/docs/plugins/sort.rst
index f3ba6e6fb..c746f1c79 100644
--- a/docs/plugins/sort.rst
+++ b/docs/plugins/sort.rst
@@ -1,10 +1,16 @@
 sort
 ====
-**Tags:** `tag/fort`, `tag/productivity`, `tag/interface`
-:dfhack-keybind:`sort-items`
-:dfhack-keybind:`sort-units`
 
-Sort the visible item or unit list.
+.. dfhack-tool::
+    :summary: Sort lists shown in the DF interface.
+    :tags: fort productivity interface
+    :no-command:
+
+.. dfhack-command:: sort-items
+   :summary: Sort the visible item list.
+
+.. dfhack-command:: sort-units
+   :summary: Sort the visible unit list.
 
 Usage::
 
diff --git a/docs/plugins/spectate.rst b/docs/plugins/spectate.rst
index 08cc3f819..7f448ebfb 100644
--- a/docs/plugins/spectate.rst
+++ b/docs/plugins/spectate.rst
@@ -1,8 +1,10 @@
 spectate
 ========
-**Tags:** `tag/fort`, `tag/units`
 
-Automatically follow exciting dwarves.
+.. dfhack-tool::
+    :summary: Automatically follow exciting dwarves.
+    :tags: fort units
+    :no-command:
 
 Usage::
 
diff --git a/docs/plugins/steam-engine.rst b/docs/plugins/steam-engine.rst
index 0fe245d63..e0f938915 100644
--- a/docs/plugins/steam-engine.rst
+++ b/docs/plugins/steam-engine.rst
@@ -1,10 +1,13 @@
 steam-engine
 ============
-**Tags:** `tag/fort`, `tag/mod`, `tag/buildings`
 
-Allow modded steam engine buildings to function. The steam-engine plugin detects
-custom workshops with STEAM_ENGINE in their token, and turns them into real
-steam engines!
+.. dfhack-tool::
+    :summary: Allow modded steam engine buildings to function.
+    :tags: fort mod buildings
+    :no-command:
+
+The steam-engine plugin detects custom workshops with the string
+``STEAM_ENGINE`` in their token, and turns them into real steam engines!
 
 The plugin auto-enables itself when it detects the relevant tags in the world
 raws. It does not need to be enabled with the `enable` command.
diff --git a/docs/plugins/stockflow.rst b/docs/plugins/stockflow.rst
index 48647b869..81eab07ff 100644
--- a/docs/plugins/stockflow.rst
+++ b/docs/plugins/stockflow.rst
@@ -1,11 +1,13 @@
 stockflow
 =========
-**Tags:** `tag/fort`, `tag/auto`, `tag/jobs`, `tag/stockpiles`
-:dfhack-keybind:`stockflow`
 
-Queue manager jobs based on free space in stockpiles. With this plugin, the
-fortress bookkeeper can tally up free space in specific stockpiles and queue
-jobs through the manager to produce items to fill the free space.
+.. dfhack-tool::
+    :summary: Queue manager jobs based on free space in stockpiles.
+    :tags: fort auto jobs stockpiles
+
+With this plugin, the fortress bookkeeper can tally up free space in specific
+stockpiles and queue jobs through the manager to produce items to fill the free
+space.
 
 When the plugin is enabled, the :kbd:`q` menu of each stockpile will have two
 new options:
diff --git a/docs/plugins/stockpiles.rst b/docs/plugins/stockpiles.rst
index 0c1000456..0e30b9dc7 100644
--- a/docs/plugins/stockpiles.rst
+++ b/docs/plugins/stockpiles.rst
@@ -2,14 +2,24 @@
 
 stockpiles
 ==========
-**Tags:** `tag/fort`, `tag/productivity`, `tag/design`, `tag/stockpiles`
-:dfhack-keybind:`copystock`
-:dfhack-keybind:`savestock`
-:dfhack-keybind:`loadstock`
-
-Import and export stockpile settings. When the plugin is enabled, the :kbd:`q`
-menu of each stockpile will have an option for saving or loading the stockpile
-settings. See `gui/stockpiles` for an in-game interface.
+
+.. dfhack-tool::
+    :summary: Import and export stockpile settings.
+    :tags: fort productivity design stockpiles
+    :no-command:
+
+.. dfhack-command:: copystock
+   :summary: Copies the configuration of the selected stockpile.
+
+.. dfhack-command:: savestock
+   :summary: Exports the configuration of the selected stockpile.
+
+.. dfhack-command:: loadstock
+   :summary: Imports the configuration of the selected stockpile.
+
+When the plugin is enabled, the :kbd:`q` menu of each stockpile will have an
+option for saving or loading the stockpile settings. See `gui/stockpiles` for
+an in-game interface.
 
 Usage:
 
diff --git a/docs/plugins/stocks.rst b/docs/plugins/stocks.rst
index 5506b1d28..e518fc1f1 100644
--- a/docs/plugins/stocks.rst
+++ b/docs/plugins/stocks.rst
@@ -1,10 +1,11 @@
 stocks
 ======
-**Tags:** `tag/fort`, `tag/productivity`, `tag/interface`
-:dfhack-keybind:`stocks`
 
-Enhanced fortress stock management interface. When the plugin is enabled, two
-new hotkeys become available:
+.. dfhack-tool::
+    :summary: Enhanced fortress stock management interface.
+    :tags: fort productivity interface
+
+When the plugin is enabled, two new hotkeys become available:
 
 * :kbd:`e` on the vanilla DF stocks screen (:kbd:`z` and then select Stocks)
   will launch the fortress-wide stock management screen.
diff --git a/docs/plugins/stonesense.rst b/docs/plugins/stonesense.rst
index 3bb271477..0315c92ed 100644
--- a/docs/plugins/stonesense.rst
+++ b/docs/plugins/stonesense.rst
@@ -1,10 +1,12 @@
 stonesense
 ==========
-**Tags:** `tag/adventure`, `tag/fort`, `tag/interface`, `tag/map`
-:dfhack-keybind:`stonesense`
-:dfhack-keybind:`ssense`
 
-A 3D isometric visualizer that runs in a second window.
+.. dfhack-tool::
+    :summary: A 3D isometric visualizer.
+    :tags: adventure fort interface map
+
+.. dfhack-command:: ssense
+   :summary: An alias for stonesense.
 
 Usage:
 
diff --git a/docs/plugins/strangemood.rst b/docs/plugins/strangemood.rst
index 0198af136..8d1fc8081 100644
--- a/docs/plugins/strangemood.rst
+++ b/docs/plugins/strangemood.rst
@@ -1,9 +1,9 @@
 strangemood
 ===========
-**Tags:** `tag/fort`, `tag/armok`, `tag/units`
-:dfhack-keybind:`strangemood`
 
-Triggers a strange mood.
+.. dfhack-tool::
+    :summary: Trigger a strange mood.
+    :tags: fort armok units
 
 Usage::
 
diff --git a/docs/plugins/tailor.rst b/docs/plugins/tailor.rst
index 93072fb1b..5da293fbf 100644
--- a/docs/plugins/tailor.rst
+++ b/docs/plugins/tailor.rst
@@ -1,13 +1,14 @@
 tailor
 ======
-**Tags:** `tag/fort`, `tag/auto`, `tag/jobs`
-:dfhack-keybind:`tailor`
-
-Automatically keep your dwarves in fresh clothing. Whenever the bookkeeper
-updates stockpile records, this plugin will scan the fort. If there are
-fresh cloths available, dwarves who are wearing tattered clothing will have
-their rags confiscated (in the same manner as the `cleanowned` tool) so that
-they'll reequip with replacement clothes.
+
+.. dfhack-tool::
+    :summary: Automatically keep your dwarves in fresh clothing.
+    :tags: fort auto jobs
+
+Whenever the bookkeeper updates stockpile records, this plugin will scan the
+fort. If there are fresh cloths available, dwarves who are wearing tattered
+clothing will have their rags confiscated (in the same manner as the
+`cleanowned` tool) so that they'll reequip with replacement clothes.
 
 If there are not enough clothes available, manager orders will be generated
 to manufacture some more. ``tailor`` will intelligently create orders using
diff --git a/docs/plugins/tiletypes.rst b/docs/plugins/tiletypes.rst
index 185f283db..ee3d4a02f 100644
--- a/docs/plugins/tiletypes.rst
+++ b/docs/plugins/tiletypes.rst
@@ -3,15 +3,23 @@
 
 tiletypes
 =========
-**Tags:** `tag/adventure`, `tag/fort`, `tag/armok`, `tag/map`
-:dfhack-keybind:`tiletypes`
-:dfhack-keybind:`tiletypes-command`
-:dfhack-keybind:`tiletypes-here`
-:dfhack-keybind:`tiletypes-here-point`
-
-Paints tiles of specified types onto the map. You can use the `probe` command
-to discover properties of existing tiles that you'd like to copy. If you
-accidentally paint over a vein that you want back, `fixveins` may help.
+
+.. dfhack-tool::
+    :summary: Paints tiles of specified types onto the map.
+    :tags: adventure fort armok map
+
+.. dfhack-command:: tiletypes-command
+   :summary: Run tiletypes commands.
+
+.. dfhack-command:: tiletypes-here
+   :summary: Paint map tiles starting from the cursor.
+
+.. dfhack-command:: tiletypes-here-point
+   :summary: Paint the map tile under the cursor.
+
+You can use the `probe` command to discover properties of existing tiles that
+you'd like to copy. If you accidentally paint over a vein that you want back,
+`fixveins` may help.
 
 The tool works with a brush, a filter, and a paint specification. The brush
 determines the shape of the area to affect, the filter selects which tiles to
diff --git a/docs/plugins/title-folder.rst b/docs/plugins/title-folder.rst
index beddfc9cb..56de7d769 100644
--- a/docs/plugins/title-folder.rst
+++ b/docs/plugins/title-folder.rst
@@ -1,8 +1,10 @@
 title-folder
 =============
-**Tags:** `tag/system`, `tag/interface`
 
-Displays the DF folder name in the window title bar.
+.. dfhack-tool::
+    :summary: Displays the DF folder name in the window title bar.
+    :tags: system interface
+    :no-command:
 
 Usage::
 
diff --git a/docs/plugins/title-version.rst b/docs/plugins/title-version.rst
index d9d35a85f..f7fc238c7 100644
--- a/docs/plugins/title-version.rst
+++ b/docs/plugins/title-version.rst
@@ -1,8 +1,10 @@
 title-version
 =============
-**Tags:** `tag/system`, `tag/interface`
 
-Displays the DFHack version on DF's title screen.
+.. dfhack-tool::
+    :summary: Displays the DFHack version on DF's title screen.
+    :tags: system interface
+    :no-command:
 
 Usage::
 
diff --git a/docs/plugins/trackstop.rst b/docs/plugins/trackstop.rst
index cf5a9853f..65aae2b7f 100644
--- a/docs/plugins/trackstop.rst
+++ b/docs/plugins/trackstop.rst
@@ -1,11 +1,15 @@
 trackstop
 =========
-**Tags:** `tag/fort`, `tag/interface`, `tag/mod`, `tag/buildings`
 
-Adds dynamic configuration options for track stops. When enabled, this plugin
-adds a :kbd:`q` menu for track stops, which is completely blank in vanilla DF.
-This allows you to view and/or change the track stop's friction and dump
-direction settings, using the keybindings from the track stop building interface.
+.. dfhack-tool::
+    :summary: Add dynamic configuration options for track stops.
+    :tags: fort interface mod buildings
+    :no-command:
+
+When enabled, this plugin adds a :kbd:`q` menu for track stops, which is
+completely blank in vanilla DF. This allows you to view and/or change the track
+stop's friction and dump direction settings, using the keybindings from the
+track stop building interface.
 
 Usage::
 
diff --git a/docs/plugins/tubefill.rst b/docs/plugins/tubefill.rst
index 404a180b2..865e4341d 100644
--- a/docs/plugins/tubefill.rst
+++ b/docs/plugins/tubefill.rst
@@ -1,9 +1,11 @@
 tubefill
 ========
-**Tags:** `tag/fort`, `tag/armok`, `tag/map`
-:dfhack-keybind:`tubefill`
 
-Replentishes mined-out adamantine. Veins that were hollow will be left alone.
+.. dfhack-tool::
+    :summary: Replentishes mined-out adamantine.
+    :tags: fort armok map
+
+Veins that were originally hollow will be left alone.
 
 Usage::
 
diff --git a/docs/plugins/tweak.rst b/docs/plugins/tweak.rst
index 03489845e..71b564434 100644
--- a/docs/plugins/tweak.rst
+++ b/docs/plugins/tweak.rst
@@ -1,9 +1,9 @@
 tweak
 =====
-**Tags:** `tag/adventure`, `tag/fort`, `tag/interface`, `tag/fps`, `tag/fix`, `tag/armok`
-:dfhack-keybind:`tweak`
 
-Contains various tweaks for minor bugs.
+.. dfhack-tool::
+    :summary: A collection of tweaks and bugfixes.
+    :tags: adventure fort interface fps fix armok
 
 Usage::
 
diff --git a/docs/plugins/workNow.rst b/docs/plugins/workNow.rst
index 895556ce3..678649487 100644
--- a/docs/plugins/workNow.rst
+++ b/docs/plugins/workNow.rst
@@ -1,11 +1,13 @@
 workNow
 =======
-**Tags:** `tag/fort`, `tag/auto`, `tag/jobs`
-:dfhack-keybind:`workNow`
 
-Reduce the time that dwarves idle after completing a job. After finishing a job,
-dwarves will wander away for a while before picking up a new job. This plugin
-will automatically poke the game to assign dwarves to new tasks.
+.. dfhack-tool::
+    :summary: Reduce the time that dwarves idle after completing a job.
+    :tags: fort auto jobs
+
+After finishing a job, dwarves will wander away for a while before picking up a
+new job. This plugin will automatically poke the game to assign dwarves to new
+tasks.
 
 Usage:
 
diff --git a/docs/plugins/workflow.rst b/docs/plugins/workflow.rst
index c2a9ea26a..db615c876 100644
--- a/docs/plugins/workflow.rst
+++ b/docs/plugins/workflow.rst
@@ -1,8 +1,12 @@
 workflow
 ========
-**Tags:** `tag/fort`, `tag/auto`, `tag/jobs`
-:dfhack-keybind:`workflow`
-:dfhack-keybind:`fix-job-postings`
+
+.. dfhack-tool::
+    :summary: Manage repeat jobs according to stock levels.
+    :tags: fort auto jobs
+
+.. dfhack-command:: fix-job-postings
+   :summary: Fixes crashes caused by old versions of workflow.
 
 Manage repeat jobs according to stock levels. `gui/workflow` provides a simple
 front-end integrated in the game UI.
@@ -55,7 +59,7 @@ Usage:
     can be copied to a file, and then reloaded using the `script` built-in
     command.
 ``fix-job-postings [dry-run]``
-    Fixes crashes caused the version of workflow released with DFHack
+    Fixes crashes caused by the version of workflow released with DFHack
     0.40.24-r4. It will be run automatically if needed. If your save has never
     been run with this version, you will never need this command. Specify the
     ``dry-run`` keyword to see what this command would do without making any
diff --git a/docs/plugins/xlsxreader.rst b/docs/plugins/xlsxreader.rst
index 123d9920a..3d6cc0ac8 100644
--- a/docs/plugins/xlsxreader.rst
+++ b/docs/plugins/xlsxreader.rst
@@ -1,7 +1,9 @@
 xlsxreader
 ==========
-**Tags:** `tag/dev`
 
-Provides a Lua API for reading xlsx files.
+.. dfhack-tool::
+    :summary: Provides a Lua API for reading xlsx files.
+    :tags: dev
+    :no-command:
 
 See `xlsxreader-api` for details.
diff --git a/docs/plugins/zone.rst b/docs/plugins/zone.rst
index 9aa34d746..bf9428a6c 100644
--- a/docs/plugins/zone.rst
+++ b/docs/plugins/zone.rst
@@ -1,9 +1,9 @@
 zone
 ====
-**Tags:** `tag/fort`, `tag/productivity`, `tag/animals`, `tag/buildings`
-:dfhack-keybind:`zone`
 
-Manage activity zones, cages, and the animals therein.
+.. dfhack-tool::
+    :summary: Manage activity zones, cages, and the animals therein.
+    :tags: fort productivity animals buildings
 
 Usage:
 
diff --git a/docs/sphinx_extensions/dfhack/tool_docs.py b/docs/sphinx_extensions/dfhack/tool_docs.py
index ff4bfc9b1..a051b76af 100644
--- a/docs/sphinx_extensions/dfhack/tool_docs.py
+++ b/docs/sphinx_extensions/dfhack/tool_docs.py
@@ -117,6 +117,7 @@ class DFHackToolDirective(DFHackToolDirectiveBase):
     option_spec = {
         'tags': dfhack.util.directive_arg_str_list,
         'no-command': rst_directives.flag,
+        'summary': rst_directives.unchanged,
     }
 
     def render_content(self) -> List[nodes.Node]:
@@ -134,9 +135,12 @@ class DFHackToolDirective(DFHackToolDirectiveBase):
             ]
         tag_nodes.pop()
 
-        return [
+        ret_nodes = [
             nodes.paragraph('', '', *tag_nodes),
         ]
+        if 'no-command' in self.options:
+            ret_nodes += [nodes.inline(text=self.options.get('summary', ''))]
+        return ret_nodes
 
     def run(self):
         out = DFHackToolDirectiveBase.run(self)
@@ -146,10 +150,15 @@ class DFHackToolDirective(DFHackToolDirectiveBase):
 
 
 class DFHackCommandDirective(DFHackToolDirectiveBase):
+    option_spec = {
+        'summary': rst_directives.unchanged_required,
+    }
+
     def render_content(self) -> List[nodes.Node]:
         command = self.get_name_or_docname()
         return [
             self.make_labeled_paragraph('Command', command, content_class=nodes.literal),
+            nodes.inline(text=self.options.get('summary', '')),
             *render_dfhack_keybind(command),
         ]
 

From a01114a41bbe6cb19edb88bcd566c32dbecd2f62 Mon Sep 17 00:00:00 2001
From: DFHack-Urist via GitHub Actions
 <63161697+DFHack-Urist@users.noreply.github.com>
Date: Sat, 13 Aug 2022 07:17:18 +0000
Subject: [PATCH 479/854] Auto-update submodules

scripts: master
---
 scripts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts b/scripts
index f37c0d022..4c7eecb5c 160000
--- a/scripts
+++ b/scripts
@@ -1 +1 @@
-Subproject commit f37c0d022135ca10fb5375c4e56e11215bf208ae
+Subproject commit 4c7eecb5cbeeead3c4374fafc562ee774e8e229e

From b21fc8aa75debfd8416eca92d0b7604b3f3fa698 Mon Sep 17 00:00:00 2001
From: Myk <myk002@yahoo.com>
Date: Sat, 13 Aug 2022 13:32:45 -0700
Subject: [PATCH 480/854] remove extra space at bottom of tool summary

---
 docs/styles/dfhack.css | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/docs/styles/dfhack.css b/docs/styles/dfhack.css
index 4102e6412..0fe608dde 100644
--- a/docs/styles/dfhack.css
+++ b/docs/styles/dfhack.css
@@ -71,3 +71,7 @@ div.dfhack-tool-summary p {
     margin-bottom: 0.5em;
     line-height: 1em;
 }
+
+div.dfhack-tool-summary p:last-child {
+   margin-bottom: 0;
+}

From f6699c0014dd231f8d2dc205183d9f5a0098dfc4 Mon Sep 17 00:00:00 2001
From: Myk <myk002@yahoo.com>
Date: Sat, 13 Aug 2022 13:40:14 -0700
Subject: [PATCH 481/854] Sync tags descriptions from spreadsheet

---
 docs/Tags.rst | 38 ++++++++++++++++++++------------------
 1 file changed, 20 insertions(+), 18 deletions(-)

diff --git a/docs/Tags.rst b/docs/Tags.rst
index d0c785c3c..96faf74e2 100644
--- a/docs/Tags.rst
+++ b/docs/Tags.rst
@@ -3,25 +3,27 @@
 - `tag/adventure`: Tools that are useful while in adventure mode. Note that some tools only tagged with "fort" might also work in adventure mode, but not always in expected ways. Feel free to experiment, though!
 - `tag/fort`: Tools that are useful while in fort mode.
 - `tag/legends`: Tools that are useful while in legends mode.
-- `tag/embark`: Tools that are useful while on the embark screen.
-- `tag/system`: Tools related to working with DFHack commands or the core DFHack library.
-- `tag/dev`: Tools useful for develpers and modders.
-- `tag/auto`: Tools that you turn on and then they automatically manage some aspect of your fortress.
+- `tag/embark`: Tools that are useful while on the fort embark screen or while creating an adventurer.
+- `tag/dev`: Tools that are useful when developing scripts or mods.
+- `tag/dfhack`: Tools that you use to run DFHack commands or interact with the DFHack library. This tag also includes tools that help you manage the DF game itself (e.g. settings, saving, etc.)
+- `tag/auto`: Tools that run in the background and automatically manage routine, toilsome aspects of your fortress.
 - `tag/productivity`: Tools that help you do things that you could do manually, but using the tool is better and faster.
-- `tag/inspection`: Tools that let you inspect game data.
+- `tag/inspection`: Tools that let you view information that is otherwise difficult to find.
 - `tag/design`: Tools that help you design your fort.
-- `tag/quickfort`: Tools that are involved in creating and playing back blueprints.
-- `tag/interface`: Tools that modify or extend the user interface.
+- `tag/gameplay`: Tools that introduce new gameplay elements.
 - `tag/fps`: Tools that help you manage FPS drop.
-- `tag/fix`: Tools that fix specific bugs.
-- `tag/mod`: Tools that introduce new gameplay elements.
-- `tag/armok`: Tools that give you complete control over various aspects of the game.
-- `tag/animals`: Tools that help you manage animals.
-- `tag/buildings`: Tools that help you work with placing or configuring buildings and furniture.
-- `tag/items`: Tools that create or modify in-game items.
-- `tag/jobs`: Tools that create or modify jobs.
-- `tag/map`: Map modification.
-- `tag/labors`: Tools that deal with labor assignment.
-- `tag/units`: Tools that create or modify units.
+- `tag/bugfix`: Tools that fix specific bugs, either permanently or on-demand.
+- `tag/armok`: Tools that give you complete control over an aspect of the game or provide access to information that the game intentionally keeps hidden.
+- `tag/animals`: Tools that interact with animals.
+- `tag/buildings`: Tools that interact with buildings and furniture.
 - `tag/stockpiles`: Tools that interact wtih stockpiles.
-- `tag/trees`: Tools that interact with trees and shrubs.
+- `tag/items`: Tools that interact with in-game items.
+- `tag/map`: Tools  that interact with the game map.
+- `tag/interface`: Tools that interact with or extend the DF user interface.
+- `tag/workorders`: Tools that interact with workorders.
+- `tag/jobs`: Tools that interact with jobs.
+- `tag/labors`: Tools that deal with labor assignment.
+- `tag/military`: Tools that interact with the military.
+- `tag/graphics`: Tools that interact with game graphics.
+- `tag/plants`: Tools that interact with trees, shrubs, and crops.
+- `tag/units`: Tools that interact with units.

From eb91feff7c167b4b118b753022ad06ca4df66316 Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Thu, 11 Aug 2022 23:34:37 -0700
Subject: [PATCH 482/854] revise tag list and assignments

---
 docs/builtins/alias.rst               | 2 +-
 docs/builtins/cls.rst                 | 2 +-
 docs/builtins/die.rst                 | 2 +-
 docs/builtins/disable.rst             | 2 +-
 docs/builtins/enable.rst              | 2 +-
 docs/builtins/fpause.rst              | 2 +-
 docs/builtins/help.rst                | 2 +-
 docs/builtins/hide.rst                | 2 +-
 docs/builtins/keybinding.rst          | 2 +-
 docs/builtins/kill-lua.rst            | 2 +-
 docs/builtins/load.rst                | 2 +-
 docs/builtins/ls.rst                  | 2 +-
 docs/builtins/plug.rst                | 2 +-
 docs/builtins/reload.rst              | 2 +-
 docs/builtins/sc-script.rst           | 2 +-
 docs/builtins/script.rst              | 2 +-
 docs/builtins/show.rst                | 2 +-
 docs/builtins/tags.rst                | 2 +-
 docs/builtins/type.rst                | 2 +-
 docs/builtins/unload.rst              | 2 +-
 docs/plugins/3dveins.rst              | 2 +-
 docs/plugins/RemoteFortressReader.rst | 2 +-
 docs/plugins/add-spatter.rst          | 2 +-
 docs/plugins/autochop.rst             | 2 +-
 docs/plugins/autoclothing.rst         | 2 +-
 docs/plugins/autodump.rst             | 2 +-
 docs/plugins/autofarm.rst             | 2 +-
 docs/plugins/autogems.rst             | 2 +-
 docs/plugins/automelt.rst             | 2 +-
 docs/plugins/autotrade.rst            | 2 +-
 docs/plugins/blueprint.rst            | 2 +-
 docs/plugins/building-hacks.rst       | 2 +-
 docs/plugins/buildingplan.rst         | 2 +-
 docs/plugins/burrows.rst              | 2 +-
 docs/plugins/cleanconst.rst           | 2 +-
 docs/plugins/cleaners.rst             | 2 +-
 docs/plugins/command-prompt.rst       | 2 +-
 docs/plugins/cursecheck.rst           | 2 +-
 docs/plugins/diggingInvaders.rst      | 2 +-
 docs/plugins/dwarfmonitor.rst         | 2 +-
 docs/plugins/dwarfvet.rst             | 2 +-
 docs/plugins/eventful.rst             | 2 +-
 docs/plugins/fix-unit-occupancy.rst   | 2 +-
 docs/plugins/fixveins.rst             | 2 +-
 docs/plugins/forceequip.rst           | 2 +-
 docs/plugins/getplants.rst            | 2 +-
 docs/plugins/hotkeys.rst              | 2 +-
 docs/plugins/infiniteSky.rst          | 2 +-
 docs/plugins/isoworldremote.rst       | 2 +-
 docs/plugins/luasocket.rst            | 2 +-
 docs/plugins/manipulator.rst          | 2 +-
 docs/plugins/map-render.rst           | 2 +-
 docs/plugins/mode.rst                 | 2 +-
 docs/plugins/orders.rst               | 2 +-
 docs/plugins/pathable.rst             | 2 +-
 docs/plugins/petcapRemover.rst        | 2 +-
 docs/plugins/plants.rst               | 2 +-
 docs/plugins/power-meter.rst          | 2 +-
 docs/plugins/probe.rst                | 2 +-
 docs/plugins/prospector.rst           | 2 +-
 docs/plugins/regrass.rst              | 2 +-
 docs/plugins/rename.rst               | 2 +-
 docs/plugins/rendermax.rst            | 2 +-
 docs/plugins/resume.rst               | 2 +-
 docs/plugins/seedwatch.rst            | 2 +-
 docs/plugins/showmood.rst             | 2 +-
 docs/plugins/siege-engine.rst         | 2 +-
 docs/plugins/spectate.rst             | 2 +-
 docs/plugins/steam-engine.rst         | 2 +-
 docs/plugins/stockflow.rst            | 2 +-
 docs/plugins/stocks.rst               | 2 +-
 docs/plugins/stonesense.rst           | 2 +-
 docs/plugins/tailor.rst               | 2 +-
 docs/plugins/title-folder.rst         | 2 +-
 docs/plugins/title-version.rst        | 2 +-
 docs/plugins/trackstop.rst            | 2 +-
 docs/plugins/tweak.rst                | 2 +-
 docs/plugins/workNow.rst              | 2 +-
 78 files changed, 78 insertions(+), 78 deletions(-)

diff --git a/docs/builtins/alias.rst b/docs/builtins/alias.rst
index 84a761556..a9f44386a 100644
--- a/docs/builtins/alias.rst
+++ b/docs/builtins/alias.rst
@@ -3,7 +3,7 @@ alias
 
 .. dfhack-tool::
     :summary: Configure helper aliases for other DFHack commands.
-    :tags: system
+    :tags: dfhack
 
 Aliases are resolved immediately after built-in commands, which means that an
 alias cannot override a built-in command, but can override a command implemented
diff --git a/docs/builtins/cls.rst b/docs/builtins/cls.rst
index 2aad049b4..515235a93 100644
--- a/docs/builtins/cls.rst
+++ b/docs/builtins/cls.rst
@@ -3,7 +3,7 @@ cls
 
 .. dfhack-tool::
     :summary: Clear the terminal screen.
-    :tags: system
+    :tags: dfhack
 
 Can also be invoked as ``clear``. Note that this command does not delete command
 history. It just clears the text on the screen.
diff --git a/docs/builtins/die.rst b/docs/builtins/die.rst
index b4873abc5..25a34504d 100644
--- a/docs/builtins/die.rst
+++ b/docs/builtins/die.rst
@@ -3,7 +3,7 @@ die
 
 .. dfhack-tool::
     :summary: Instantly exit DF without saving.
-    :tags: system
+    :tags: dfhack
 
 Use to exit DF quickly and safely.
 
diff --git a/docs/builtins/disable.rst b/docs/builtins/disable.rst
index e109e69e1..73d267ccf 100644
--- a/docs/builtins/disable.rst
+++ b/docs/builtins/disable.rst
@@ -3,7 +3,7 @@ disable
 
 .. dfhack-tool::
     :summary: Deactivate a DFHack tool that has some persistent effect.
-    :tags: system
+    :tags: dfhack
 
 See the `enable` command for more info.
 
diff --git a/docs/builtins/enable.rst b/docs/builtins/enable.rst
index 63b0bdc5f..19f98a122 100644
--- a/docs/builtins/enable.rst
+++ b/docs/builtins/enable.rst
@@ -3,7 +3,7 @@ enable
 
 .. dfhack-tool::
     :summary: Activate a DFHack tool that has some persistent effect.
-    :tags: system
+    :tags: dfhack
 
 Many plugins and scripts can be in a distinct enabled or disabled state. Some
 of them activate and deactivate automatically depending on the contents of the
diff --git a/docs/builtins/fpause.rst b/docs/builtins/fpause.rst
index 2e8f851f7..5379caec0 100644
--- a/docs/builtins/fpause.rst
+++ b/docs/builtins/fpause.rst
@@ -3,7 +3,7 @@ fpause
 
 .. dfhack-tool::
     :summary: Forces DF to pause.
-    :tags: system
+    :tags: dfhack
 
 This is useful when your FPS drops below 1 and you lose control of the game.
 
diff --git a/docs/builtins/help.rst b/docs/builtins/help.rst
index e1e913747..95dadefd9 100644
--- a/docs/builtins/help.rst
+++ b/docs/builtins/help.rst
@@ -3,7 +3,7 @@ help
 
 .. dfhack-tool::
     :summary: Display help about a command or plugin.
-    :tags: system
+    :tags: dfhack
 
 Can also be invoked as ``?`` or ``man`` (short for "manual").
 
diff --git a/docs/builtins/hide.rst b/docs/builtins/hide.rst
index 0ec8f36df..b23738860 100644
--- a/docs/builtins/hide.rst
+++ b/docs/builtins/hide.rst
@@ -3,7 +3,7 @@ hide
 
 .. dfhack-tool::
     :summary: Hide the DFHack terminal window.
-    :tags: system
+    :tags: dfhack
 
 You can show it again with the `show` command, though you'll need to use it from
 a `keybinding` set beforehand or the in-game `command-prompt`.
diff --git a/docs/builtins/keybinding.rst b/docs/builtins/keybinding.rst
index 5ce8145f4..ae51d7a37 100644
--- a/docs/builtins/keybinding.rst
+++ b/docs/builtins/keybinding.rst
@@ -3,7 +3,7 @@ keybinding
 
 .. dfhack-tool::
     :summary: Create hotkeys that will run DFHack commands.
-    :tags: system
+    :tags: dfhack
 
 Like any other command, it can be used at any time from the console, but
 bindings are not remembered between runs of the game unless re-created in
diff --git a/docs/builtins/kill-lua.rst b/docs/builtins/kill-lua.rst
index 4de0ab7d1..3334b3b2b 100644
--- a/docs/builtins/kill-lua.rst
+++ b/docs/builtins/kill-lua.rst
@@ -3,7 +3,7 @@ kill-lua
 
 .. dfhack-tool::
     :summary: Gracefully stop any currently-running Lua scripts.
-    :tags: system
+    :tags: dfhack
 
 Use this command to stop a misbehaving script that appears to be stuck.
 
diff --git a/docs/builtins/load.rst b/docs/builtins/load.rst
index d253144a8..0c199ae3d 100644
--- a/docs/builtins/load.rst
+++ b/docs/builtins/load.rst
@@ -3,7 +3,7 @@ load
 
 .. dfhack-tool::
     :summary: Load and register a plugin library.
-    :tags: system
+    :tags: dfhack
 
 Also see `unload` and `reload` for related actions.
 
diff --git a/docs/builtins/ls.rst b/docs/builtins/ls.rst
index 702c8bae5..6ef09d236 100644
--- a/docs/builtins/ls.rst
+++ b/docs/builtins/ls.rst
@@ -3,7 +3,7 @@ ls
 
 .. dfhack-tool::
     :summary: List available DFHack commands.
-    :tags: system
+    :tags: dfhack
 
 In order to group related commands, each command is associated with a list of
 tags. You can filter the listed commands by a tag or a substring of the
diff --git a/docs/builtins/plug.rst b/docs/builtins/plug.rst
index e10c154e5..a1b136306 100644
--- a/docs/builtins/plug.rst
+++ b/docs/builtins/plug.rst
@@ -3,7 +3,7 @@ plug
 
 .. dfhack-tool::
     :summary: List available plugins and whether they are enabled.
-    :tags: system
+    :tags: dfhack
 
 Usage::
 
diff --git a/docs/builtins/reload.rst b/docs/builtins/reload.rst
index 1429e1038..17efffb2c 100644
--- a/docs/builtins/reload.rst
+++ b/docs/builtins/reload.rst
@@ -3,7 +3,7 @@ reload
 
 .. dfhack-tool::
     :summary: Reload a loaded plugin.
-    :tags: system
+    :tags: dfhack
 
 Developers use this command to reload a plugin that they are actively modifying.
 Also see `load` and `unload` for related actions.
diff --git a/docs/builtins/sc-script.rst b/docs/builtins/sc-script.rst
index b3255cb9f..5203f1aff 100644
--- a/docs/builtins/sc-script.rst
+++ b/docs/builtins/sc-script.rst
@@ -3,7 +3,7 @@ sc-script
 
 .. dfhack-tool::
     :summary: Run commands when game state changes occur.
-    :tags: system
+    :tags: dfhack
 
 This is similar to the static `init-files` but is slightly more flexible since
 it can be set dynamically.
diff --git a/docs/builtins/script.rst b/docs/builtins/script.rst
index fbcebff6c..0f40df5df 100644
--- a/docs/builtins/script.rst
+++ b/docs/builtins/script.rst
@@ -3,7 +3,7 @@ script
 
 .. dfhack-tool::
     :summary: Execute a batch file of DFHack commands.
-    :tags: system
+    :tags: dfhack
 
 It reads a text file and runs each line as a DFHack command as if it had been
 typed in by the user -- treating the input like `an init file <init-files>`.
diff --git a/docs/builtins/show.rst b/docs/builtins/show.rst
index 7002d5aff..c59f4e519 100644
--- a/docs/builtins/show.rst
+++ b/docs/builtins/show.rst
@@ -3,7 +3,7 @@ show
 
 .. dfhack-tool::
     :summary: Unhides the DFHack terminal window.
-    :tags: system
+    :tags: dfhack
 
 Useful if you have hidden the terminal with `hide` and you want it back. Since
 the terminal window won't be available to run this command, you'll need to use
diff --git a/docs/builtins/tags.rst b/docs/builtins/tags.rst
index 93a094149..3823a9924 100644
--- a/docs/builtins/tags.rst
+++ b/docs/builtins/tags.rst
@@ -3,7 +3,7 @@ tags
 
 .. dfhack-tool::
     :summary: List the strings that DFHack tools can be tagged with.
-    :tags: system
+    :tags: dfhack
 
 You can find groups of related tools by passing the tag name to the `ls`
 command.
diff --git a/docs/builtins/type.rst b/docs/builtins/type.rst
index 3336cae5f..dfcb493f9 100644
--- a/docs/builtins/type.rst
+++ b/docs/builtins/type.rst
@@ -3,7 +3,7 @@ type
 
 .. dfhack-tool::
     :summary: Describe how a command is implemented.
-    :tags: system
+    :tags: dfhack
 
 DFHack commands can be provided by plugins, scripts, or by the core library
 itself. The ``type`` command can tell you which is the source of a particular
diff --git a/docs/builtins/unload.rst b/docs/builtins/unload.rst
index 132732a7f..fd9e11a46 100644
--- a/docs/builtins/unload.rst
+++ b/docs/builtins/unload.rst
@@ -3,7 +3,7 @@ unload
 
 .. dfhack-tool::
     :summary: Unload a plugin from memory.
-    :tags: system
+    :tags: dfhack
 
 Also see `load` and `reload` for related actions.
 
diff --git a/docs/plugins/3dveins.rst b/docs/plugins/3dveins.rst
index c60582310..b22ac81e5 100644
--- a/docs/plugins/3dveins.rst
+++ b/docs/plugins/3dveins.rst
@@ -3,7 +3,7 @@
 
 .. dfhack-tool::
     :summary: Rewrite layer veins to expand in 3D space.
-    :tags: fort mod map
+    :tags: fort gameplay map
 
 Existing, flat veins are removed and new 3D veins that naturally span z-levels
 are generated in their place. The transformation preserves the mineral counts
diff --git a/docs/plugins/RemoteFortressReader.rst b/docs/plugins/RemoteFortressReader.rst
index f849266c2..9a925d0fd 100644
--- a/docs/plugins/RemoteFortressReader.rst
+++ b/docs/plugins/RemoteFortressReader.rst
@@ -3,7 +3,7 @@ RemoteFortressReader
 
 .. dfhack-tool::
     :summary: Backend for Armok Vision.
-    :tags: dev
+    :tags: dev graphics
     :no-command:
 
 .. dfhack-command:: RemoteFortressReader_version
diff --git a/docs/plugins/add-spatter.rst b/docs/plugins/add-spatter.rst
index 06739291e..873bd761f 100644
--- a/docs/plugins/add-spatter.rst
+++ b/docs/plugins/add-spatter.rst
@@ -3,7 +3,7 @@ add-spatter
 
 .. dfhack-tool::
     :summary: Make tagged reactions produce contaminants.
-    :tags: adventure fort mod items
+    :tags: adventure fort gameplay items
     :no-command:
 
 Give some use to all those poisons that can be bought from caravans! The plugin
diff --git a/docs/plugins/autochop.rst b/docs/plugins/autochop.rst
index b445384fb..f0f7932fd 100644
--- a/docs/plugins/autochop.rst
+++ b/docs/plugins/autochop.rst
@@ -3,7 +3,7 @@ autochop
 
 .. dfhack-tool::
     :summary: Auto-harvest trees when low on stockpiled logs.
-    :tags: fort auto
+    :tags: fort auto plants
     :no-command:
 
 This plugin can designate trees for chopping when your stocks are low on logs.
diff --git a/docs/plugins/autoclothing.rst b/docs/plugins/autoclothing.rst
index a5b57dfb1..ed4f2160d 100644
--- a/docs/plugins/autoclothing.rst
+++ b/docs/plugins/autoclothing.rst
@@ -3,7 +3,7 @@ autoclothing
 
 .. dfhack-tool::
     :summary: Automatically manage clothing work orders.
-    :tags: fort auto jobs
+    :tags: fort auto workorders
 
 This command allows you to set how many of each clothing type every citizen
 should have.
diff --git a/docs/plugins/autodump.rst b/docs/plugins/autodump.rst
index 0fd7ee23c..e2d812219 100644
--- a/docs/plugins/autodump.rst
+++ b/docs/plugins/autodump.rst
@@ -3,7 +3,7 @@ autodump
 
 .. dfhack-tool::
     :summary: Automatically set items in a stockpile to be dumped.
-    :tags: fort auto fps items stockpiles
+    :tags: fort productivity fps armok stockpiles items
     :no-command:
 
 .. dfhack-command:: autodump
diff --git a/docs/plugins/autofarm.rst b/docs/plugins/autofarm.rst
index 44077eb89..026a2ad61 100644
--- a/docs/plugins/autofarm.rst
+++ b/docs/plugins/autofarm.rst
@@ -3,7 +3,7 @@ autofarm
 
 .. dfhack-tool::
     :summary: Automatically manage farm crop selection.
-    :tags: fort auto buildings
+    :tags: fort auto plants
 
 Periodically scan your plant stocks and assign crops to your farm plots based on
 which plant stocks are low (as long as you have the appropriate seeds). The
diff --git a/docs/plugins/autogems.rst b/docs/plugins/autogems.rst
index f95d74fea..9efa33499 100644
--- a/docs/plugins/autogems.rst
+++ b/docs/plugins/autogems.rst
@@ -3,7 +3,7 @@ autogems
 
 .. dfhack-tool::
     :summary: Automatically cut rough gems.
-    :tags: fort auto jobs
+    :tags: fort auto workorders
     :no-command:
 
 .. dfhack-command:: autogems-reload
diff --git a/docs/plugins/automelt.rst b/docs/plugins/automelt.rst
index 508fdaeaf..09b35a378 100644
--- a/docs/plugins/automelt.rst
+++ b/docs/plugins/automelt.rst
@@ -3,7 +3,7 @@ automelt
 
 .. dfhack-tool::
     :summary: Quickly designate items to be melted.
-    :tags: fort auto items stockpiles
+    :tags: fort productivity stockpiles items
     :no-command:
 
 When `enabled <enable>`, this plugin adds an option to the :kbd:`q` menu for
diff --git a/docs/plugins/autotrade.rst b/docs/plugins/autotrade.rst
index f27fab122..946e53508 100644
--- a/docs/plugins/autotrade.rst
+++ b/docs/plugins/autotrade.rst
@@ -3,7 +3,7 @@ autotrade
 
 .. dfhack-tool::
     :summary: Quickly designate items to be traded.
-    :tags: fort auto items stockpiles
+    :tags: fort productivity stockpiles items
     :no-command:
 
 When `enabled <enable>`, this plugin adds an option to the :kbd:`q` menu for
diff --git a/docs/plugins/blueprint.rst b/docs/plugins/blueprint.rst
index 8654aa1ec..ed3d0b29c 100644
--- a/docs/plugins/blueprint.rst
+++ b/docs/plugins/blueprint.rst
@@ -3,7 +3,7 @@ blueprint
 
 .. dfhack-tool::
     :summary: Record a live game map in a quickfort blueprint.
-    :tags: fort design quickfort map
+    :tags: fort design buildings stockpiles map
 
 With ``blueprint``, you can export the structure of a portion of your fortress
 in a blueprint file that you (or anyone else) can later play back with
diff --git a/docs/plugins/building-hacks.rst b/docs/plugins/building-hacks.rst
index cd8835f37..12f49fbbe 100644
--- a/docs/plugins/building-hacks.rst
+++ b/docs/plugins/building-hacks.rst
@@ -3,7 +3,7 @@ building-hacks
 
 .. dfhack-tool::
     :summary: Provides a Lua API for creating powered workshops.
-    :tags: fort mod buildings
+    :tags: fort gameplay buildings
     :no-command:
 
 See `building-hacks-api` for more details.
diff --git a/docs/plugins/buildingplan.rst b/docs/plugins/buildingplan.rst
index ea9d78f64..4e96e3349 100644
--- a/docs/plugins/buildingplan.rst
+++ b/docs/plugins/buildingplan.rst
@@ -3,7 +3,7 @@ buildingplan
 
 .. dfhack-tool::
     :summary: Plan building construction before you have materials.
-    :tags: fort design quickfort buildings map
+    :tags: fort design buildings
 
 This plugin adds a planning mode for building placement. You can then place
 furniture, constructions, and other buildings before the required materials are
diff --git a/docs/plugins/burrows.rst b/docs/plugins/burrows.rst
index 92e62f08b..1bdbd959f 100644
--- a/docs/plugins/burrows.rst
+++ b/docs/plugins/burrows.rst
@@ -3,7 +3,7 @@ burrows
 
 .. dfhack-tool::
     :summary: Auto-expand burrows as you dig.
-    :tags: fort auto productivity units
+    :tags: fort auto productivity design map units
     :no-command:
 
 .. dfhack-command:: burrow
diff --git a/docs/plugins/cleanconst.rst b/docs/plugins/cleanconst.rst
index 9c0309105..9417bd539 100644
--- a/docs/plugins/cleanconst.rst
+++ b/docs/plugins/cleanconst.rst
@@ -3,7 +3,7 @@ cleanconst
 
 .. dfhack-tool::
     :summary: Cleans up construction materials.
-    :tags: fort fps map
+    :tags: fort fps buildings
 
 This tool alters all constructions on the map so that they spawn their building
 component when they are disassembled, allowing their actual build items to be
diff --git a/docs/plugins/cleaners.rst b/docs/plugins/cleaners.rst
index 42e585da1..ca022c440 100644
--- a/docs/plugins/cleaners.rst
+++ b/docs/plugins/cleaners.rst
@@ -6,7 +6,7 @@ cleaners
 
 .. dfhack-tool::
     :summary: Provides commands for cleaning spatter from the map.
-    :tags: adventure fort fps items map units
+    :tags: adventure fort fps armok items map units
     :no-command:
 
 .. dfhack-command:: clean
diff --git a/docs/plugins/command-prompt.rst b/docs/plugins/command-prompt.rst
index 278741f36..802a1898e 100644
--- a/docs/plugins/command-prompt.rst
+++ b/docs/plugins/command-prompt.rst
@@ -3,7 +3,7 @@ command-prompt
 
 .. dfhack-tool::
     :summary: An in-game DFHack terminal where you can run other commands.
-    :tags: system
+    :tags: dfhack
 
 Usage::
 
diff --git a/docs/plugins/cursecheck.rst b/docs/plugins/cursecheck.rst
index b2e2943ba..afe6b537f 100644
--- a/docs/plugins/cursecheck.rst
+++ b/docs/plugins/cursecheck.rst
@@ -3,7 +3,7 @@ cursecheck
 
 .. dfhack-tool::
     :summary: Check for cursed creatures.
-    :tags: system interface
+    :tags: dev fps stockpiles
 
 This command checks a single map tile (or the whole map/world) for cursed
 creatures (ghosts, vampires, necromancers, werebeasts, zombies, etc.).
diff --git a/docs/plugins/diggingInvaders.rst b/docs/plugins/diggingInvaders.rst
index df54e7008..bdb65b490 100644
--- a/docs/plugins/diggingInvaders.rst
+++ b/docs/plugins/diggingInvaders.rst
@@ -3,7 +3,7 @@ diggingInvaders
 
 .. dfhack-tool::
     :summary: Invaders dig and destroy to get to your dwarves.
-    :tags: fort mod map
+    :tags: fort gameplay military units
 
 Usage:
 
diff --git a/docs/plugins/dwarfmonitor.rst b/docs/plugins/dwarfmonitor.rst
index 73d8a8c19..1c499639f 100644
--- a/docs/plugins/dwarfmonitor.rst
+++ b/docs/plugins/dwarfmonitor.rst
@@ -3,7 +3,7 @@ dwarfmonitor
 
 .. dfhack-tool::
     :summary: Measure fort happiness and efficiency.
-    :tags: fort inspection units
+    :tags: fort inspection jobs units
 
 It can also show heads-up display widgets with live fort statistics.
 
diff --git a/docs/plugins/dwarfvet.rst b/docs/plugins/dwarfvet.rst
index f607e85cd..fc8f84659 100644
--- a/docs/plugins/dwarfvet.rst
+++ b/docs/plugins/dwarfvet.rst
@@ -3,7 +3,7 @@ dwarfvet
 
 .. dfhack-tool::
     :summary: Allows animals to be treated at animal hospitals.
-    :tags: fort mod animals
+    :tags: fort gameplay animals
 
 Annoyed your dragons become useless after a minor injury? Well, with dwarfvet,
 injured animals will be treated at an animal hospital, which is simply a hospital
diff --git a/docs/plugins/eventful.rst b/docs/plugins/eventful.rst
index d5bd55956..e89480413 100644
--- a/docs/plugins/eventful.rst
+++ b/docs/plugins/eventful.rst
@@ -3,7 +3,7 @@ eventful
 
 .. dfhack-tool::
     :summary: Provides a Lua API for reacting to in-game events.
-    :tags: dev mod
+    :tags: dev gameplay
     :no-command:
 
 See `eventful-api` for details.
diff --git a/docs/plugins/fix-unit-occupancy.rst b/docs/plugins/fix-unit-occupancy.rst
index 117f97467..ba75ed389 100644
--- a/docs/plugins/fix-unit-occupancy.rst
+++ b/docs/plugins/fix-unit-occupancy.rst
@@ -3,7 +3,7 @@ fix-unit-occupancy
 
 .. dfhack-tool::
     :summary: Fix phantom unit occupancy issues.
-    :tags: fort fix map
+    :tags: fort bugfix map
 
 If you see "unit blocking tile" messages that you can't account for
 (:bug:`3499`), this tool can help.
diff --git a/docs/plugins/fixveins.rst b/docs/plugins/fixveins.rst
index 045b3c8da..f8b9c4c36 100644
--- a/docs/plugins/fixveins.rst
+++ b/docs/plugins/fixveins.rst
@@ -3,7 +3,7 @@ fixveins
 
 .. dfhack-tool::
     :summary: Restore missing mineral inclusions.
-    :tags: fort fix map
+    :tags: fort bugfix map
 
 This tool can also remove invalid references to mineral inclusions if you broke
 your embark with tools like `tiletypes`.
diff --git a/docs/plugins/forceequip.rst b/docs/plugins/forceequip.rst
index acfd8f462..b835865e2 100644
--- a/docs/plugins/forceequip.rst
+++ b/docs/plugins/forceequip.rst
@@ -3,7 +3,7 @@ forceequip
 
 .. dfhack-tool::
     :summary: Move items into a unit's inventory.
-    :tags: adventure fort items units
+    :tags: adventure fort animals items military units
 
 This tool is typically used to equip specific clothing/armor items onto a dwarf,
 but can also be used to put armor onto a war animal or to add unusual items
diff --git a/docs/plugins/getplants.rst b/docs/plugins/getplants.rst
index 502f6e9ae..90f4203b9 100644
--- a/docs/plugins/getplants.rst
+++ b/docs/plugins/getplants.rst
@@ -3,7 +3,7 @@ getplants
 
 .. dfhack-tool::
     :summary: Designate trees for chopping and shrubs for gathering.
-    :tags: fort productivity
+    :tags: fort productivity plants
 
 Specify the types of trees to cut down and/or shrubs to gather by their plant
 names.
diff --git a/docs/plugins/hotkeys.rst b/docs/plugins/hotkeys.rst
index 7d30d486e..6115bc90c 100644
--- a/docs/plugins/hotkeys.rst
+++ b/docs/plugins/hotkeys.rst
@@ -3,7 +3,7 @@ hotkeys
 
 .. dfhack-tool::
     :summary: Show all dfhack keybindings for the current context.
-    :tags: system productivity interface
+    :tags: dfhack
 
 The command opens an in-game screen showing which DFHack keybindings are active
 in the current context. See also `hotkey-notes`.
diff --git a/docs/plugins/infiniteSky.rst b/docs/plugins/infiniteSky.rst
index 46f30c24c..144c6c6e7 100644
--- a/docs/plugins/infiniteSky.rst
+++ b/docs/plugins/infiniteSky.rst
@@ -3,7 +3,7 @@ infiniteSky
 
 .. dfhack-tool::
     :summary: Automatically allocates new z-levels of sky
-    :tags: fort map
+    :tags: fort design map
 
 If enabled, this plugin will automatically allocate new z-levels of sky at the
 top of the map as you build up. Or it can allocate one or many additional levels
diff --git a/docs/plugins/isoworldremote.rst b/docs/plugins/isoworldremote.rst
index 1fa439b29..284794f96 100644
--- a/docs/plugins/isoworldremote.rst
+++ b/docs/plugins/isoworldremote.rst
@@ -3,7 +3,7 @@ isoworldremote
 
 .. dfhack-tool::
     :summary: Provides a remote API used by Isoworld.
-    :tags: dev mod
+    :tags: dev graphics
     :no-command:
 
 See `remote` for related remote APIs.
diff --git a/docs/plugins/luasocket.rst b/docs/plugins/luasocket.rst
index 24b30c7a6..4b5b18540 100644
--- a/docs/plugins/luasocket.rst
+++ b/docs/plugins/luasocket.rst
@@ -3,7 +3,7 @@ luasocket
 
 .. dfhack-tool::
     :summary: Provides a Lua API for accessing network sockets.
-    :tags: dev mod
+    :tags: dev
     :no-command:
 
 See `luasocket-api` for details.
diff --git a/docs/plugins/manipulator.rst b/docs/plugins/manipulator.rst
index 26223587d..a0c8ec38e 100644
--- a/docs/plugins/manipulator.rst
+++ b/docs/plugins/manipulator.rst
@@ -3,7 +3,7 @@ manipulator
 
 .. dfhack-tool::
     :summary: An in-game labor management interface.
-    :tags: fort productivity interface labors
+    :tags: fort productivity labors
     :no-command:
 
 It is equivalent to the popular Dwarf Therapist utility.
diff --git a/docs/plugins/map-render.rst b/docs/plugins/map-render.rst
index 7754af8b7..efe3ed0c6 100644
--- a/docs/plugins/map-render.rst
+++ b/docs/plugins/map-render.rst
@@ -3,7 +3,7 @@ map-render
 
 .. dfhack-tool::
     :summary: Provides a Lua API for rerendering portions of the map.
-    :tags: dev
+    :tags: dev graphics
     :no-command:
 
 See `map-render-api` for details.
diff --git a/docs/plugins/mode.rst b/docs/plugins/mode.rst
index db94e6bac..94ee7cb44 100644
--- a/docs/plugins/mode.rst
+++ b/docs/plugins/mode.rst
@@ -3,7 +3,7 @@ mode
 
 .. dfhack-tool::
     :summary: See and change the game mode.
-    :tags: dev
+    :tags: dev gameplay armok
 
 .. warning::
 
diff --git a/docs/plugins/orders.rst b/docs/plugins/orders.rst
index 9403c6c8e..036e0df11 100644
--- a/docs/plugins/orders.rst
+++ b/docs/plugins/orders.rst
@@ -3,7 +3,7 @@ orders
 
 .. dfhack-tool::
     :summary: Manage manager orders.
-    :tags: fort productivity jobs
+    :tags: fort productivity workorders
 
 Usage:
 
diff --git a/docs/plugins/pathable.rst b/docs/plugins/pathable.rst
index 800580017..f4b89683b 100644
--- a/docs/plugins/pathable.rst
+++ b/docs/plugins/pathable.rst
@@ -3,7 +3,7 @@ pathable
 
 .. dfhack-tool::
     :summary: Marks tiles that are reachable from the cursor.
-    :tags: dev inspection interface map
+    :tags: dev inspection map
     :no-command:
 
 This plugin provides a Lua API, but no direct commands. See `pathable-api` for
diff --git a/docs/plugins/petcapRemover.rst b/docs/plugins/petcapRemover.rst
index f3d011308..d4e1f2279 100644
--- a/docs/plugins/petcapRemover.rst
+++ b/docs/plugins/petcapRemover.rst
@@ -3,7 +3,7 @@ petcapRemover
 
 .. dfhack-tool::
     :summary: Modify the pet population cap.
-    :tags: fort armok animals
+    :tags: fort animals
 
 In vanilla DF, pets will not reproduce unless the population is below 50 and the
 number of children of that species is below a certain percentage. This plugin
diff --git a/docs/plugins/plants.rst b/docs/plugins/plants.rst
index d28119af9..cc23c84dd 100644
--- a/docs/plugins/plants.rst
+++ b/docs/plugins/plants.rst
@@ -5,7 +5,7 @@ plants
 
 .. dfhack-tool::
     :summary: Provides commands that interact with plants.
-    :tags: adventure fort armok map
+    :tags: adventure fort armok map plants
     :no-command:
 
 .. dfhack-command:: plant
diff --git a/docs/plugins/power-meter.rst b/docs/plugins/power-meter.rst
index 01e75491a..5e608ca46 100644
--- a/docs/plugins/power-meter.rst
+++ b/docs/plugins/power-meter.rst
@@ -3,7 +3,7 @@ power-meter
 
 .. dfhack-tool::
     :summary: Allow presure plates to measure power.
-    :tags: fort mod buildings
+    :tags: fort gameplay buildings
     :no-command:
 
 If you run `gui/power-meter` while building a pressure plate, the pressure
diff --git a/docs/plugins/probe.rst b/docs/plugins/probe.rst
index 54436be68..7da332ba5 100644
--- a/docs/plugins/probe.rst
+++ b/docs/plugins/probe.rst
@@ -3,7 +3,7 @@ probe
 
 .. dfhack-tool::
     :summary: Display low-level properties of the selected tile.
-    :tags: adventure fort inspection map
+    :tags: adventure fort inspection buildings map units
 
 .. dfhack-command:: bprobe
     :summary: Display low-level properties of the selected building.
diff --git a/docs/plugins/prospector.rst b/docs/plugins/prospector.rst
index dc6204c06..7ef3d223c 100644
--- a/docs/plugins/prospector.rst
+++ b/docs/plugins/prospector.rst
@@ -5,7 +5,7 @@ prospector
 
 .. dfhack-tool::
     :summary: Provides commands that help you analyze natural resources.
-    :tags: fort embark inspection map
+    :tags: fort embark inspection armok map
     :no-command:
 
 .. dfhack-command:: prospect
diff --git a/docs/plugins/regrass.rst b/docs/plugins/regrass.rst
index 72f077fcd..a4b011a1e 100644
--- a/docs/plugins/regrass.rst
+++ b/docs/plugins/regrass.rst
@@ -3,7 +3,7 @@ regrass
 
 .. dfhack-tool::
     :summary: Regrows all the grass.
-    :tags: adventure fort armok animals
+    :tags: adventure fort armok animals map
 
 Use this command if your grazers have eaten everything down to the dirt.
 
diff --git a/docs/plugins/rename.rst b/docs/plugins/rename.rst
index 02bc04c2c..c3e4d5b59 100644
--- a/docs/plugins/rename.rst
+++ b/docs/plugins/rename.rst
@@ -3,7 +3,7 @@ rename
 
 .. dfhack-tool::
     :summary: Easily rename things.
-    :tags: adventure fort productivity
+    :tags: adventure fort productivity buildings stockpiles units
 
 Use `gui/rename` for an in-game interface.
 
diff --git a/docs/plugins/rendermax.rst b/docs/plugins/rendermax.rst
index 680676fa3..af3dc6c0c 100644
--- a/docs/plugins/rendermax.rst
+++ b/docs/plugins/rendermax.rst
@@ -3,7 +3,7 @@ rendermax
 
 .. dfhack-tool::
     :summary: Modify the map lighting.
-    :tags: adventure fort mod
+    :tags: adventure fort gameplay graphics
 
 This plugin provides a collection of OpenGL lighting filters that affect how the
 map is drawn to the screen.
diff --git a/docs/plugins/resume.rst b/docs/plugins/resume.rst
index 0713026e4..b8c388738 100644
--- a/docs/plugins/resume.rst
+++ b/docs/plugins/resume.rst
@@ -3,7 +3,7 @@ resume
 
 .. dfhack-tool::
     :summary: Color planned buildings based on their suspend status.
-    :tags: fort productivity
+    :tags: fort productivity interface jobs
     :no-command:
 
 .. dfhack-command:: resume
diff --git a/docs/plugins/seedwatch.rst b/docs/plugins/seedwatch.rst
index 1aaa04ee3..7d31c160c 100644
--- a/docs/plugins/seedwatch.rst
+++ b/docs/plugins/seedwatch.rst
@@ -3,7 +3,7 @@ seedwatch
 
 .. dfhack-tool::
     :summary: Manages seed and plant cooking based on seed stock levels.
-    :tags: fort auto
+    :tags: fort auto plants
 
 Each seed type can be assigned a target. If the number of seeds of that type
 falls below that target, then the plants and seeds of that type will be excluded
diff --git a/docs/plugins/showmood.rst b/docs/plugins/showmood.rst
index da67b5803..2a294b166 100644
--- a/docs/plugins/showmood.rst
+++ b/docs/plugins/showmood.rst
@@ -3,7 +3,7 @@ showmood
 
 .. dfhack-tool::
     :summary: Shows all items needed for the active strange mood.
-    :tags: fort inspection jobs
+    :tags: fort inspection armok jobs units
 
 Usage::
 
diff --git a/docs/plugins/siege-engine.rst b/docs/plugins/siege-engine.rst
index 06ff963b7..a6b3e87a8 100644
--- a/docs/plugins/siege-engine.rst
+++ b/docs/plugins/siege-engine.rst
@@ -3,7 +3,7 @@ siege-engine
 
 .. dfhack-tool::
     :summary: Extend the functionality and usability of siege engines.
-    :tags: fort mod buildings
+    :tags: fort gameplay buildings
     :no-command:
 
 Siege engines in DF haven't been updated since the game was 2D, and can only aim
diff --git a/docs/plugins/spectate.rst b/docs/plugins/spectate.rst
index 7f448ebfb..96147695a 100644
--- a/docs/plugins/spectate.rst
+++ b/docs/plugins/spectate.rst
@@ -3,7 +3,7 @@ spectate
 
 .. dfhack-tool::
     :summary: Automatically follow exciting dwarves.
-    :tags: fort units
+    :tags: fort interface
     :no-command:
 
 Usage::
diff --git a/docs/plugins/steam-engine.rst b/docs/plugins/steam-engine.rst
index e0f938915..6560ae714 100644
--- a/docs/plugins/steam-engine.rst
+++ b/docs/plugins/steam-engine.rst
@@ -3,7 +3,7 @@ steam-engine
 
 .. dfhack-tool::
     :summary: Allow modded steam engine buildings to function.
-    :tags: fort mod buildings
+    :tags: fort gameplay buildings
     :no-command:
 
 The steam-engine plugin detects custom workshops with the string
diff --git a/docs/plugins/stockflow.rst b/docs/plugins/stockflow.rst
index 81eab07ff..358305a96 100644
--- a/docs/plugins/stockflow.rst
+++ b/docs/plugins/stockflow.rst
@@ -3,7 +3,7 @@ stockflow
 
 .. dfhack-tool::
     :summary: Queue manager jobs based on free space in stockpiles.
-    :tags: fort auto jobs stockpiles
+    :tags: fort auto stockpiles workorders
 
 With this plugin, the fortress bookkeeper can tally up free space in specific
 stockpiles and queue jobs through the manager to produce items to fill the free
diff --git a/docs/plugins/stocks.rst b/docs/plugins/stocks.rst
index e518fc1f1..144ba2287 100644
--- a/docs/plugins/stocks.rst
+++ b/docs/plugins/stocks.rst
@@ -3,7 +3,7 @@ stocks
 
 .. dfhack-tool::
     :summary: Enhanced fortress stock management interface.
-    :tags: fort productivity interface
+    :tags: fort productivity items
 
 When the plugin is enabled, two new hotkeys become available:
 
diff --git a/docs/plugins/stonesense.rst b/docs/plugins/stonesense.rst
index 0315c92ed..b43f95697 100644
--- a/docs/plugins/stonesense.rst
+++ b/docs/plugins/stonesense.rst
@@ -3,7 +3,7 @@ stonesense
 
 .. dfhack-tool::
     :summary: A 3D isometric visualizer.
-    :tags: adventure fort interface map
+    :tags: adventure fort map graphics
 
 .. dfhack-command:: ssense
    :summary: An alias for stonesense.
diff --git a/docs/plugins/tailor.rst b/docs/plugins/tailor.rst
index 5da293fbf..646e73f91 100644
--- a/docs/plugins/tailor.rst
+++ b/docs/plugins/tailor.rst
@@ -3,7 +3,7 @@ tailor
 
 .. dfhack-tool::
     :summary: Automatically keep your dwarves in fresh clothing.
-    :tags: fort auto jobs
+    :tags: fort auto workorders
 
 Whenever the bookkeeper updates stockpile records, this plugin will scan the
 fort. If there are fresh cloths available, dwarves who are wearing tattered
diff --git a/docs/plugins/title-folder.rst b/docs/plugins/title-folder.rst
index 56de7d769..ca349a0ed 100644
--- a/docs/plugins/title-folder.rst
+++ b/docs/plugins/title-folder.rst
@@ -3,7 +3,7 @@ title-folder
 
 .. dfhack-tool::
     :summary: Displays the DF folder name in the window title bar.
-    :tags: system interface
+    :tags: interface
     :no-command:
 
 Usage::
diff --git a/docs/plugins/title-version.rst b/docs/plugins/title-version.rst
index f7fc238c7..239b08bc2 100644
--- a/docs/plugins/title-version.rst
+++ b/docs/plugins/title-version.rst
@@ -3,7 +3,7 @@ title-version
 
 .. dfhack-tool::
     :summary: Displays the DFHack version on DF's title screen.
-    :tags: system interface
+    :tags: interface
     :no-command:
 
 Usage::
diff --git a/docs/plugins/trackstop.rst b/docs/plugins/trackstop.rst
index 65aae2b7f..1c638dfd7 100644
--- a/docs/plugins/trackstop.rst
+++ b/docs/plugins/trackstop.rst
@@ -3,7 +3,7 @@ trackstop
 
 .. dfhack-tool::
     :summary: Add dynamic configuration options for track stops.
-    :tags: fort interface mod buildings
+    :tags: fort gameplay buildings
     :no-command:
 
 When enabled, this plugin adds a :kbd:`q` menu for track stops, which is
diff --git a/docs/plugins/tweak.rst b/docs/plugins/tweak.rst
index 71b564434..c04392c62 100644
--- a/docs/plugins/tweak.rst
+++ b/docs/plugins/tweak.rst
@@ -3,7 +3,7 @@ tweak
 
 .. dfhack-tool::
     :summary: A collection of tweaks and bugfixes.
-    :tags: adventure fort interface fps fix armok
+    :tags: adventure fort fps bugfix armok interface
 
 Usage::
 
diff --git a/docs/plugins/workNow.rst b/docs/plugins/workNow.rst
index 678649487..27709c166 100644
--- a/docs/plugins/workNow.rst
+++ b/docs/plugins/workNow.rst
@@ -3,7 +3,7 @@ workNow
 
 .. dfhack-tool::
     :summary: Reduce the time that dwarves idle after completing a job.
-    :tags: fort auto jobs
+    :tags: fort auto labors
 
 After finishing a job, dwarves will wander away for a while before picking up a
 new job. This plugin will automatically poke the game to assign dwarves to new

From 2a3a812b3c7c5de15dfb7510c2a998483056d3cc Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Sat, 13 Aug 2022 21:21:48 -0700
Subject: [PATCH 483/854] update tag reference in Core.rst

---
 docs/Core.rst | 2 +-
 scripts       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/Core.rst b/docs/Core.rst
index 025e951e6..09ae2577d 100644
--- a/docs/Core.rst
+++ b/docs/Core.rst
@@ -185,7 +185,7 @@ where ``*`` can be any string, including the empty string.
 A world being loaded can mean a fortress, an adventurer, or legends mode.
 
 These files are best used for non-persistent commands, such as setting
-a `tag/fix` script to run on `repeat`.
+a `tag/bugfix` script to run on `repeat`.
 
 
 .. _onMapLoad.init:
diff --git a/scripts b/scripts
index 4c7eecb5c..f37c0d022 160000
--- a/scripts
+++ b/scripts
@@ -1 +1 @@
-Subproject commit 4c7eecb5cbeeead3c4374fafc562ee774e8e229e
+Subproject commit f37c0d022135ca10fb5375c4e56e11215bf208ae

From 47dc8c6c11d4dd121c5dcf8542125d08a24f2dcd Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Sat, 13 Aug 2022 21:23:26 -0700
Subject: [PATCH 484/854] update scripts reference

---
 scripts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts b/scripts
index f37c0d022..3d65c9a75 160000
--- a/scripts
+++ b/scripts
@@ -1 +1 @@
-Subproject commit f37c0d022135ca10fb5375c4e56e11215bf208ae
+Subproject commit 3d65c9a75a8c7a3607e71529f6264bab3e637755

From f1f207b45b57b28cdf0ce5f53456423f28f385ba Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Sat, 13 Aug 2022 21:51:36 -0700
Subject: [PATCH 485/854] don't include rst sources in html output

---
 CMakeLists.txt | 4 +++-
 conf.py        | 3 +++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c341735c9..c02b3a670 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -506,7 +506,9 @@ if(BUILD_DOCS)
         COMMAND ${CMAKE_COMMAND} -E touch ${SPHINX_OUTPUT})
 
     install(DIRECTORY ${dfhack_SOURCE_DIR}/docs/html/
-        DESTINATION ${DFHACK_USERDOC_DESTINATION}/docs)
+        DESTINATION ${DFHACK_USERDOC_DESTINATION}/docs
+        FILES_MATCHING PATTERN "*"
+                       PATTERN html/_sources EXCLUDE)
     install(DIRECTORY ${dfhack_SOURCE_DIR}/docs/text/
         DESTINATION ${DFHACK_USERDOC_DESTINATION}/docs)
     install(FILES docs/changelogs/news.rst docs/changelogs/news-dev.rst DESTINATION ${DFHACK_USERDOC_DESTINATION})
diff --git a/conf.py b/conf.py
index ff4cdc59d..0eaeb95f7 100644
--- a/conf.py
+++ b/conf.py
@@ -316,6 +316,9 @@ html_domain_indices = False
 # If false, no genindex.html is generated.
 html_use_index = True
 
+# don't link to rst sources in the generated pages
+html_show_sourcelink = False
+
 html_css_files = [
     'dfhack.css',
 ]

From 09401ac3707ad6348b2287f8a9464ee06ea8986d Mon Sep 17 00:00:00 2001
From: DFHack-Urist via GitHub Actions
 <63161697+DFHack-Urist@users.noreply.github.com>
Date: Sun, 14 Aug 2022 07:16:48 +0000
Subject: [PATCH 486/854] Auto-update submodules

scripts: master
---
 scripts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts b/scripts
index 4c7eecb5c..3d65c9a75 160000
--- a/scripts
+++ b/scripts
@@ -1 +1 @@
-Subproject commit 4c7eecb5cbeeead3c4374fafc562ee774e8e229e
+Subproject commit 3d65c9a75a8c7a3607e71529f6264bab3e637755

From 488fd677429310a684a5ac1d1e1d0eef98a671cf Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Sun, 14 Aug 2022 23:01:20 -0700
Subject: [PATCH 487/854] output version of found sphinx and python

---
 CMakeLists.txt | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c02b3a670..c278c4542 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -442,8 +442,10 @@ endif()
 add_subdirectory(data)
 add_subdirectory(scripts)
 
-find_package(Sphinx QUIET)
 if(BUILD_DOCS)
+    find_package(Python3)
+    find_package(Sphinx)
+
     if(NOT SPHINX_FOUND)
         message(SEND_ERROR "Sphinx not found but BUILD_DOCS enabled")
     endif()

From 340b524348eabc0fa750232305000586e5b8646f Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Mon, 15 Aug 2022 17:49:44 -0400
Subject: [PATCH 488/854] Invoke build.py with cmake-found python

In the Buildmaster GCC 4.8 image, `/usr/bin/env python3` appears to find the
system Python (3.4) as opposed to the newer Python (3.6) we install separately.
---
 CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c278c4542..60bffa758 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -493,7 +493,7 @@ if(BUILD_DOCS)
         "${CMAKE_BINARY_DIR}/docs/text"
     )
     add_custom_command(OUTPUT ${SPHINX_OUTPUT}
-        COMMAND "${CMAKE_CURRENT_SOURCE_DIR}/docs/build.py"
+        COMMAND "${Python3_EXECUTABLE}" "${CMAKE_CURRENT_SOURCE_DIR}/docs/build.py"
             html text --sphinx="${SPHINX_EXECUTABLE}" -- -q
         DEPENDS ${SPHINX_DEPS}
         COMMENT "Building documentation with Sphinx"

From 9f648d532ee29897dbf3acd5bfafb4d15b7932fd Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Sun, 31 Jul 2022 14:22:21 -0700
Subject: [PATCH 489/854] modify seedwatch all to actually watch all seeds

---
 docs/changelog.txt    |  1 +
 plugins/seedwatch.cpp | 10 +++++-----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/docs/changelog.txt b/docs/changelog.txt
index 2733cd539..637dd03f0 100644
--- a/docs/changelog.txt
+++ b/docs/changelog.txt
@@ -51,6 +51,7 @@ changelog.txt uses a syntax similar to RST, with a few special sequences:
 - ``materials.ItemTraitsDialog``: added a default ``on_select``-handler which toggles the traits.
 - `orders`: added useful library of manager orders. see them with ``orders list`` and import them with, for example, ``orders import library/basic``
 - `prospect`: add new ``--show`` option to give the player control over which report sections are shown. e.g. ``prospect all --show ores`` will just show information on ores.
+- `seedwatch`: ``seedwatch all`` now adds all plants with seeds to the watchlist, not just the "basic" crops.
 
 ## Documentation
 
diff --git a/plugins/seedwatch.cpp b/plugins/seedwatch.cpp
index 478a0899a..65b89cfa1 100644
--- a/plugins/seedwatch.cpp
+++ b/plugins/seedwatch.cpp
@@ -132,7 +132,9 @@ command_result df_seedwatch(color_ostream &out, vector<string>& parameters)
     map<string, int32_t> plantIDs;
     for(size_t i = 0; i < world->raws.plants.all.size(); ++i)
     {
-        plantIDs[world->raws.plants.all[i]->id] = i;
+        auto & plant = world->raws.plants.all[i];
+        if (plant->material_defs.type[plant_material_def::seed] != -1)
+            plantIDs[plant->id] = i;
     }
 
     t_gamemodes gm;
@@ -226,10 +228,8 @@ command_result df_seedwatch(color_ostream &out, vector<string>& parameters)
         if(limit < 0) limit = 0;
         if(parameters[0] == "all")
         {
-            for(auto i = abbreviations.begin(); i != abbreviations.end(); ++i)
-            {
-                if(plantIDs.count(i->second) > 0) Kitchen::setLimit(plantIDs[i->second], limit);
-            }
+            for(auto & entry : plantIDs)
+                Kitchen::setLimit(entry.second, limit);
         }
         else
         {

From 2f9021a3a0911d1cd39108535e02b91f4abb8db3 Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Tue, 2 Aug 2022 12:56:44 -0700
Subject: [PATCH 490/854] move examples to the examples folder

---
 docs/Dev-intro.rst                            |  4 +--
 plugins/CMakeLists.txt                        |  6 ----
 plugins/{skeleton => examples}/skeleton.cpp   |  0
 .../{skeleton => examples}/skeletonShort.cpp  |  0
 plugins/skeleton/CMakeLists.txt               | 36 -------------------
 plugins/skeleton/skeleton.h                   |  1 -
 6 files changed, 2 insertions(+), 45 deletions(-)
 rename plugins/{skeleton => examples}/skeleton.cpp (100%)
 rename plugins/{skeleton => examples}/skeletonShort.cpp (100%)
 delete mode 100644 plugins/skeleton/CMakeLists.txt
 delete mode 100644 plugins/skeleton/skeleton.h

diff --git a/docs/Dev-intro.rst b/docs/Dev-intro.rst
index 758bf225f..d4167aae3 100644
--- a/docs/Dev-intro.rst
+++ b/docs/Dev-intro.rst
@@ -22,7 +22,7 @@ Plugins
 
 DFHack plugins are written in C++ and located in the ``plugins`` folder.
 Currently, documentation on how to write plugins is somewhat sparse. There are
-templates that you can use to get started in the ``plugins/skeleton``
+templates that you can use to get started in the ``plugins/examples``
 folder, and the source code of existing plugins can also be helpful.
 
 If you want to compile a plugin that you have just added, you will need to add a
@@ -35,7 +35,7 @@ other commands).
 
 Plugins can also register handlers to run on every tick, and can interface with
 the built-in `enable` and `disable` commands. For the full plugin API, see the
-skeleton plugins or ``PluginManager.cpp``.
+example plugins or ``PluginManager.cpp``.
 
 Installed plugins live in the ``hack/plugins`` folder of a DFHack installation,
 and the `load` family of commands can be used to load a recompiled plugin
diff --git a/plugins/CMakeLists.txt b/plugins/CMakeLists.txt
index 338db4ab9..6a34117b9 100644
--- a/plugins/CMakeLists.txt
+++ b/plugins/CMakeLists.txt
@@ -185,12 +185,6 @@ if(BUILD_SUPPORTED)
     # see instructions for adding "external" plugins at the end of this file.
 endif()
 
-# this is the skeleton plugin. If you want to make your own, make a copy and then change it
-option(BUILD_SKELETON "Build the skeleton plugin." OFF)
-if(BUILD_SKELETON)
-    add_subdirectory(skeleton)
-endif()
-
 macro(subdirlist result subdir)
     file(GLOB children ABSOLUTE ${subdir}/ ${subdir}/*/)
     set(dirlist "")
diff --git a/plugins/skeleton/skeleton.cpp b/plugins/examples/skeleton.cpp
similarity index 100%
rename from plugins/skeleton/skeleton.cpp
rename to plugins/examples/skeleton.cpp
diff --git a/plugins/skeleton/skeletonShort.cpp b/plugins/examples/skeletonShort.cpp
similarity index 100%
rename from plugins/skeleton/skeletonShort.cpp
rename to plugins/examples/skeletonShort.cpp
diff --git a/plugins/skeleton/CMakeLists.txt b/plugins/skeleton/CMakeLists.txt
deleted file mode 100644
index cbe5f7ce6..000000000
--- a/plugins/skeleton/CMakeLists.txt
+++ /dev/null
@@ -1,36 +0,0 @@
-project(skeleton)
-# A list of source files
-set(PROJECT_SRCS
-    skeleton.cpp
-)
-# A list of headers
-set(PROJECT_HDRS
-    skeleton.h
-)
-set_source_files_properties(${PROJECT_HDRS} PROPERTIES HEADER_FILE_ONLY TRUE)
-
-# mash them together (headers are marked as headers and nothing will try to compile them)
-list(APPEND PROJECT_SRCS ${PROJECT_HDRS})
-
-# option to use a thread for no particular reason
-option(SKELETON_THREAD "Use threads in the skeleton plugin." ON)
-if(UNIX)
-    if(APPLE)
-        set(PROJECT_LIBS
-            # add any extra mac libraries here
-            ${PROJECT_LIBS}
-        )
-    else()
-        set(PROJECT_LIBS
-            # add any extra linux libraries here
-            ${PROJECT_LIBS}
-        )
-    endif()
-else()
-    set(PROJECT_LIBS
-        # add any extra windows libraries here
-        ${PROJECT_LIBS}
-    )
-endif()
-# this makes sure all the stuff is put in proper places and linked to dfhack
-dfhack_plugin(skeleton ${PROJECT_SRCS} LINK_LIBRARIES ${PROJECT_LIBS})
diff --git a/plugins/skeleton/skeleton.h b/plugins/skeleton/skeleton.h
deleted file mode 100644
index 6f70f09be..000000000
--- a/plugins/skeleton/skeleton.h
+++ /dev/null
@@ -1 +0,0 @@
-#pragma once

From 0bbbacf161aa0f4bd4869d108f56d85f9c5ec8e6 Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Tue, 2 Aug 2022 18:40:50 -0700
Subject: [PATCH 491/854] extend the docs and examples in skeleton.cpp

---
 plugins/examples/skeleton.cpp | 221 +++++++++++++++++++++-------------
 1 file changed, 134 insertions(+), 87 deletions(-)

diff --git a/plugins/examples/skeleton.cpp b/plugins/examples/skeleton.cpp
index 7d5936f6d..e1f552d31 100644
--- a/plugins/examples/skeleton.cpp
+++ b/plugins/examples/skeleton.cpp
@@ -1,65 +1,71 @@
-// This is a generic plugin that does nothing useful apart from acting as an example... of a plugin that does nothing :D
+// This is an example plugin that just documents and implements all the plugin
+// callbacks and features. You can compile it, load it, run it, and see the
+// debug messages get printed to the console.
+//
+// See the other example plugins in this directory for plugins that are
+// configured for specific use cases (but don't come with as many comments as
+// this one does).
+
+#include <string>
+#include <vector>
+
+#include "df/world.h"
 
-// some headers required for a plugin. Nothing special, just the basics.
 #include "Core.h"
-#include <Console.h>
-#include <Export.h>
-#include <PluginManager.h>
-#include <modules/EventManager.h>
-// If you need to save data per-world:
-//#include "modules/Persistence.h"
+#include "Debug.h"
+#include "LuaTools.h"
+#include "PluginManager.h"
 
-// DF data structure definition headers
-#include "DataDefs.h"
-//#include "df/world.h"
+#include "modules/Persistence.h"
+#include "modules/World.h"
 
-// our own, empty header.
-#include "skeleton.h"
+using std::string;
+using std::vector;
 
 using namespace DFHack;
-using namespace df::enums;
 
-// Expose the plugin name to the DFHack core, as well as metadata like the DFHack version.
-// The name string provided must correspond to the filename -
+// Expose the plugin name to the DFHack core, as well as metadata like the
+// DFHack version that this plugin was compiled with. This macro provides a
+// variable for the plugin name as const char * plugin_name.
+// The name provided must correspond to the filename --
 // skeleton.plug.so, skeleton.plug.dylib, or skeleton.plug.dll in this case
 DFHACK_PLUGIN("skeleton");
 
-// The identifier declared with this macro (ie. enabled) can be specified by the user
-// and subsequently used to manage the plugin's operations.
-// This will also be tracked by `plug`; when true the plugin will be shown as enabled.
-DFHACK_PLUGIN_IS_ENABLED(enabled);
+// The identifier declared with this macro (i.e. is_enabled) is used to track
+// whether the plugin is in an "enabled" state. If you don't need enablement
+// for your plugin, you don't need this line. This variable will also be read
+// by the `plug` builtin command; when true the plugin will be shown as enabled.
+DFHACK_PLUGIN_IS_ENABLED(is_enabled);
 
 // Any globals a plugin requires (e.g. world) should be listed here.
 // For example, this line expands to "using df::global::world" and prevents the
-// plugin from being loaded if df::global::world is null (i.e. missing from symbols.xml):
-//
+// plugin from being loaded if df::global::world is null (i.e. missing from
+// symbols.xml).
 REQUIRE_GLOBAL(world);
 
-// You may want some compile time debugging options
-// one easy system just requires you to cache the color_ostream &out into a global debug variable
-//#define P_DEBUG 1
-//uint16_t maxTickFreq = 1200; //maybe you want to use some events
+// logging levels can be dynamically controlled with the `debugfilter` command.
+namespace DFHack {
+    // for configuration-related logging
+    DBG_DECLARE(skeleton, status, DebugCategory::LINFO);
+    // for logging during the periodic scan
+    DBG_DECLARE(skeleton, cycle, DebugCategory::LINFO);
+}
 
-command_result command_callback1(color_ostream &out, std::vector<std::string> &parameters);
+command_result command_callback1(color_ostream &out, vector<string> &parameters);
 
+// run when the plugin is loaded
 DFhackCExport command_result plugin_init(color_ostream &out, std::vector<PluginCommand> &commands) {
-    commands.push_back(PluginCommand("skeleton",
-                                     "~54 character description of plugin", //to use one line in the ``[DFHack]# ls`` output
-                                     command_callback1,
-                                     false,
-                                     "example usage"
-                                     " skeleton <option> <args>\n"
-                                     "    explanation of plugin/command\n"
-                                     "\n"
-                                     " skeleton\n"
-                                     "    what happens when using the command\n"
-                                     "\n"
-                                     " skeleton option1\n"
-                                     "    what happens when using the command with option1\n"
-                                     "\n"));
+    // For in-tree plugins, don't use the "usage" parameter of PluginCommand.
+    // Instead, add an .rst file with the same name as the plugin to the
+    // docs/plugins/ directory.
+    commands.push_back(PluginCommand(
+        "skeleton",
+        "Short (~54 character) description of command.", // to use one line in the ``[DFHack]# ls`` output
+        command_callback1));
     return CR_OK;
 }
 
+// run when the plugin is unloaded
 DFhackCExport command_result plugin_shutdown(color_ostream &out) {
     // You *MUST* kill all threads you created before this returns.
     // If everything fails, just return CR_FAILURE. Your plugin will be
@@ -68,28 +74,20 @@ DFhackCExport command_result plugin_shutdown(color_ostream &out) {
 
 }
 
+// run when the `enable` or `disable` command is run with this plugin name as
+// an argument
 DFhackCExport command_result plugin_enable(color_ostream &out, bool enable) {
-    namespace EM = EventManager;
-    if (enable && !enabled) {
-        //using namespace EM::EventType;
-        //EM::EventHandler eventHandler(onNewEvent, maxTickFreq);
-        //EM::registerListener(EventType::JOB_COMPLETED, eventHandler, plugin_self);
-        //out.print("plugin enabled!\n");
-    } else if (!enable && enabled) {
-        EM::unregisterAll(plugin_self);
-        //out.print("plugin disabled!\n");
-    }
-    enabled = enable;
+    // you have to maintain the state of the is_enabled variable yourself. it
+    // doesn't happen automatically.
+    is_enabled = enable;
     return CR_OK;
 }
 
-
-/* OPTIONAL *
 // Called to notify the plugin about important state changes.
 // Invoked with DF suspended, and always before the matching plugin_onupdate.
 // More event codes may be added in the future.
 DFhackCExport command_result plugin_onstatechange(color_ostream &out, state_change_event event) {
-    if (enabled) {
+    if (is_enabled) {
         switch (event) {
             case SC_UNKNOWN:
                 break;
@@ -116,9 +114,8 @@ DFhackCExport command_result plugin_onstatechange(color_ostream &out, state_chan
     return CR_OK;
 }
 
-// Whatever you put here will be done in each game step. Don't abuse it.
-DFhackCExport command_result plugin_onupdate ( color_ostream &out )
-{
+// Whatever you put here will be done in each game frame refresh. Don't abuse it.
+DFhackCExport command_result plugin_onupdate (color_ostream &out) {
     // whetever. You don't need to suspend DF execution here.
     return CR_OK;
 }
@@ -128,44 +125,94 @@ DFhackCExport command_result plugin_onupdate ( color_ostream &out )
 // and plugin_load_data is called whenever a new world is loaded. If the plugin
 // is loaded or unloaded while a world is active, plugin_save_data or
 // plugin_load_data will be called immediately.
-DFhackCExport command_result plugin_save_data (color_ostream &out)
-{
+DFhackCExport command_result plugin_save_data (color_ostream &out) {
     // Call functions in the Persistence module here.
     return CR_OK;
 }
 
-DFhackCExport command_result plugin_load_data (color_ostream &out)
-{
+DFhackCExport command_result plugin_load_data (color_ostream &out) {
     // Call functions in the Persistence module here.
     return CR_OK;
 }
-* OPTIONAL */
-
-
-// A command! It sits around and looks pretty. And it's nice and friendly.
-command_result command_callback1(color_ostream &out, std::vector<std::string> &parameters) {
-    // It's nice to print a help message you get invalid options
-    // from the user instead of just acting strange.
-    // This can be achieved by adding the extended help string to the
-    // PluginCommand registration as show above, and then returning
-    // CR_WRONG_USAGE from the function. The same string will also
-    // be used by 'help your-command'.
-    if (!parameters.empty()) {
-        return CR_WRONG_USAGE; //or maybe you want it to do something else
+
+// define the structure that will represent the possible commandline options
+struct command_options {
+    // whether to display help
+    bool help = false;
+
+    // whether to run a cycle right now
+    bool now = false;
+
+    // how many ticks to wait between cycles when enabled, -1 means unset
+    int32_t ticks = -1;
+
+    // example params of different types
+    df::coord start;
+    string format;
+    vector<string*> list; // note this must be a vector of pointers, not objects
+
+    static struct_identity _identity;
+};
+static const struct_field_info command_options_fields[] = {
+    { struct_field_info::PRIMITIVE,      "help",   offsetof(command_options, help),  &df::identity_traits<bool>::identity,    0, 0 },
+    { struct_field_info::PRIMITIVE,      "now",    offsetof(command_options, now),   &df::identity_traits<bool>::identity,    0, 0 },
+    { struct_field_info::PRIMITIVE,      "ticks",  offsetof(command_options, ticks), &df::identity_traits<int32_t>::identity, 0, 0 },
+    { struct_field_info::SUBSTRUCT,      "start",  offsetof(command_options, start), &df::coord::_identity,                   0, 0 },
+    { struct_field_info::PRIMITIVE,      "format", offsetof(command_options, format), df::identity_traits<string>::get(),     0, 0 },
+    { struct_field_info::STL_VECTOR_PTR, "list",   offsetof(command_options, list),   df::identity_traits<string>::get(),     0, 0 },
+    { struct_field_info::END }
+};
+struct_identity command_options::_identity(sizeof(command_options), &df::allocator_fn<command_options>, NULL, "command_options", NULL, command_options_fields);
+
+// load the lua module associated with the plugin and parse the commandline
+// in lua (which has better facilities than C++ for string parsing). You should
+// create a file named after your plugin in the plugins/lua directory. This
+// example expects you to define a global function in that file named
+// "parse_commandline" that takes the options struct defined above along with
+// the commandline parameters. It should parse the parameters and set data in
+// the options structure. See plugins/lua/skeleton.lua for an example.
+static bool get_options(color_ostream &out,
+                        command_options &opts,
+                        const vector<string> &parameters)
+{
+    auto L = Lua::Core::State;
+    Lua::StackUnwinder top(L);
+
+    if (!lua_checkstack(L, parameters.size() + 2) ||
+        !Lua::PushModulePublic(
+            out, L, ("plugins." + string(plugin_name)).c_str(),
+            "parse_commandline")) {
+        out.printerr("Failed to load %s Lua code\n", plugin_name);
+        return false;
     }
-    // Commands are called from threads other than the DF one.
-    // Suspend this thread until DF has time for us.
-    // **If you use CoreSuspender** it'll automatically resume DF when
-    // execution leaves the current scope.
+
+    Lua::Push(L, &opts);
+    for (const string &param : parameters)
+        Lua::Push(L, param);
+
+    if (!Lua::SafeCall(out, L, parameters.size() + 1, 0))
+        return false;
+
+    return true;
+}
+
+// This is the callback we registered in plugin_init. Note that while plugin
+// callbacks are called with the core suspended, command callbacks are called
+// from a different thread and need to explicity suspend the core if they
+// interact with Lua or DF game state (most commands do at least one of these).
+static command_result command_callback1(color_ostream &out, vector<string> &parameters) {
+    // I'll say it again: always suspend the core in command callbacks unless
+    // all your data is local.
     CoreSuspender suspend;
-    // Actually do something here. Yay.
 
-    // process parameters
-    if (parameters.size() == 1 && parameters[0] == "option1") {
-        // stuff
-    } else {
-        return CR_FAILURE;
-    }
-    // Give control back to DF.
+    // Return CR_WRONG_USAGE to print out your help text. The help text is
+    // sourced from the associated rst file in docs/plugins/. The same help will
+    // also be returned by 'help your-command'.
+    command_options opts;
+    if (!get_options(out, opts, parameters) || opts.help)
+        return CR_WRONG_USAGE;
+
+    // TODO: do something according to the flags set in the options struct
+
     return CR_OK;
 }

From 43dfd27bb4e3f36f4e3e037211ae3e85d2aa6a15 Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Tue, 2 Aug 2022 18:41:03 -0700
Subject: [PATCH 492/854] create several use-case-focused plugin examples

---
 .../examples/persistent_per_save_example.cpp  | 232 ++++++++++++++++++
 plugins/examples/simple_command_example.cpp   |  96 ++++++++
 plugins/examples/skeletonShort.cpp            |  61 -----
 plugins/examples/ui_addition_example.cpp      |  58 +++++
 4 files changed, 386 insertions(+), 61 deletions(-)
 create mode 100644 plugins/examples/persistent_per_save_example.cpp
 create mode 100644 plugins/examples/simple_command_example.cpp
 delete mode 100644 plugins/examples/skeletonShort.cpp
 create mode 100644 plugins/examples/ui_addition_example.cpp

diff --git a/plugins/examples/persistent_per_save_example.cpp b/plugins/examples/persistent_per_save_example.cpp
new file mode 100644
index 000000000..b620b7703
--- /dev/null
+++ b/plugins/examples/persistent_per_save_example.cpp
@@ -0,0 +1,232 @@
+// This template is appropriate for plugins that periodically check game state
+// and make some sort of automated change. These types of plugins typically
+// provide a command that can be used to configure the plugin behavior and
+// require a world to be loaded before they can function. This kind of plugin
+// should persist its state in the savegame and auto-re-enable itself when a
+// savegame that had this plugin enabled is loaded.
+
+#include <string>
+#include <vector>
+
+#include "df/world.h"
+
+#include "Core.h"
+#include "Debug.h"
+#include "LuaTools.h"
+#include "PluginManager.h"
+
+#include "modules/Persistence.h"
+#include "modules/World.h"
+
+using std::string;
+using std::vector;
+
+using namespace DFHack;
+
+DFHACK_PLUGIN("persistent_per_save_example");
+DFHACK_PLUGIN_IS_ENABLED(is_enabled);
+
+REQUIRE_GLOBAL(world);
+
+// logging levels can be dynamically controlled with the `debugfilter` command.
+namespace DFHack {
+    // for configuration-related logging
+    DBG_DECLARE(persistent_per_save_example, status, DebugCategory::LINFO);
+    // for logging during the periodic scan
+    DBG_DECLARE(persistent_per_save_example, cycle, DebugCategory::LINFO);
+}
+
+static const string CONFIG_KEY = string(plugin_name) + "/config";
+static PersistentDataItem config;
+enum ConfigValues {
+    CONFIG_IS_ENABLED = 0,
+    CONFIG_CYCLE_TICKS = 1,
+};
+static int get_config_val(int index) {
+    if (!config.isValid())
+        return -1;
+    return config.ival(index);
+}
+static bool get_config_bool(int index) {
+    return get_config_val(index) == 1;
+}
+static void set_config_val(int index, int value) {
+    if (config.isValid())
+        config.ival(index) = value;
+}
+static void set_config_bool(int index, bool value) {
+    set_config_val(index, value ? 1 : 0);
+}
+
+static int32_t cycle_timestamp = 0;  // world->frame_counter at last cycle
+
+// define the structure that will represent the possible commandline options
+struct command_options {
+    // whether to display help
+    bool help = false;
+
+    // whether to run a cycle right now
+    bool now = false;
+
+    // how many ticks to wait between cycles when enabled, -1 means unset
+    int32_t ticks = -1;
+
+    // example params of different types
+    df::coord start;
+    string format;
+    vector<string*> list; // note this must be a vector of pointers, not objects
+
+    static struct_identity _identity;
+};
+static const struct_field_info command_options_fields[] = {
+    { struct_field_info::PRIMITIVE,      "help",   offsetof(command_options, help),  &df::identity_traits<bool>::identity,    0, 0 },
+    { struct_field_info::PRIMITIVE,      "now",    offsetof(command_options, now),   &df::identity_traits<bool>::identity,    0, 0 },
+    { struct_field_info::PRIMITIVE,      "ticks",  offsetof(command_options, ticks), &df::identity_traits<int32_t>::identity, 0, 0 },
+    { struct_field_info::SUBSTRUCT,      "start",  offsetof(command_options, start), &df::coord::_identity,                   0, 0 },
+    { struct_field_info::PRIMITIVE,      "format", offsetof(command_options, format), df::identity_traits<string>::get(),     0, 0 },
+    { struct_field_info::STL_VECTOR_PTR, "list",   offsetof(command_options, list),   df::identity_traits<string>::get(),     0, 0 },
+    { struct_field_info::END }
+};
+struct_identity command_options::_identity(sizeof(command_options), &df::allocator_fn<command_options>, NULL, "command_options", NULL, command_options_fields);
+
+static command_result do_command(color_ostream &out, vector<string> &parameters);
+static void do_cycle(color_ostream &out);
+
+DFhackCExport command_result plugin_init(color_ostream &out, std::vector <PluginCommand> &commands) {
+    DEBUG(status,out).print("initializing %s\n", plugin_name);
+
+    // provide a configuration interface for the plugin
+    commands.push_back(PluginCommand(
+        plugin_name,
+        "Short (~54 character) description of command.",
+        do_command));
+
+    return CR_OK;
+}
+
+DFhackCExport command_result plugin_enable(color_ostream &out, bool enable) {
+    if (!Core::getInstance().isWorldLoaded()) {
+        out.printerr("Cannot enable %s without a loaded world.\n", plugin_name);
+        return CR_FAILURE;
+    }
+
+    if (enable != is_enabled) {
+        is_enabled = enable;
+        DEBUG(status,out).print("%s from the API; persisting\n",
+                                is_enabled ? "enabled" : "disabled");
+        set_config_bool(CONFIG_IS_ENABLED, is_enabled);
+    } else {
+        DEBUG(status,out).print("%s from the API, but already %s; no action\n",
+                                is_enabled ? "enabled" : "disabled",
+                                is_enabled ? "enabled" : "disabled");
+    }
+    return CR_OK;
+}
+
+DFhackCExport command_result plugin_shutdown (color_ostream &out) {
+    DEBUG(status,out).print("shutting down %s\n", plugin_name);
+
+    return CR_OK;
+}
+
+DFhackCExport command_result plugin_load_data (color_ostream &out) {
+    config = World::GetPersistentData(CONFIG_KEY);
+
+    if (!config.isValid()) {
+        DEBUG(status,out).print("no config found in this save; initializing\n");
+        config = World::AddPersistentData(CONFIG_KEY);
+        set_config_bool(CONFIG_IS_ENABLED, is_enabled);
+        set_config_val(CONFIG_CYCLE_TICKS, 6000);
+    }
+
+    // we have to copy our enabled flag into the global plugin variable, but
+    // all the other state we can directly read/modify from the persistent
+    // data structure.
+    is_enabled = get_config_bool(CONFIG_IS_ENABLED);
+    DEBUG(status,out).print("loading persisted enabled state: %s\n",
+                            is_enabled ? "true" : "false");
+    return CR_OK;
+}
+
+DFhackCExport command_result plugin_onstatechange(color_ostream &out, state_change_event event) {
+    if (event == DFHack::SC_MAP_UNLOADED) {
+        if (is_enabled) {
+            DEBUG(status,out).print("world unloaded; disabling %s\n",
+                                    plugin_name);
+            is_enabled = false;
+        }
+    }
+    return CR_OK;
+}
+
+DFhackCExport command_result plugin_onupdate(color_ostream &out) {
+    if (is_enabled && world->frame_counter - cycle_timestamp >= get_config_val(CONFIG_CYCLE_TICKS))
+        do_cycle(out);
+    return CR_OK;
+}
+
+// load the lua module associated with the plugin and parse the commandline
+// in lua (which has better facilities than C++ for string parsing).
+static bool get_options(color_ostream &out,
+                        command_options &opts,
+                        const vector<string> &parameters)
+{
+    auto L = Lua::Core::State;
+    Lua::StackUnwinder top(L);
+
+    if (!lua_checkstack(L, parameters.size() + 2) ||
+        !Lua::PushModulePublic(
+            out, L, ("plugins." + string(plugin_name)).c_str(),
+            "parse_commandline")) {
+        out.printerr("Failed to load %s Lua code\n", plugin_name);
+        return false;
+    }
+
+    Lua::Push(L, &opts);
+    for (const string &param : parameters)
+        Lua::Push(L, param);
+
+    if (!Lua::SafeCall(out, L, parameters.size() + 1, 0))
+        return false;
+
+    return true;
+}
+
+static command_result do_command(color_ostream &out, vector<string> &parameters) {
+    // be sure to suspend the core if any DF state is read or modified
+    CoreSuspender suspend;
+
+    if (!Core::getInstance().isWorldLoaded()) {
+        out.printerr("Cannot run %s without a loaded world.\n", plugin_name);
+        return CR_FAILURE;
+    }
+
+    command_options opts;
+    if (!get_options(out, opts, parameters) || opts.help)
+        return CR_WRONG_USAGE;
+
+    if (opts.ticks > -1) {
+        set_config_val(CONFIG_CYCLE_TICKS, opts.ticks);
+        INFO(status,out).print("New cycle timer: %d ticks.\n", opts.ticks);
+    }
+    else if (opts.now) {
+        do_cycle(out);
+    }
+    else {
+        out.print("%s is %srunning\n", plugin_name, (is_enabled ? "" : "not "));
+    }
+    return CR_OK;
+}
+
+/////////////////////////////////////////////////////
+// cycle logic
+//
+
+static void do_cycle(color_ostream &out) {
+    // mark that we have recently run
+    cycle_timestamp = world->frame_counter;
+
+    DEBUG(cycle,out).print("running %s cycle\n", plugin_name);
+
+    // TODO: logic that runs every get_config_val(CONFIG_CYCLE_TICKS) ticks
+}
diff --git a/plugins/examples/simple_command_example.cpp b/plugins/examples/simple_command_example.cpp
new file mode 100644
index 000000000..0f1aad4f1
--- /dev/null
+++ b/plugins/examples/simple_command_example.cpp
@@ -0,0 +1,96 @@
+// This template is appropriate for plugins that simply provide one or more
+// commands, but don't need to be "enabled" to function.
+
+#include <string>
+#include <vector>
+
+#include "Debug.h"
+#include "LuaTools.h"
+#include "PluginManager.h"
+
+using std::string;
+using std::vector;
+
+using namespace DFHack;
+
+DFHACK_PLUGIN("simple_command_example");
+
+namespace DFHack {
+    DBG_DECLARE(simple_command_example, log);
+}
+
+// define the structure that will represent the possible commandline options
+struct command_options {
+    // whether to display help
+    bool help = false;
+
+    // example params of different types
+    int32_t ticks = -1;
+    df::coord start;
+    string format;
+    vector<string*> list; // note this must be a vector of pointers, not objects
+
+    static struct_identity _identity;
+};
+static const struct_field_info command_options_fields[] = {
+    { struct_field_info::PRIMITIVE,      "help",   offsetof(command_options, help),  &df::identity_traits<bool>::identity,    0, 0 },
+    { struct_field_info::PRIMITIVE,      "ticks",  offsetof(command_options, ticks), &df::identity_traits<int32_t>::identity, 0, 0 },
+    { struct_field_info::SUBSTRUCT,      "start",  offsetof(command_options, start), &df::coord::_identity,                   0, 0 },
+    { struct_field_info::PRIMITIVE,      "format", offsetof(command_options, format), df::identity_traits<string>::get(),     0, 0 },
+    { struct_field_info::STL_VECTOR_PTR, "list",   offsetof(command_options, list),   df::identity_traits<string>::get(),     0, 0 },
+    { struct_field_info::END }
+};
+struct_identity command_options::_identity(sizeof(command_options), &df::allocator_fn<command_options>, NULL, "command_options", NULL, command_options_fields);
+
+static command_result do_command(color_ostream &out, vector<string> &parameters);
+
+DFhackCExport command_result plugin_init(color_ostream &out, std::vector <PluginCommand> &commands) {
+    DEBUG(log,out).print("initializing %s\n", plugin_name);
+
+    commands.push_back(PluginCommand(
+        plugin_name,
+        "Short (~54 character) description of command.",
+        do_command));
+
+    return CR_OK;
+}
+
+// load the lua module associated with the plugin and parse the commandline
+// in lua (which has better facilities than C++ for string parsing).
+static bool get_options(color_ostream &out,
+                        command_options &opts,
+                        const vector<string> &parameters)
+{
+    auto L = Lua::Core::State;
+    Lua::StackUnwinder top(L);
+
+    if (!lua_checkstack(L, parameters.size() + 2) ||
+        !Lua::PushModulePublic(
+            out, L, ("plugins." + string(plugin_name)).c_str(),
+            "parse_commandline")) {
+        out.printerr("Failed to load %s Lua code\n", plugin_name);
+        return false;
+    }
+
+    Lua::Push(L, &opts);
+    for (const string &param : parameters)
+        Lua::Push(L, param);
+
+    if (!Lua::SafeCall(out, L, parameters.size() + 1, 0))
+        return false;
+
+    return true;
+}
+
+static command_result do_command(color_ostream &out, vector<string> &parameters) {
+    // be sure to suspend the core if any DF state is read or modified
+    CoreSuspender suspend;
+
+    command_options opts;
+    if (!get_options(out, opts, parameters) || opts.help)
+        return CR_WRONG_USAGE;
+
+    // TODO: command logic
+
+    return CR_OK;
+}
diff --git a/plugins/examples/skeletonShort.cpp b/plugins/examples/skeletonShort.cpp
deleted file mode 100644
index 93712c5a5..000000000
--- a/plugins/examples/skeletonShort.cpp
+++ /dev/null
@@ -1,61 +0,0 @@
-#include "Core.h"
-#include <Console.h>
-#include <Export.h>
-#include <PluginManager.h>
-#include <modules/EventManager.h>
-
-//#include "df/world.h"
-
-using namespace DFHack;
-using namespace df::enums;
-
-DFHACK_PLUGIN("skeleton2");
-DFHACK_PLUGIN_IS_ENABLED(enabled);
-//REQUIRE_GLOBAL(world);
-
-command_result skeleton2 (color_ostream &out, std::vector <std::string> & parameters);
-
-DFhackCExport command_result plugin_init (color_ostream &out, std::vector <PluginCommand> &commands) {
-    commands.push_back(PluginCommand("skeleton2",
-                                     "~54 character description of plugin", //to use one line in the ``[DFHack]# ls`` output
-                                     skeleton2,
-                                     false,
-                                     "example usage"
-                                     " skeleton2 <option> <args>\n"
-                                     "    explanation of plugin/command\n"
-                                     "\n"
-                                     " skeleton2\n"
-                                     "    what happens when using the command\n"
-                                     "\n"
-                                     " skeleton2 option1\n"
-                                     "    what happens when using the command with option1\n"
-                                     "\n"));
-    return CR_OK;
-}
-
-DFhackCExport command_result plugin_shutdown (color_ostream &out) {
-    return CR_OK;
-}
-
-DFhackCExport command_result plugin_enable(color_ostream &out, bool enable) {
-    namespace EM = EventManager;
-    if (enable && !enabled) {
-        //using namespace EM::EventType;
-        //EM::EventHandler eventHandler(onNewEvent, maxTickFreq);
-        //EM::registerListener(EventType::JOB_COMPLETED, eventHandler, plugin_self);
-        //out.print("plugin enabled!\n");
-    } else if (!enable && enabled) {
-        EM::unregisterAll(plugin_self);
-        //out.print("plugin disabled!\n");
-    }
-    enabled = enable;
-    return CR_OK;
-}
-
-command_result skeleton2 (color_ostream &out, std::vector <std::string> & parameters) {
-    if (!parameters.empty())
-        return CR_WRONG_USAGE;
-    CoreSuspender suspend;
-    out.print("blah");
-    return CR_OK;
-}
diff --git a/plugins/examples/ui_addition_example.cpp b/plugins/examples/ui_addition_example.cpp
new file mode 100644
index 000000000..43350a159
--- /dev/null
+++ b/plugins/examples/ui_addition_example.cpp
@@ -0,0 +1,58 @@
+// This template is appropriate for plugins that can be enabled to make some
+// specific persistent change to the game, but don't need a world to be loaded
+// before they are enabled. These types of plugins typically register some sort
+// of hook on enable and clear the hook on disable. They are generally enabled
+// from dfhack.init and do not need to persist and reload their enabled state.
+
+#include <string>
+#include <vector>
+
+#include "df/viewscreen_titlest.h"
+
+#include "Debug.h"
+#include "LuaTools.h"
+#include "PluginManager.h"
+#include "VTableInterpose.h"
+
+using std::string;
+using std::vector;
+
+using namespace DFHack;
+
+DFHACK_PLUGIN("ui_addition_example");
+DFHACK_PLUGIN_IS_ENABLED(is_enabled);
+
+namespace DFHack {
+    DBG_DECLARE(ui_addition_example, log);
+}
+
+// example of hooking a screen so the plugin code will run whenever the screen
+// is visible
+struct title_version_hook : df::viewscreen_titlest {
+    typedef df::viewscreen_titlest interpose_base;
+
+    DEFINE_VMETHOD_INTERPOSE(void, render, ()) {
+        INTERPOSE_NEXT(render)();
+
+        // TODO: injected render logic here
+    }
+};
+IMPLEMENT_VMETHOD_INTERPOSE(title_version_hook, render);
+
+DFhackCExport command_result plugin_shutdown (color_ostream &out) {
+    DEBUG(log,out).print("shutting down %s\n", plugin_name);
+    INTERPOSE_HOOK(title_version_hook, render).remove();
+    return CR_OK;
+}
+
+DFhackCExport command_result plugin_enable (color_ostream &out, bool enable) {
+    if (enable != is_enabled) {
+        DEBUG(log,out).print("%s %s\n", plugin_name,
+                             is_enabled ? "enabled" : "disabled");
+        if (!INTERPOSE_HOOK(title_version_hook, render).apply(enable))
+            return CR_FAILURE;
+
+        is_enabled = enable;
+    }
+    return CR_OK;
+}

From a4c853597754efacb9eb9f430f906035067b052f Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Wed, 3 Aug 2022 00:01:25 -0700
Subject: [PATCH 493/854] add argparse int checking methods, more docs

---
 docs/Lua API.rst              | 12 +++++++++
 library/lua/argparse.lua      | 15 +++++++++---
 plugins/CMakeLists.txt        |  6 +++++
 plugins/examples/skeleton.cpp | 41 +++++++++++++++++++++++++------
 plugins/lua/skeleton.lua      | 46 +++++++++++++++++++++++++++++++++++
 test/library/argparse.lua     | 30 +++++++++++++++++++++++
 6 files changed, 139 insertions(+), 11 deletions(-)
 create mode 100644 plugins/lua/skeleton.lua

diff --git a/docs/Lua API.rst b/docs/Lua API.rst
index 55a217757..d1dbc2856 100644
--- a/docs/Lua API.rst	
+++ b/docs/Lua API.rst	
@@ -3029,6 +3029,18 @@ parameters.
   function also verifies that the coordinates are valid for the current map and
   throws if they are not (unless ``skip_validation`` is set to true).
 
+* ``argparse.positiveInt(arg, arg_name)``
+
+  Throws if ``tonumber(arg)`` is not a positive integer; otherwise returns
+  ``tonumber(arg)``. If ``arg_name`` is specified, it is used to make error
+  messages more useful.
+
+* ``argparse.nonnegativeInt(arg, arg_name)``
+
+  Throws if ``tonumber(arg)`` is not a non-negative integer; otherwise returns
+  ``tonumber(arg)``. If ``arg_name`` is specified, it is used to make error
+  messages more useful.
+
 dumper
 ======
 
diff --git a/library/lua/argparse.lua b/library/lua/argparse.lua
index ee170c190..a143f454c 100644
--- a/library/lua/argparse.lua
+++ b/library/lua/argparse.lua
@@ -154,11 +154,20 @@ function numberList(arg, arg_name, list_length)
     return strings
 end
 
--- throws if val is not a nonnegative integer; otherwise returns val
-local function check_nonnegative_int(val, arg_name)
+function positiveInt(arg, arg_name)
+    local val = tonumber(arg)
+    if not val or val <= 0 or val ~= math.floor(val) then
+        arg_error(arg_name,
+                  'expected positive integer; got "%s"', tostring(arg))
+    end
+    return val
+end
+
+function nonnegativeInt(arg, arg_name)
+    local val = tonumber(arg)
     if not val or val < 0 or val ~= math.floor(val) then
         arg_error(arg_name,
-                  'expected non-negative integer; got "%s"', tostring(val))
+                  'expected non-negative integer; got "%s"', tostring(arg))
     end
     return val
 end
diff --git a/plugins/CMakeLists.txt b/plugins/CMakeLists.txt
index 6a34117b9..1e2019091 100644
--- a/plugins/CMakeLists.txt
+++ b/plugins/CMakeLists.txt
@@ -185,6 +185,12 @@ if(BUILD_SUPPORTED)
     # see instructions for adding "external" plugins at the end of this file.
 endif()
 
+# this is the skeleton plugin. If you want to make your own, make a copy and then change it
+option(BUILD_SKELETON "Build the skeleton plugin." OFF)
+if(BUILD_SKELETON)
+    dfhack_plugin(skeleton examples/skeleton.cpp LINK_LIBRARIES lua)
+endif()
+
 macro(subdirlist result subdir)
     file(GLOB children ABSOLUTE ${subdir}/ ${subdir}/*/)
     set(dirlist "")
diff --git a/plugins/examples/skeleton.cpp b/plugins/examples/skeleton.cpp
index e1f552d31..27621af4a 100644
--- a/plugins/examples/skeleton.cpp
+++ b/plugins/examples/skeleton.cpp
@@ -1,6 +1,8 @@
-// This is an example plugin that just documents and implements all the plugin
-// callbacks and features. You can compile it, load it, run it, and see the
-// debug messages get printed to the console.
+// This is an example plugin that documents and implements all the plugin
+// callbacks and features. You can include it in the regular build by setting
+// the BUILD_SKELETON option in CMake to ON. Play with loading and unloading
+// the plugin in various game states (e.g. with and without a world loaded),
+// and see the debug messages get printed to the console.
 //
 // See the other example plugins in this directory for plugins that are
 // configured for specific use cases (but don't come with as many comments as
@@ -44,17 +46,23 @@ DFHACK_PLUGIN_IS_ENABLED(is_enabled);
 REQUIRE_GLOBAL(world);
 
 // logging levels can be dynamically controlled with the `debugfilter` command.
+// Actual plugins will likely want to set the default level to LINFO or LWARNING
+// instead of the LDEBUG used here.
 namespace DFHack {
     // for configuration-related logging
-    DBG_DECLARE(skeleton, status, DebugCategory::LINFO);
-    // for logging during the periodic scan
-    DBG_DECLARE(skeleton, cycle, DebugCategory::LINFO);
+    DBG_DECLARE(skeleton, status, DebugCategory::LDEBUG);
+    // run `debugfilter set debug skeleton onupdate` to see logging in plugin_onupdate
+    DBG_DECLARE(skeleton, onupdate, DebugCategory::LINFO);
+    // for command-related logging
+    DBG_DECLARE(skeleton, command, DebugCategory::LDEBUG);
 }
 
-command_result command_callback1(color_ostream &out, vector<string> &parameters);
+static command_result command_callback1(color_ostream &out, vector<string> &parameters);
 
 // run when the plugin is loaded
 DFhackCExport command_result plugin_init(color_ostream &out, std::vector<PluginCommand> &commands) {
+    DEBUG(status,out).print("initializing %s\n", plugin_name);
+
     // For in-tree plugins, don't use the "usage" parameter of PluginCommand.
     // Instead, add an .rst file with the same name as the plugin to the
     // docs/plugins/ directory.
@@ -67,6 +75,8 @@ DFhackCExport command_result plugin_init(color_ostream &out, std::vector<PluginC
 
 // run when the plugin is unloaded
 DFhackCExport command_result plugin_shutdown(color_ostream &out) {
+    DEBUG(status,out).print("shutting down %s\n", plugin_name);
+
     // You *MUST* kill all threads you created before this returns.
     // If everything fails, just return CR_FAILURE. Your plugin will be
     // in a zombie state, but things won't crash.
@@ -77,6 +87,8 @@ DFhackCExport command_result plugin_shutdown(color_ostream &out) {
 // run when the `enable` or `disable` command is run with this plugin name as
 // an argument
 DFhackCExport command_result plugin_enable(color_ostream &out, bool enable) {
+    DEBUG(status,out).print("%s from the API\n", enable ? "enabled" : "disabled");
+
     // you have to maintain the state of the is_enabled variable yourself. it
     // doesn't happen automatically.
     is_enabled = enable;
@@ -87,6 +99,8 @@ DFhackCExport command_result plugin_enable(color_ostream &out, bool enable) {
 // Invoked with DF suspended, and always before the matching plugin_onupdate.
 // More event codes may be added in the future.
 DFhackCExport command_result plugin_onstatechange(color_ostream &out, state_change_event event) {
+    DEBUG(status,out).print("game state changed: %d\n", event);
+
     if (is_enabled) {
         switch (event) {
             case SC_UNKNOWN:
@@ -111,12 +125,16 @@ DFhackCExport command_result plugin_onstatechange(color_ostream &out, state_chan
                 break;
         }
     }
+
     return CR_OK;
 }
 
 // Whatever you put here will be done in each game frame refresh. Don't abuse it.
+// Note that if the plugin implements the enabled API, this function is only called
+// if the plugin is enabled.
 DFhackCExport command_result plugin_onupdate (color_ostream &out) {
-    // whetever. You don't need to suspend DF execution here.
+    DEBUG(onupdate,out).print("onupdate called\n");
+
     return CR_OK;
 }
 
@@ -126,11 +144,15 @@ DFhackCExport command_result plugin_onupdate (color_ostream &out) {
 // is loaded or unloaded while a world is active, plugin_save_data or
 // plugin_load_data will be called immediately.
 DFhackCExport command_result plugin_save_data (color_ostream &out) {
+    DEBUG(status,out).print("save or unload is imminent; time to persist state\n");
+
     // Call functions in the Persistence module here.
     return CR_OK;
 }
 
 DFhackCExport command_result plugin_load_data (color_ostream &out) {
+    DEBUG(status,out).print("world is loading; time to load persisted state\n");
+
     // Call functions in the Persistence module here.
     return CR_OK;
 }
@@ -201,6 +223,9 @@ static bool get_options(color_ostream &out,
 // from a different thread and need to explicity suspend the core if they
 // interact with Lua or DF game state (most commands do at least one of these).
 static command_result command_callback1(color_ostream &out, vector<string> &parameters) {
+    DEBUG(command,out).print("%s command called with %zu parameters\n",
+        plugin_name, parameters.size());
+
     // I'll say it again: always suspend the core in command callbacks unless
     // all your data is local.
     CoreSuspender suspend;
diff --git a/plugins/lua/skeleton.lua b/plugins/lua/skeleton.lua
new file mode 100644
index 000000000..60af229cc
--- /dev/null
+++ b/plugins/lua/skeleton.lua
@@ -0,0 +1,46 @@
+local _ENV = mkmodule('plugins.skeleton')
+
+local argparse = require('argparse')
+local utils = require('utils')
+
+local VALID_FORMATS = utils.invert{'pretty', 'normal', 'ugly'}
+
+local function do_commandline(opts, args)
+    print(('called with %d arguments:'):format(#args))
+    for _,arg in ipairs(args) do
+        print('  ' .. arg)
+    end
+
+    local positionals = argparse.processArgsGetopt(args, {
+            {'t', 'ticks', hasArg=true,
+             handler=function(arg) opts.ticks =
+                    argparse.check_positive_int(arg, 'ticks') end},
+            {'s', 'start', hasArg=true,
+             handler=function(arg) utils.assign(
+                    opts.start, argpars.coors(arg, 'start')) end},
+            {'h', 'help', handler=function() opts.help = true end},
+            {'f', 'format', hasArg=true,
+             handler=function(arg) opts.format = arg end},
+            {'z', 'cur-zlevel', handler=function() use_zlevel = true end},
+        })
+
+    if positionals[1] == 'help' then opts.help = true end
+    if opts.help then return end
+
+    if positionals[1] == 'now' then
+        opts.now = true
+    end
+
+    if #opts.format > 0 and not VALID_FORMATS[opts.format] then
+        qerror(('invalid format name: "%s"'):format(opts.format))
+    end
+end
+
+function parse_commandline(opts, ...)
+    do_commandline(opts, {...})
+
+    print('populated options data structure:')
+    printall_recurse(opts)
+end
+
+return _ENV
diff --git a/test/library/argparse.lua b/test/library/argparse.lua
index 4e5c48acc..5e85e6465 100644
--- a/test/library/argparse.lua
+++ b/test/library/argparse.lua
@@ -265,3 +265,33 @@ function test.coords()
                 end)
         end)
 end
+
+function test.positiveInt()
+    expect.eq(5, argparse.positiveInt(5))
+    expect.eq(5, argparse.positiveInt('5'))
+    expect.eq(5, argparse.positiveInt('5.0'))
+    expect.eq(1, argparse.positiveInt('1'))
+
+    expect.error_match('expected positive integer',
+                       function() argparse.positiveInt('0') end)
+    expect.error_match('expected positive integer',
+                       function() argparse.positiveInt('5.01') end)
+    expect.error_match('expected positive integer',
+                       function() argparse.positiveInt(-1) end)
+end
+
+function test.nonnegativeInt()
+    expect.eq(5, argparse.nonnegativeInt(5))
+    expect.eq(5, argparse.nonnegativeInt('5'))
+    expect.eq(5, argparse.nonnegativeInt('5.0'))
+    expect.eq(1, argparse.nonnegativeInt('1'))
+    expect.eq(0, argparse.nonnegativeInt('0'))
+    expect.eq(0, argparse.nonnegativeInt('-0'))
+
+    expect.error_match('expected non%-negative integer',
+                       function() argparse.nonnegativeInt('-0.01') end)
+    expect.error_match('expected non%-negative integer',
+                       function() argparse.nonnegativeInt(-5) end)
+    expect.error_match('expected non%-negative integer',
+                       function() argparse.nonnegativeInt(-1) end)
+end

From a28cf6d444a49fac361fabf6a58cb85c707b366c Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Wed, 3 Aug 2022 00:11:18 -0700
Subject: [PATCH 494/854] remove all lua integration from the examples

---
 plugins/CMakeLists.txt                        |  2 +-
 .../examples/persistent_per_save_example.cpp  | 74 +------------------
 plugins/examples/simple_command_example.cpp   | 55 --------------
 plugins/examples/skeleton.cpp                 | 69 +----------------
 plugins/examples/ui_addition_example.cpp      |  1 -
 plugins/lua/skeleton.lua                      | 46 ------------
 6 files changed, 9 insertions(+), 238 deletions(-)
 delete mode 100644 plugins/lua/skeleton.lua

diff --git a/plugins/CMakeLists.txt b/plugins/CMakeLists.txt
index 1e2019091..969d3774a 100644
--- a/plugins/CMakeLists.txt
+++ b/plugins/CMakeLists.txt
@@ -188,7 +188,7 @@ endif()
 # this is the skeleton plugin. If you want to make your own, make a copy and then change it
 option(BUILD_SKELETON "Build the skeleton plugin." OFF)
 if(BUILD_SKELETON)
-    dfhack_plugin(skeleton examples/skeleton.cpp LINK_LIBRARIES lua)
+    dfhack_plugin(skeleton examples/skeleton.cpp)
 endif()
 
 macro(subdirlist result subdir)
diff --git a/plugins/examples/persistent_per_save_example.cpp b/plugins/examples/persistent_per_save_example.cpp
index b620b7703..be2f1730c 100644
--- a/plugins/examples/persistent_per_save_example.cpp
+++ b/plugins/examples/persistent_per_save_example.cpp
@@ -12,7 +12,6 @@
 
 #include "Core.h"
 #include "Debug.h"
-#include "LuaTools.h"
 #include "PluginManager.h"
 
 #include "modules/Persistence.h"
@@ -60,35 +59,6 @@ static void set_config_bool(int index, bool value) {
 
 static int32_t cycle_timestamp = 0;  // world->frame_counter at last cycle
 
-// define the structure that will represent the possible commandline options
-struct command_options {
-    // whether to display help
-    bool help = false;
-
-    // whether to run a cycle right now
-    bool now = false;
-
-    // how many ticks to wait between cycles when enabled, -1 means unset
-    int32_t ticks = -1;
-
-    // example params of different types
-    df::coord start;
-    string format;
-    vector<string*> list; // note this must be a vector of pointers, not objects
-
-    static struct_identity _identity;
-};
-static const struct_field_info command_options_fields[] = {
-    { struct_field_info::PRIMITIVE,      "help",   offsetof(command_options, help),  &df::identity_traits<bool>::identity,    0, 0 },
-    { struct_field_info::PRIMITIVE,      "now",    offsetof(command_options, now),   &df::identity_traits<bool>::identity,    0, 0 },
-    { struct_field_info::PRIMITIVE,      "ticks",  offsetof(command_options, ticks), &df::identity_traits<int32_t>::identity, 0, 0 },
-    { struct_field_info::SUBSTRUCT,      "start",  offsetof(command_options, start), &df::coord::_identity,                   0, 0 },
-    { struct_field_info::PRIMITIVE,      "format", offsetof(command_options, format), df::identity_traits<string>::get(),     0, 0 },
-    { struct_field_info::STL_VECTOR_PTR, "list",   offsetof(command_options, list),   df::identity_traits<string>::get(),     0, 0 },
-    { struct_field_info::END }
-};
-struct_identity command_options::_identity(sizeof(command_options), &df::allocator_fn<command_options>, NULL, "command_options", NULL, command_options_fields);
-
 static command_result do_command(color_ostream &out, vector<string> &parameters);
 static void do_cycle(color_ostream &out);
 
@@ -165,33 +135,6 @@ DFhackCExport command_result plugin_onupdate(color_ostream &out) {
     return CR_OK;
 }
 
-// load the lua module associated with the plugin and parse the commandline
-// in lua (which has better facilities than C++ for string parsing).
-static bool get_options(color_ostream &out,
-                        command_options &opts,
-                        const vector<string> &parameters)
-{
-    auto L = Lua::Core::State;
-    Lua::StackUnwinder top(L);
-
-    if (!lua_checkstack(L, parameters.size() + 2) ||
-        !Lua::PushModulePublic(
-            out, L, ("plugins." + string(plugin_name)).c_str(),
-            "parse_commandline")) {
-        out.printerr("Failed to load %s Lua code\n", plugin_name);
-        return false;
-    }
-
-    Lua::Push(L, &opts);
-    for (const string &param : parameters)
-        Lua::Push(L, param);
-
-    if (!Lua::SafeCall(out, L, parameters.size() + 1, 0))
-        return false;
-
-    return true;
-}
-
 static command_result do_command(color_ostream &out, vector<string> &parameters) {
     // be sure to suspend the core if any DF state is read or modified
     CoreSuspender suspend;
@@ -201,20 +144,11 @@ static command_result do_command(color_ostream &out, vector<string> &parameters)
         return CR_FAILURE;
     }
 
-    command_options opts;
-    if (!get_options(out, opts, parameters) || opts.help)
-        return CR_WRONG_USAGE;
+    // TODO: configuration logic
+    // simple commandline parsing can be done in C++, but there are lua libraries
+    // that can easily handle more complex commandlines. see the blueprint plugin
+    // for an example.
 
-    if (opts.ticks > -1) {
-        set_config_val(CONFIG_CYCLE_TICKS, opts.ticks);
-        INFO(status,out).print("New cycle timer: %d ticks.\n", opts.ticks);
-    }
-    else if (opts.now) {
-        do_cycle(out);
-    }
-    else {
-        out.print("%s is %srunning\n", plugin_name, (is_enabled ? "" : "not "));
-    }
     return CR_OK;
 }
 
diff --git a/plugins/examples/simple_command_example.cpp b/plugins/examples/simple_command_example.cpp
index 0f1aad4f1..7b12a1271 100644
--- a/plugins/examples/simple_command_example.cpp
+++ b/plugins/examples/simple_command_example.cpp
@@ -5,7 +5,6 @@
 #include <vector>
 
 #include "Debug.h"
-#include "LuaTools.h"
 #include "PluginManager.h"
 
 using std::string;
@@ -19,29 +18,6 @@ namespace DFHack {
     DBG_DECLARE(simple_command_example, log);
 }
 
-// define the structure that will represent the possible commandline options
-struct command_options {
-    // whether to display help
-    bool help = false;
-
-    // example params of different types
-    int32_t ticks = -1;
-    df::coord start;
-    string format;
-    vector<string*> list; // note this must be a vector of pointers, not objects
-
-    static struct_identity _identity;
-};
-static const struct_field_info command_options_fields[] = {
-    { struct_field_info::PRIMITIVE,      "help",   offsetof(command_options, help),  &df::identity_traits<bool>::identity,    0, 0 },
-    { struct_field_info::PRIMITIVE,      "ticks",  offsetof(command_options, ticks), &df::identity_traits<int32_t>::identity, 0, 0 },
-    { struct_field_info::SUBSTRUCT,      "start",  offsetof(command_options, start), &df::coord::_identity,                   0, 0 },
-    { struct_field_info::PRIMITIVE,      "format", offsetof(command_options, format), df::identity_traits<string>::get(),     0, 0 },
-    { struct_field_info::STL_VECTOR_PTR, "list",   offsetof(command_options, list),   df::identity_traits<string>::get(),     0, 0 },
-    { struct_field_info::END }
-};
-struct_identity command_options::_identity(sizeof(command_options), &df::allocator_fn<command_options>, NULL, "command_options", NULL, command_options_fields);
-
 static command_result do_command(color_ostream &out, vector<string> &parameters);
 
 DFhackCExport command_result plugin_init(color_ostream &out, std::vector <PluginCommand> &commands) {
@@ -55,41 +31,10 @@ DFhackCExport command_result plugin_init(color_ostream &out, std::vector <Plugin
     return CR_OK;
 }
 
-// load the lua module associated with the plugin and parse the commandline
-// in lua (which has better facilities than C++ for string parsing).
-static bool get_options(color_ostream &out,
-                        command_options &opts,
-                        const vector<string> &parameters)
-{
-    auto L = Lua::Core::State;
-    Lua::StackUnwinder top(L);
-
-    if (!lua_checkstack(L, parameters.size() + 2) ||
-        !Lua::PushModulePublic(
-            out, L, ("plugins." + string(plugin_name)).c_str(),
-            "parse_commandline")) {
-        out.printerr("Failed to load %s Lua code\n", plugin_name);
-        return false;
-    }
-
-    Lua::Push(L, &opts);
-    for (const string &param : parameters)
-        Lua::Push(L, param);
-
-    if (!Lua::SafeCall(out, L, parameters.size() + 1, 0))
-        return false;
-
-    return true;
-}
-
 static command_result do_command(color_ostream &out, vector<string> &parameters) {
     // be sure to suspend the core if any DF state is read or modified
     CoreSuspender suspend;
 
-    command_options opts;
-    if (!get_options(out, opts, parameters) || opts.help)
-        return CR_WRONG_USAGE;
-
     // TODO: command logic
 
     return CR_OK;
diff --git a/plugins/examples/skeleton.cpp b/plugins/examples/skeleton.cpp
index 27621af4a..434a7e7b5 100644
--- a/plugins/examples/skeleton.cpp
+++ b/plugins/examples/skeleton.cpp
@@ -15,7 +15,6 @@
 
 #include "Core.h"
 #include "Debug.h"
-#include "LuaTools.h"
 #include "PluginManager.h"
 
 #include "modules/Persistence.h"
@@ -157,67 +156,6 @@ DFhackCExport command_result plugin_load_data (color_ostream &out) {
     return CR_OK;
 }
 
-// define the structure that will represent the possible commandline options
-struct command_options {
-    // whether to display help
-    bool help = false;
-
-    // whether to run a cycle right now
-    bool now = false;
-
-    // how many ticks to wait between cycles when enabled, -1 means unset
-    int32_t ticks = -1;
-
-    // example params of different types
-    df::coord start;
-    string format;
-    vector<string*> list; // note this must be a vector of pointers, not objects
-
-    static struct_identity _identity;
-};
-static const struct_field_info command_options_fields[] = {
-    { struct_field_info::PRIMITIVE,      "help",   offsetof(command_options, help),  &df::identity_traits<bool>::identity,    0, 0 },
-    { struct_field_info::PRIMITIVE,      "now",    offsetof(command_options, now),   &df::identity_traits<bool>::identity,    0, 0 },
-    { struct_field_info::PRIMITIVE,      "ticks",  offsetof(command_options, ticks), &df::identity_traits<int32_t>::identity, 0, 0 },
-    { struct_field_info::SUBSTRUCT,      "start",  offsetof(command_options, start), &df::coord::_identity,                   0, 0 },
-    { struct_field_info::PRIMITIVE,      "format", offsetof(command_options, format), df::identity_traits<string>::get(),     0, 0 },
-    { struct_field_info::STL_VECTOR_PTR, "list",   offsetof(command_options, list),   df::identity_traits<string>::get(),     0, 0 },
-    { struct_field_info::END }
-};
-struct_identity command_options::_identity(sizeof(command_options), &df::allocator_fn<command_options>, NULL, "command_options", NULL, command_options_fields);
-
-// load the lua module associated with the plugin and parse the commandline
-// in lua (which has better facilities than C++ for string parsing). You should
-// create a file named after your plugin in the plugins/lua directory. This
-// example expects you to define a global function in that file named
-// "parse_commandline" that takes the options struct defined above along with
-// the commandline parameters. It should parse the parameters and set data in
-// the options structure. See plugins/lua/skeleton.lua for an example.
-static bool get_options(color_ostream &out,
-                        command_options &opts,
-                        const vector<string> &parameters)
-{
-    auto L = Lua::Core::State;
-    Lua::StackUnwinder top(L);
-
-    if (!lua_checkstack(L, parameters.size() + 2) ||
-        !Lua::PushModulePublic(
-            out, L, ("plugins." + string(plugin_name)).c_str(),
-            "parse_commandline")) {
-        out.printerr("Failed to load %s Lua code\n", plugin_name);
-        return false;
-    }
-
-    Lua::Push(L, &opts);
-    for (const string &param : parameters)
-        Lua::Push(L, param);
-
-    if (!Lua::SafeCall(out, L, parameters.size() + 1, 0))
-        return false;
-
-    return true;
-}
-
 // This is the callback we registered in plugin_init. Note that while plugin
 // callbacks are called with the core suspended, command callbacks are called
 // from a different thread and need to explicity suspend the core if they
@@ -233,9 +171,10 @@ static command_result command_callback1(color_ostream &out, vector<string> &para
     // Return CR_WRONG_USAGE to print out your help text. The help text is
     // sourced from the associated rst file in docs/plugins/. The same help will
     // also be returned by 'help your-command'.
-    command_options opts;
-    if (!get_options(out, opts, parameters) || opts.help)
-        return CR_WRONG_USAGE;
+
+    // simple commandline parsing can be done in C++, but there are lua libraries
+    // that can easily handle more complex commandlines. see the blueprint plugin
+    // for an example.
 
     // TODO: do something according to the flags set in the options struct
 
diff --git a/plugins/examples/ui_addition_example.cpp b/plugins/examples/ui_addition_example.cpp
index 43350a159..bbd3af3de 100644
--- a/plugins/examples/ui_addition_example.cpp
+++ b/plugins/examples/ui_addition_example.cpp
@@ -10,7 +10,6 @@
 #include "df/viewscreen_titlest.h"
 
 #include "Debug.h"
-#include "LuaTools.h"
 #include "PluginManager.h"
 #include "VTableInterpose.h"
 
diff --git a/plugins/lua/skeleton.lua b/plugins/lua/skeleton.lua
deleted file mode 100644
index 60af229cc..000000000
--- a/plugins/lua/skeleton.lua
+++ /dev/null
@@ -1,46 +0,0 @@
-local _ENV = mkmodule('plugins.skeleton')
-
-local argparse = require('argparse')
-local utils = require('utils')
-
-local VALID_FORMATS = utils.invert{'pretty', 'normal', 'ugly'}
-
-local function do_commandline(opts, args)
-    print(('called with %d arguments:'):format(#args))
-    for _,arg in ipairs(args) do
-        print('  ' .. arg)
-    end
-
-    local positionals = argparse.processArgsGetopt(args, {
-            {'t', 'ticks', hasArg=true,
-             handler=function(arg) opts.ticks =
-                    argparse.check_positive_int(arg, 'ticks') end},
-            {'s', 'start', hasArg=true,
-             handler=function(arg) utils.assign(
-                    opts.start, argpars.coors(arg, 'start')) end},
-            {'h', 'help', handler=function() opts.help = true end},
-            {'f', 'format', hasArg=true,
-             handler=function(arg) opts.format = arg end},
-            {'z', 'cur-zlevel', handler=function() use_zlevel = true end},
-        })
-
-    if positionals[1] == 'help' then opts.help = true end
-    if opts.help then return end
-
-    if positionals[1] == 'now' then
-        opts.now = true
-    end
-
-    if #opts.format > 0 and not VALID_FORMATS[opts.format] then
-        qerror(('invalid format name: "%s"'):format(opts.format))
-    end
-end
-
-function parse_commandline(opts, ...)
-    do_commandline(opts, {...})
-
-    print('populated options data structure:')
-    printall_recurse(opts)
-end
-
-return _ENV

From 23ced99131c24616591794d334bdc252c5b6cd3c Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Wed, 3 Aug 2022 00:30:46 -0700
Subject: [PATCH 495/854] fix call to new functions in existing coord fn

---
 library/lua/argparse.lua | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/library/lua/argparse.lua b/library/lua/argparse.lua
index a143f454c..e094bbb57 100644
--- a/library/lua/argparse.lua
+++ b/library/lua/argparse.lua
@@ -186,9 +186,9 @@ function coords(arg, arg_name, skip_validation)
         return cursor
     end
     local numbers = numberList(arg, arg_name, 3)
-    local pos = xyz2pos(check_nonnegative_int(numbers[1]),
-                        check_nonnegative_int(numbers[2]),
-                        check_nonnegative_int(numbers[3]))
+    local pos = xyz2pos(nonnegativeInt(numbers[1]),
+                        nonnegativeInt(numbers[2]),
+                        nonnegativeInt(numbers[3]))
     if not skip_validation and not dfhack.maps.isValidTilePos(pos) then
         arg_error(arg_name,
                   'specified coordinates not on current map: "%s"', arg)

From 06f1f533acd93c349c059cae3376a9df5d80c93c Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Wed, 3 Aug 2022 00:33:24 -0700
Subject: [PATCH 496/854] build the skeleton in the "all plugins" build

---
 .github/workflows/build.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index bef01888f..e922ecaca 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -86,6 +86,7 @@ jobs:
           -DBUILD_TESTS:BOOL=ON \
           -DBUILD_DEV_PLUGINS:BOOL=${{ matrix.plugins == 'all' }} \
           -DBUILD_SIZECHECK:BOOL=${{ matrix.plugins == 'all' }} \
+          -DBUILD_SKELETON:BOOL=${{ matrix.plugins == 'all' }} \
           -DBUILD_STONESENSE:BOOL=${{ matrix.plugins == 'all' }} \
           -DBUILD_SUPPORTED:BOOL=1 \
           -DCMAKE_C_COMPILER_LAUNCHER=ccache \

From f400ee50f87b8a4041fec0adc39db4d96afd688d Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Wed, 3 Aug 2022 16:18:22 -0700
Subject: [PATCH 497/854] refine docs, logging, help text

---
 docs/Dev-intro.rst                            |  2 +-
 .../examples/persistent_per_save_example.cpp  |  2 +-
 plugins/examples/skeleton.cpp                 | 63 +++++++++++--------
 3 files changed, 38 insertions(+), 29 deletions(-)

diff --git a/docs/Dev-intro.rst b/docs/Dev-intro.rst
index d4167aae3..c87154594 100644
--- a/docs/Dev-intro.rst
+++ b/docs/Dev-intro.rst
@@ -35,7 +35,7 @@ other commands).
 
 Plugins can also register handlers to run on every tick, and can interface with
 the built-in `enable` and `disable` commands. For the full plugin API, see the
-example plugins or ``PluginManager.cpp``.
+example ``skeleton`` plugin or ``PluginManager.cpp``.
 
 Installed plugins live in the ``hack/plugins`` folder of a DFHack installation,
 and the `load` family of commands can be used to load a recompiled plugin
diff --git a/plugins/examples/persistent_per_save_example.cpp b/plugins/examples/persistent_per_save_example.cpp
index be2f1730c..5a7bf5224 100644
--- a/plugins/examples/persistent_per_save_example.cpp
+++ b/plugins/examples/persistent_per_save_example.cpp
@@ -119,7 +119,7 @@ DFhackCExport command_result plugin_load_data (color_ostream &out) {
 }
 
 DFhackCExport command_result plugin_onstatechange(color_ostream &out, state_change_event event) {
-    if (event == DFHack::SC_MAP_UNLOADED) {
+    if (event == DFHack::SC_WORLD_UNLOADED) {
         if (is_enabled) {
             DEBUG(status,out).print("world unloaded; disabling %s\n",
                                     plugin_name);
diff --git a/plugins/examples/skeleton.cpp b/plugins/examples/skeleton.cpp
index 434a7e7b5..e8553bdd6 100644
--- a/plugins/examples/skeleton.cpp
+++ b/plugins/examples/skeleton.cpp
@@ -98,31 +98,37 @@ DFhackCExport command_result plugin_enable(color_ostream &out, bool enable) {
 // Invoked with DF suspended, and always before the matching plugin_onupdate.
 // More event codes may be added in the future.
 DFhackCExport command_result plugin_onstatechange(color_ostream &out, state_change_event event) {
-    DEBUG(status,out).print("game state changed: %d\n", event);
-
-    if (is_enabled) {
-        switch (event) {
-            case SC_UNKNOWN:
-                break;
-            case SC_WORLD_LOADED:
-                break;
-            case SC_WORLD_UNLOADED:
-                break;
-            case SC_MAP_LOADED:
-                break;
-            case SC_MAP_UNLOADED:
-                break;
-            case SC_VIEWSCREEN_CHANGED:
-                break;
-            case SC_CORE_INITIALIZED:
-                break;
-            case SC_BEGIN_UNLOAD:
-                break;
-            case SC_PAUSED:
-                break;
-            case SC_UNPAUSED:
-                break;
-        }
+    switch (event) {
+        case SC_UNKNOWN:
+            DEBUG(status,out).print("game state changed: SC_UNKNOWN\n");
+            break;
+        case SC_WORLD_LOADED:
+            DEBUG(status,out).print("game state changed: SC_WORLD_LOADED\n");
+            break;
+        case SC_WORLD_UNLOADED:
+            DEBUG(status,out).print("game state changed: SC_WORLD_UNLOADED\n");
+            break;
+        case SC_MAP_LOADED:
+            DEBUG(status,out).print("game state changed: SC_MAP_LOADED\n");
+            break;
+        case SC_MAP_UNLOADED:
+            DEBUG(status,out).print("game state changed: SC_MAP_UNLOADED\n");
+            break;
+        case SC_VIEWSCREEN_CHANGED:
+            DEBUG(status,out).print("game state changed: SC_VIEWSCREEN_CHANGED\n");
+            break;
+        case SC_CORE_INITIALIZED:
+            DEBUG(status,out).print("game state changed: SC_CORE_INITIALIZED\n");
+            break;
+        case SC_BEGIN_UNLOAD:
+            DEBUG(status,out).print("game state changed: SC_BEGIN_UNLOAD\n");
+            break;
+        case SC_PAUSED:
+            DEBUG(status,out).print("game state changed: SC_PAUSED\n");
+            break;
+        case SC_UNPAUSED:
+            DEBUG(status,out).print("game state changed: SC_UNPAUSED\n");
+            break;
     }
 
     return CR_OK;
@@ -145,14 +151,17 @@ DFhackCExport command_result plugin_onupdate (color_ostream &out) {
 DFhackCExport command_result plugin_save_data (color_ostream &out) {
     DEBUG(status,out).print("save or unload is imminent; time to persist state\n");
 
-    // Call functions in the Persistence module here.
+    // Call functions in the Persistence module here. If your PersistantDataItem
+    // objects are already up to date, then they will get persisted with the
+    // save automatically and there is nothing extra you need to do here.
     return CR_OK;
 }
 
 DFhackCExport command_result plugin_load_data (color_ostream &out) {
     DEBUG(status,out).print("world is loading; time to load persisted state\n");
 
-    // Call functions in the Persistence module here.
+    // Call functions in the Persistence module here. See
+    // persistent_per_save_example.cpp for an example.
     return CR_OK;
 }
 

From b2a4f10c2292255f28ce607d670be912687b5787 Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Wed, 3 Aug 2022 21:43:07 -0700
Subject: [PATCH 498/854] output onupdate log messages by default

but include info on how to make it stop
---
 plugins/examples/skeleton.cpp | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/plugins/examples/skeleton.cpp b/plugins/examples/skeleton.cpp
index e8553bdd6..539d84b1a 100644
--- a/plugins/examples/skeleton.cpp
+++ b/plugins/examples/skeleton.cpp
@@ -50,8 +50,8 @@ REQUIRE_GLOBAL(world);
 namespace DFHack {
     // for configuration-related logging
     DBG_DECLARE(skeleton, status, DebugCategory::LDEBUG);
-    // run `debugfilter set debug skeleton onupdate` to see logging in plugin_onupdate
-    DBG_DECLARE(skeleton, onupdate, DebugCategory::LINFO);
+    // for plugin_onupdate logging
+    DBG_DECLARE(skeleton, onupdate, DebugCategory::LDEBUG);
     // for command-related logging
     DBG_DECLARE(skeleton, command, DebugCategory::LDEBUG);
 }
@@ -138,7 +138,9 @@ DFhackCExport command_result plugin_onstatechange(color_ostream &out, state_chan
 // Note that if the plugin implements the enabled API, this function is only called
 // if the plugin is enabled.
 DFhackCExport command_result plugin_onupdate (color_ostream &out) {
-    DEBUG(onupdate,out).print("onupdate called\n");
+    DEBUG(onupdate,out).print(
+        "onupdate called (run 'debugfilter set info skeleton onupdate' to stop"
+        " seeing these messages)\n");
 
     return CR_OK;
 }

From 6abec116b5494cd493b6034884a9224c2819d06f Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Mon, 8 Aug 2022 10:19:18 -0700
Subject: [PATCH 499/854] add seed values for command usage frequency

based on the tool popularity survey responses, with some builtin
commands that could not be represented on the survey boosted so they
appear higher
---
 data/CMakeLists.txt           |   3 +
 data/base_command_counts.json | 145 ++++++++++++++++++++++++++++++++++
 2 files changed, 148 insertions(+)
 create mode 100644 data/base_command_counts.json

diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt
index ea88d4473..412ffa347 100644
--- a/data/CMakeLists.txt
+++ b/data/CMakeLists.txt
@@ -1,6 +1,9 @@
 install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/init/
         DESTINATION "${DFHACK_DATA_DESTINATION}/init")
 
+install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/base_command_counts.json
+        DESTINATION "${DFHACK_DATA_DESTINATION}/data/base_command_counts.json")
+
 install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/quickfort/
         DESTINATION "${DFHACK_DATA_DESTINATION}/data/quickfort")
 
diff --git a/data/base_command_counts.json b/data/base_command_counts.json
new file mode 100644
index 000000000..6acfda21b
--- /dev/null
+++ b/data/base_command_counts.json
@@ -0,0 +1,145 @@
+{
+	"manipulator": 75,
+	"autolabor": 59,
+	"reveal": 51,
+	"help": 50,
+	"ls": 50,
+	"die": 50,
+	"tags": 50,
+	"embark-assistant": 42,
+	"prospect": 37,
+	"autodump": 36,
+	"clean": 35,
+	"gui/workflow": 28,
+	"workflow": 28,
+	"exportlegends": 26,
+	"gui/autobutcher": 25,
+	"autobutcher": 25,
+	"digv": 24,
+	"fastdwarf": 22,
+	"autonestbox": 20,
+	"showmood": 19,
+	"gui/liquids": 18,
+	"liquids": 18,
+	"search": 18,
+	"gui/quickfort": 15,
+	"quickfort": 15,
+	"createitem": 14,
+	"stocks": 14,
+	"autofarm": 12,
+	"autochop": 12,
+	"tiletypes": 12,
+	"exterminate": 12,
+	"buildingplan": 12,
+	"quicksave": 11,
+	"gui/gm-editor": 11,
+	"cleanowned": 10,
+	"gui/autogems": 9,
+	"autogems": 9,
+	"stonesense": 9,
+	"gui/stockpiles": 8,
+	"stockpiles": 8,
+	"changevein": 8,
+	"gui/teleport": 7,
+	"teleport": 7,
+	"seedwatch": 6,
+	"automelt": 6,
+	"embark-tools": 6,
+	"cursecheck": 5,
+	"open-legends": 5,
+	"ban-cooking": 5,
+	"burial": 5,
+	"automaterial": 5,
+	"remove-stress": 5,
+	"gui/blueprint": 5,
+	"blueprint": 5,
+	"tailor": 4,
+	"startdwarf": 4,
+	"3dveins": 4,
+	"digcircle": 4,
+	"nestboxes": 3,
+	"deathcause": 3,
+	"list-agreements": 3,
+	"gui/room-list": 3,
+	"points": 3,
+	"region-pops": 3,
+	"gui/advfort": 3,
+	"unsuspend": 3,
+	"locate-ore": 3,
+	"changelayer": 3,
+	"source": 3,
+	"gui/gm-unit": 3,
+	"combine-drinks": 3,
+	"combine-plants": 3,
+	"deteriorate": 3,
+	"warn-starving": 3,
+	"gaydar": 2,
+	"gui/dfstatus": 2,
+	"gui/rename": 2,
+	"rename": 2,
+	"fix-ster": 2,
+	"job-material": 2,
+	"stockflow": 2,
+	"drain-aquifer": 2,
+	"full-heal": 2,
+	"spawnunit": 2,
+	"flashstep": 2,
+	"gui/family-affairs": 2,
+	"caravan": 2,
+	"mousequery": 2,
+	"tweak": 2,
+	"confirm": 2,
+	"autoclothing": 1,
+	"autounsuspend": 1,
+	"prioritize": 1,
+	"dwarfmonitor": 1,
+	"show-unit-syndromes": 1,
+	"troubleshoot-item": 1,
+	"gui/mechanisms": 1,
+	"gui/pathable": 1,
+	"hotkeys": 1,
+	"infiniteSky": 1,
+	"force": 1,
+	"hermit": 1,
+	"strangemood": 1,
+	"weather": 1,
+	"add-recipe": 1,
+	"autotrade": 1,
+	"zone": 1,
+	"autonick": 1,
+	"stripcaged": 1,
+	"unforbid": 1,
+	"workorder": 1,
+	"gui/mod-manager": 1,
+	"spotclean": 1,
+	"plant": 1,
+	"regrass": 1,
+	"dig-now": 1,
+	"build-now": 1,
+	"clear-webs": 1,
+	"gui/siege-engine": 1,
+	"assign-skills": 1,
+	"brainwash": 1,
+	"elevate-mental": 1,
+	"elevate-physical": 1,
+	"launch": 1,
+	"linger": 1,
+	"make-legendary": 1,
+	"rejuvenate": 1,
+	"resurrect-adv": 1,
+	"questport": 1,
+	"getplants": 1,
+	"gui/stamper": 1,
+	"tweak": 1,
+	"fixveins": 1,
+	"deramp": 1,
+	"fix/dead-units": 1,
+	"fix/fat-dwarves": 1,
+	"fix/loyaltycascade": 1,
+	"fix/retrieve-units": 1,
+	"tweak": 1,
+	"sort-items": 1,
+	"gui/color-schemes": 1,
+	"color-schemes": 1,
+	"season-palette": 1
+}

From 214dd3c57938cfbce0cc52983608b5978685f92a Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Mon, 11 Jul 2022 17:23:23 -0700
Subject: [PATCH 500/854] reset scroll position when the text is changed

---
 library/lua/gui/widgets.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/library/lua/gui/widgets.lua b/library/lua/gui/widgets.lua
index ddd5a01d0..fcf6d4733 100644
--- a/library/lua/gui/widgets.lua
+++ b/library/lua/gui/widgets.lua
@@ -473,7 +473,6 @@ Label.ATTRS{
 }
 
 function Label:init(args)
-    self.start_line_num = 1
     -- use existing saved text if no explicit text was specified. this avoids
     -- overwriting pre-formatted text that subclasses may have already set
     self:setText(args.text or self.text)
@@ -483,6 +482,7 @@ function Label:init(args)
 end
 
 function Label:setText(text)
+    self.start_line_num = 1
     self.text = text
     parse_label_text(self)
 

From 43b1abcdcf4e69b724cf44b3038029d4d012a990 Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Fri, 15 Jul 2022 13:46:01 -0700
Subject: [PATCH 501/854] support submit2 for EditFields

---
 docs/Lua API.rst            |  1 +
 library/lua/gui/widgets.lua | 12 ++++++++++++
 2 files changed, 13 insertions(+)

diff --git a/docs/Lua API.rst b/docs/Lua API.rst
index d1dbc2856..30dc65744 100644
--- a/docs/Lua API.rst	
+++ b/docs/Lua API.rst	
@@ -3880,6 +3880,7 @@ Attributes:
           If it returns false, the character is ignored.
 :on_change: Change notification callback; used as ``on_change(new_text,old_text)``.
 :on_submit: Enter key callback; if set the field will handle the key and call ``on_submit(text)``.
+:on_submit2: Shift-Enter key callback; if set the field will handle the key and call ``on_submit2(text)``.
 :key: If specified, the field is disabled until this key is pressed. Must be given as a string.
 :key_sep: If specified, will be used to customize how the activation key is
           displayed. See ``token.key_sep`` in the ``Label`` documentation below.
diff --git a/library/lua/gui/widgets.lua b/library/lua/gui/widgets.lua
index fcf6d4733..da5e2c37e 100644
--- a/library/lua/gui/widgets.lua
+++ b/library/lua/gui/widgets.lua
@@ -184,6 +184,7 @@ EditField.ATTRS{
     on_char = DEFAULT_NIL,
     on_change = DEFAULT_NIL,
     on_submit = DEFAULT_NIL,
+    on_submit2 = DEFAULT_NIL,
     key = DEFAULT_NIL,
     key_sep = DEFAULT_NIL,
     frame = {h=1},
@@ -257,6 +258,17 @@ function EditField:onInput(keys)
         return not not self.key
     end
 
+    if keys.SEC_SELECT then
+        if self.key then
+            self:setFocus(false)
+        end
+        if self.on_submit2 then
+            self.on_submit2(self.text)
+            return true
+        end
+        return not not self.key
+    end
+
     if keys._STRING then
         local old = self.text
         if keys._STRING == 0 then

From 0aa9a187cff8552be3b889ed5151262d8a7dc9e9 Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Fri, 15 Jul 2022 22:22:51 -0700
Subject: [PATCH 502/854] support cursor movement in EditFields

---
 docs/Lua API.rst            |  7 ++++
 library/lua/gui/widgets.lua | 73 +++++++++++++++++++++++++++++++------
 2 files changed, 68 insertions(+), 12 deletions(-)

diff --git a/docs/Lua API.rst b/docs/Lua API.rst
index 30dc65744..16cceb0ab 100644
--- a/docs/Lua API.rst	
+++ b/docs/Lua API.rst	
@@ -3902,6 +3902,13 @@ and then call the ``on_submit`` callback. Pressing the Escape key will also
 release keyboard focus, but first it will restore the text that was displayed
 before the ``EditField`` gained focus and then call the ``on_change`` callback.
 
+The ``EditField`` cursor can be moved to where you want to insert/remove text.
+The following cursor movement keys are recognized:
+
+- Left/Right arrow: move the cursor one character to the left or right.
+- Ctrl-Left/Right arrow: move the cursor one word to the left or right.
+- Alt-Left/Right arrow: move the cursor to the beginning/end of the text.
+
 Label class
 -----------
 
diff --git a/library/lua/gui/widgets.lua b/library/lua/gui/widgets.lua
index da5e2c37e..d09bdf9cd 100644
--- a/library/lua/gui/widgets.lua
+++ b/library/lua/gui/widgets.lua
@@ -197,6 +197,8 @@ function EditField:init()
         self:setFocus(true)
     end
 
+    self.cursor = 1
+
     self:addviews{HotkeyLabel{frame={t=0,l=0},
                               key=self.key,
                               key_sep=self.key_sep,
@@ -208,8 +210,17 @@ function EditField:getPreferredFocusState()
     return not self.key
 end
 
+function EditField:setCursor(cursor)
+    if not cursor or cursor > #self.text then
+        self.cursor = #self.text + 1
+        return
+    end
+    self.cursor = math.max(1, cursor)
+end
+
 function EditField:setText(text, cursor)
     self.text = text
+    self:setCursor(cursor)
 end
 
 function EditField:postUpdateLayout()
@@ -219,14 +230,29 @@ end
 function EditField:onRenderBody(dc)
     dc:pen(self.text_pen or COLOR_LIGHTCYAN):fill(0,0,dc.width-1,0)
 
-    local cursor = '_'
+    local cursor_char = '_'
     if not self.active or not self.focus or gui.blink_visible(300) then
-        cursor = ' '
+        cursor_char = (self.cursor > #self.text) and ' ' or
+                                        self.text:sub(self.cursor, self.cursor)
     end
-    local txt = self.text .. cursor
+    local txt = self.text:sub(1, self.cursor - 1) .. cursor_char ..
+                                                self.text:sub(self.cursor + 1)
     local max_width = dc.width - self.text_offset
     if #txt > max_width then
-        txt = string.char(27)..string.sub(txt, #txt-max_width+2)
+        -- get the substring in the vicinity of the cursor
+        max_width = max_width - 2
+        local half_width = math.floor(max_width/2)
+        local start_pos = math.max(1, self.cursor-half_width)
+        local end_pos = math.min(#txt, self.cursor+half_width-1)
+        if self.cursor + half_width > #txt then
+            start_pos = #txt - max_width
+        end
+        if self.cursor - half_width <= 1 then
+            end_pos = max_width + 1
+        end
+        txt = ('%s%s%s'):format(start_pos == 1 and '' or string.char(27),
+                                txt:sub(start_pos, end_pos),
+                                end_pos == #txt and '' or string.char(26))
     end
     dc:advance(self.text_offset):string(txt)
 end
@@ -256,9 +282,7 @@ function EditField:onInput(keys)
             return true
         end
         return not not self.key
-    end
-
-    if keys.SEC_SELECT then
+    elseif keys.SEC_SELECT then
         if self.key then
             self:setFocus(false)
         end
@@ -267,17 +291,42 @@ function EditField:onInput(keys)
             return true
         end
         return not not self.key
-    end
-
-    if keys._STRING then
+    elseif keys.CURSOR_LEFT then
+        self.cursor = math.max(1, self.cursor - 1)
+        return true
+    elseif keys.A_MOVE_W_DOWN then -- Ctrl-Left (prev word start)
+        local _, prev_word_start = self.text:sub(1, self.cursor-1):
+                                                    find('.*[^%w_%-]+[%w_%-]')
+        self.cursor = prev_word_start or 1
+        return true
+    elseif keys.A_CARE_MOVE_W then -- Alt-Left (home)
+        self.cursor = 1
+        return true
+    elseif keys.CURSOR_RIGHT then
+        self.cursor = math.min(self.cursor + 1, #self.text + 1)
+        return true
+    elseif keys.A_MOVE_E_DOWN then -- Ctrl-Right (next word end)
+        local _, next_word_end = self.text:find('[%w_%-]+[^%w_%-]', self.cursor)
+        self.cursor = next_word_end or #self.text + 1
+        return true
+    elseif keys.A_CARE_MOVE_E then -- Alt-Right (end)
+        self.cursor = #self.text + 1
+        return true
+    elseif keys._STRING then
         local old = self.text
         if keys._STRING == 0 then
             -- handle backspace
-            self.text = string.sub(old, 1, #old-1)
+            local del_pos = self.cursor - 1
+            if del_pos > 0 then
+                self.text = old:sub(1, del_pos-1) .. old:sub(del_pos+1)
+                self.cursor = del_pos
+            end
         else
             local cv = string.char(keys._STRING)
             if not self.on_char or self.on_char(cv, old) then
-                self.text = old .. cv
+                self.text = old:sub(1, self.cursor-1) .. cv ..
+                                                        old:sub(self.cursor)
+                self.cursor = self.cursor + 1
             end
         end
         if self.on_change and self.text ~= old then

From 1dd3d6656b2125ce7f95cb0d00611a01aee6766b Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Sat, 16 Jul 2022 22:03:39 -0700
Subject: [PATCH 503/854] move the cursor in an EditField on mouse lclick

---
 library/lua/gui/widgets.lua | 29 +++++++++++++++++------------
 1 file changed, 17 insertions(+), 12 deletions(-)

diff --git a/library/lua/gui/widgets.lua b/library/lua/gui/widgets.lua
index d09bdf9cd..2dc197064 100644
--- a/library/lua/gui/widgets.lua
+++ b/library/lua/gui/widgets.lua
@@ -265,7 +265,7 @@ function EditField:onInput(keys)
 
     if self.key and keys.LEAVESCREEN then
         local old = self.text
-        self.text = self.saved_text
+        self:setText(self.saved_text)
         if self.on_change and old ~= self.saved_text then
             self.on_change(self.text, old)
         end
@@ -291,26 +291,32 @@ function EditField:onInput(keys)
             return true
         end
         return not not self.key
+    elseif keys._MOUSE_L then
+        local mouse_x, mouse_y = self:getMousePos()
+        if mouse_x then
+            self:setCursor(mouse_x)
+            return true
+        end
     elseif keys.CURSOR_LEFT then
-        self.cursor = math.max(1, self.cursor - 1)
+        self:setCursor(self.cursor - 1)
         return true
     elseif keys.A_MOVE_W_DOWN then -- Ctrl-Left (prev word start)
         local _, prev_word_start = self.text:sub(1, self.cursor-1):
                                                     find('.*[^%w_%-]+[%w_%-]')
-        self.cursor = prev_word_start or 1
+        self:setCursor(prev_word_start or 1)
         return true
     elseif keys.A_CARE_MOVE_W then -- Alt-Left (home)
-        self.cursor = 1
+        self:setCursor(1)
         return true
     elseif keys.CURSOR_RIGHT then
-        self.cursor = math.min(self.cursor + 1, #self.text + 1)
+        self:setCursor(self.cursor + 1)
         return true
     elseif keys.A_MOVE_E_DOWN then -- Ctrl-Right (next word end)
         local _, next_word_end = self.text:find('[%w_%-]+[^%w_%-]', self.cursor)
-        self.cursor = next_word_end or #self.text + 1
+        self:setCursor(next_word_end)
         return true
     elseif keys.A_CARE_MOVE_E then -- Alt-Right (end)
-        self.cursor = #self.text + 1
+        self:setCursor()
         return true
     elseif keys._STRING then
         local old = self.text
@@ -318,15 +324,14 @@ function EditField:onInput(keys)
             -- handle backspace
             local del_pos = self.cursor - 1
             if del_pos > 0 then
-                self.text = old:sub(1, del_pos-1) .. old:sub(del_pos+1)
-                self.cursor = del_pos
+                self:setText(old:sub(1, del_pos-1) .. old:sub(del_pos+1),
+                             del_pos)
             end
         else
             local cv = string.char(keys._STRING)
             if not self.on_char or self.on_char(cv, old) then
-                self.text = old:sub(1, self.cursor-1) .. cv ..
-                                                        old:sub(self.cursor)
-                self.cursor = self.cursor + 1
+                self:setText(old:sub(1,self.cursor-1)..cv..old:sub(self.cursor),
+                             self.cursor + 1)
             end
         end
         if self.on_change and self.text ~= old then

From b7f74fe2ce5735d16fd913b68e3a4f031146b851 Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Sat, 16 Jul 2022 22:18:38 -0700
Subject: [PATCH 504/854] allow mouse lclick to select a List item

---
 library/lua/gui/widgets.lua | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/library/lua/gui/widgets.lua b/library/lua/gui/widgets.lua
index 2dc197064..d6505d862 100644
--- a/library/lua/gui/widgets.lua
+++ b/library/lua/gui/widgets.lua
@@ -1019,6 +1019,15 @@ function List:onInput(keys)
     elseif self.on_submit2 and keys.SEC_SELECT then
         self:submit2()
         return true
+    elseif keys._MOUSE_L then
+        local _, mouse_y = self:getMousePos()
+        if mouse_y and #self.choices > 0 and
+                mouse_y < (#self.choices-self.page_top+1) * self.row_height then
+            local idx = self.page_top + math.floor(mouse_y/self.row_height)
+            self:setSelected(idx)
+            self:submit()
+            return true
+        end
     else
         for k,v in pairs(self.scroll_keys) do
             if keys[k] then

From 8de8b225666a93e9346eabc56a6b052893e6730e Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Sun, 17 Jul 2022 15:43:58 -0700
Subject: [PATCH 505/854] click to correct cursor position on long strings

where the left side of the string has been trimmed
---
 library/lua/gui/widgets.lua | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/library/lua/gui/widgets.lua b/library/lua/gui/widgets.lua
index d6505d862..f4573a185 100644
--- a/library/lua/gui/widgets.lua
+++ b/library/lua/gui/widgets.lua
@@ -197,6 +197,7 @@ function EditField:init()
         self:setFocus(true)
     end
 
+    self.start_pos = 1
     self.cursor = 1
 
     self:addviews{HotkeyLabel{frame={t=0,l=0},
@@ -238,6 +239,7 @@ function EditField:onRenderBody(dc)
     local txt = self.text:sub(1, self.cursor - 1) .. cursor_char ..
                                                 self.text:sub(self.cursor + 1)
     local max_width = dc.width - self.text_offset
+    self.start_pos = 1
     if #txt > max_width then
         -- get the substring in the vicinity of the cursor
         max_width = max_width - 2
@@ -245,11 +247,12 @@ function EditField:onRenderBody(dc)
         local start_pos = math.max(1, self.cursor-half_width)
         local end_pos = math.min(#txt, self.cursor+half_width-1)
         if self.cursor + half_width > #txt then
-            start_pos = #txt - max_width
+            start_pos = #txt - (max_width - 1)
         end
         if self.cursor - half_width <= 1 then
             end_pos = max_width + 1
         end
+        self.start_pos = start_pos > 1 and start_pos - 1 or start_pos
         txt = ('%s%s%s'):format(start_pos == 1 and '' or string.char(27),
                                 txt:sub(start_pos, end_pos),
                                 end_pos == #txt and '' or string.char(26))
@@ -294,7 +297,7 @@ function EditField:onInput(keys)
     elseif keys._MOUSE_L then
         local mouse_x, mouse_y = self:getMousePos()
         if mouse_x then
-            self:setCursor(mouse_x)
+            self:setCursor(self.start_pos + mouse_x)
             return true
         end
     elseif keys.CURSOR_LEFT then

From 4e382c7b3b543193722a853d13a5e303309166c9 Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Sun, 17 Jul 2022 16:04:36 -0700
Subject: [PATCH 506/854] make HotkeyLabels react to clicking

also be better about initializing EditField frame height
---
 library/lua/gui/widgets.lua | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/library/lua/gui/widgets.lua b/library/lua/gui/widgets.lua
index f4573a185..aea62bf87 100644
--- a/library/lua/gui/widgets.lua
+++ b/library/lua/gui/widgets.lua
@@ -187,10 +187,14 @@ EditField.ATTRS{
     on_submit2 = DEFAULT_NIL,
     key = DEFAULT_NIL,
     key_sep = DEFAULT_NIL,
-    frame = {h=1},
     modal = false,
 }
 
+function EditField:preinit(init_table)
+    local frame = init_table.frame or {}
+    frame.h = frame.h or 1
+end
+
 function EditField:init()
     local function on_activate()
         self.saved_text = self.text
@@ -744,6 +748,16 @@ function HotkeyLabel:init()
                   on_activate=self.on_activate}}
 end
 
+function HotkeyLabel:onInput(keys)
+    if HotkeyLabel.super.onInput(self, keys) then
+        return true
+    elseif keys._MOUSE_L and self:getMousePos() then
+        self.on_activate()
+        return true
+    end
+
+end
+
 ----------------------
 -- CycleHotkeyLabel --
 ----------------------

From a5af5a13739b37cc2b9e5afd379de8fe60df8d3b Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Wed, 20 Jul 2022 15:36:17 -0700
Subject: [PATCH 507/854] don't bork on no frame, set cursor to end of text

---
 library/lua/gui/widgets.lua | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/library/lua/gui/widgets.lua b/library/lua/gui/widgets.lua
index aea62bf87..5765992af 100644
--- a/library/lua/gui/widgets.lua
+++ b/library/lua/gui/widgets.lua
@@ -121,12 +121,12 @@ ResizingPanel = defclass(ResizingPanel, Panel)
 -- adjust our frame dimensions according to positions and sizes of our subviews
 function ResizingPanel:postUpdateLayout(frame_body)
     local w, h = 0, 0
-    for _,subview in ipairs(self.subviews) do
-        if subview.visible then
-            w = math.max(w, (subview.frame.l or 0) +
-                            (subview.frame.w or frame_body.width))
-            h = math.max(h, (subview.frame.t or 0) +
-                            (subview.frame.h or frame_body.height))
+    for _,s in ipairs(self.subviews) do
+        if s.visible then
+            w = math.max(w, (s.frame and s.frame.l or 0) +
+                            (s.frame and s.frame.w or frame_body.width))
+            h = math.max(h, (s.frame and s.frame.t or 0) +
+                            (s.frame and s.frame.h or frame_body.height))
         end
     end
     if not self.frame then self.frame = {} end
@@ -191,8 +191,8 @@ EditField.ATTRS{
 }
 
 function EditField:preinit(init_table)
-    local frame = init_table.frame or {}
-    frame.h = frame.h or 1
+    init_table.frame = init_table.frame or {}
+    init_table.frame.h = init_table.frame.h or 1
 end
 
 function EditField:init()
@@ -202,7 +202,7 @@ function EditField:init()
     end
 
     self.start_pos = 1
-    self.cursor = 1
+    self.cursor = #self.text + 1
 
     self:addviews{HotkeyLabel{frame={t=0,l=0},
                               key=self.key,

From 79b6cd13e937381aa12ad5fdc3894f9153133262 Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Sat, 6 Aug 2022 23:48:25 -0700
Subject: [PATCH 508/854] support scrolling by half pages in Label

---
 docs/Lua API.rst                   | 17 ++++++++---
 library/lua/gui/widgets.lua        | 18 ++++++++----
 test/library/gui/widgets.Label.lua | 46 ++++++++++++++++++++++++++++--
 3 files changed, 69 insertions(+), 12 deletions(-)

diff --git a/docs/Lua API.rst b/docs/Lua API.rst
index 16cceb0ab..369fd0260 100644
--- a/docs/Lua API.rst	
+++ b/docs/Lua API.rst	
@@ -3925,11 +3925,14 @@ It has the following attributes:
 :auto_width: Sets self.frame.w from the text width.
 :on_click: A callback called when the label is clicked (optional)
 :on_rclick: A callback called when the label is right-clicked (optional)
-:scroll_keys: Specifies which keys the label should react to as a table. Default is ``STANDARDSCROLL`` (up or down arrows, page up or down).
+:scroll_keys: Specifies which keys the label should react to as a table. The table should map
+    keys to the number of lines to scroll as positive or negative integers or one of the keywords
+    supported by the ``scroll`` method. The default is up/down arrows scrolling by one line and page
+    up/down scrolling by one page.
 :show_scroll_icons: Controls scroll icons' behaviour: ``false`` for no icons, ``'right'`` or ``'left'`` for
-     icons next to the text in an additional column (``frame_inset`` is adjusted to have ``.r`` or ``.l`` greater than ``0``),
-     ``nil`` same as ``'right'`` but changes ``frame_inset`` only if a scroll icon is actually necessary
-     (if ``getTextHeight()`` is greater than ``frame_body.height``). Default is ``nil``.
+    icons next to the text in an additional column (``frame_inset`` is adjusted to have ``.r`` or ``.l`` greater than ``0``),
+    ``nil`` same as ``'right'`` but changes ``frame_inset`` only if a scroll icon is actually necessary
+    (if ``getTextHeight()`` is greater than ``frame_body.height``). Default is ``nil``.
 :up_arrow_icon: The symbol for scroll up arrow. Default is ``string.char(24)`` (``↑``).
 :down_arrow_icon: The symbol for scroll down arrow. Default is ``string.char(25)`` (``↓``).
 :scroll_icon_pen: Specifies the pen for scroll icons. Default is ``COLOR_LIGHTCYAN``.
@@ -4021,6 +4024,12 @@ The Label widget implements the following methods:
 
   Computes the width of the text.
 
+* ``label:scroll(nlines)``
+
+  This method takes the number of lines to scroll as positive or negative
+  integers or one of the following keywords: ``+page``, ``-page``,
+  ``+halfpage``, or ``-halfpage``.
+
 WrappedLabel class
 ------------------
 
diff --git a/library/lua/gui/widgets.lua b/library/lua/gui/widgets.lua
index 5765992af..3ac74bb52 100644
--- a/library/lua/gui/widgets.lua
+++ b/library/lua/gui/widgets.lua
@@ -652,6 +652,19 @@ function Label:onRenderFrame(dc, rect)
 end
 
 function Label:scroll(nlines)
+    if type(nlines) == 'string' then
+        if nlines == '+page' then
+            nlines = self.frame_body.height
+        elseif nlines == '-page' then
+            nlines = -self.frame_body.height
+        elseif nlines == '+halfpage' then
+            nlines = math.ceil(self.frame_body.height/2)
+        elseif nlines == '-halfpage' then
+            nlines = -math.ceil(self.frame_body.height/2)
+        else
+            error(('unhandled scroll keyword: "%s"'):format(nlines))
+        end
+    end
     local n = self.start_line_num + nlines
     n = math.min(n, self:getTextHeight() - self.frame_body.height + 1)
     n = math.max(n, 1)
@@ -668,11 +681,6 @@ function Label:onInput(keys)
     end
     for k,v in pairs(self.scroll_keys) do
         if keys[k] then
-            if v == '+page' then
-                v = self.frame_body.height
-            elseif v == '-page' then
-                v = -self.frame_body.height
-            end
             self:scroll(v)
         end
     end
diff --git a/test/library/gui/widgets.Label.lua b/test/library/gui/widgets.Label.lua
index 49a75a235..19220c922 100644
--- a/test/library/gui/widgets.Label.lua
+++ b/test/library/gui/widgets.Label.lua
@@ -25,7 +25,7 @@ function test.Label_correct_frame_body_with_scroll_icons()
         t[#t+1] = NEWLINE
     end
 
-    function fs:init(args)
+    function fs:init()
         self:addviews{
             widgets.Label{
                 view_id = 'text',
@@ -50,7 +50,7 @@ function test.Label_correct_frame_body_with_few_text_lines()
         t[#t+1] = NEWLINE
     end
 
-    function fs:init(args)
+    function fs:init()
         self:addviews{
             widgets.Label{
                 view_id = 'text',
@@ -75,7 +75,7 @@ function test.Label_correct_frame_body_without_show_scroll_icons()
         t[#t+1] = NEWLINE
     end
 
-    function fs:init(args)
+    function fs:init()
         self:addviews{
             widgets.Label{
                 view_id = 'text',
@@ -92,3 +92,43 @@ function test.Label_correct_frame_body_without_show_scroll_icons()
     expect.eq(o.subviews.text.frame_body.width, 10, "Label's frame_body.x2 and .width should not change with show_scroll_icons = false.")
     --o:dismiss()
 end
+
+function test.scroll()
+    local t = {}
+    for i = 1, 12 do
+        t[#t+1] = tostring(i)
+        t[#t+1] = NEWLINE
+    end
+
+    function fs:init()
+        self:addviews{
+            widgets.Label{
+                view_id = 'text',
+                frame_inset = 0,
+                text = t,
+            },
+        }
+    end
+
+    local o = fs{frame_height=3}
+    local txt = o.subviews.text
+    expect.eq(1, txt.start_line_num)
+    
+    txt:scroll(1)
+    expect.eq(2, txt.start_line_num)
+    txt:scroll('+page')
+    expect.eq(5, txt.start_line_num)
+    txt:scroll('+halfpage')
+    expect.eq(7, txt.start_line_num)
+    txt:scroll('-halfpage')
+    expect.eq(5, txt.start_line_num)
+    txt:scroll('-page')
+    expect.eq(2, txt.start_line_num)
+    txt:scroll(-1)
+    expect.eq(1, txt.start_line_num)
+
+    txt:scroll(-1)
+    expect.eq(1, txt.start_line_num)
+    txt:scroll(100)
+    expect.eq(10, txt.start_line_num)
+end

From d3abe93a7543846868b3e3c6e9d2db8805e07e89 Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Sat, 6 Aug 2022 23:32:00 -0700
Subject: [PATCH 509/854] clean up Label tests

---
 test/library/gui/widgets.Label.lua | 24 +++---------------------
 1 file changed, 3 insertions(+), 21 deletions(-)

diff --git a/test/library/gui/widgets.Label.lua b/test/library/gui/widgets.Label.lua
index 19220c922..9a5d462fa 100644
--- a/test/library/gui/widgets.Label.lua
+++ b/test/library/gui/widgets.Label.lua
@@ -1,13 +1,6 @@
--- test -dhack/scripts/devel/tests -twidgets.Label
-
 local gui = require('gui')
 local widgets = require('gui.widgets')
 
-local xtest = {} -- use to temporarily disable tests (change `function xtest.somename` to `function xxtest.somename`)
-local wait = function(n)
-    delay(n or 30) -- enable for debugging the tests
-end
-
 local fs = defclass(fs, gui.FramedScreen)
 fs.ATTRS = {
     frame_style = gui.GREY_LINE_FRAME,
@@ -18,7 +11,7 @@ fs.ATTRS = {
     focus_path = 'test-framed-screen',
 }
 
-function test.Label_correct_frame_body_with_scroll_icons()
+function test.correct_frame_body_with_scroll_icons()
     local t = {}
     for i = 1, 12 do
         t[#t+1] = tostring(i)
@@ -31,19 +24,15 @@ function test.Label_correct_frame_body_with_scroll_icons()
                 view_id = 'text',
                 frame_inset = 0,
                 text = t,
-                --show_scroll_icons = 'right',
             },
         }
     end
 
     local o = fs{}
-    --o:show()
-    --wait()
     expect.eq(o.subviews.text.frame_body.width, 9, "Label's frame_body.x2 and .width should be one smaller because of show_scroll_icons.")
-    --o:dismiss()
 end
 
-function test.Label_correct_frame_body_with_few_text_lines()
+function test.correct_frame_body_with_few_text_lines()
     local t = {}
     for i = 1, 10 do
         t[#t+1] = tostring(i)
@@ -56,19 +45,15 @@ function test.Label_correct_frame_body_with_few_text_lines()
                 view_id = 'text',
                 frame_inset = 0,
                 text = t,
-                --show_scroll_icons = 'right',
             },
         }
     end
 
     local o = fs{}
-    --o:show()
-    --wait()
     expect.eq(o.subviews.text.frame_body.width, 10, "Label's frame_body.x2 and .width should not change with show_scroll_icons = false.")
-    --o:dismiss()
 end
 
-function test.Label_correct_frame_body_without_show_scroll_icons()
+function test.correct_frame_body_without_show_scroll_icons()
     local t = {}
     for i = 1, 12 do
         t[#t+1] = tostring(i)
@@ -87,10 +72,7 @@ function test.Label_correct_frame_body_without_show_scroll_icons()
     end
 
     local o = fs{}
-    --o:show()
-    --wait()
     expect.eq(o.subviews.text.frame_body.width, 10, "Label's frame_body.x2 and .width should not change with show_scroll_icons = false.")
-    --o:dismiss()
 end
 
 function test.scroll()

From aa80f280d3ce5f46884a443996304bbc098724b1 Mon Sep 17 00:00:00 2001
From: "pre-commit-ci[bot]"
 <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Date: Sun, 7 Aug 2022 15:27:14 +0000
Subject: [PATCH 510/854] [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci
---
 test/library/gui/widgets.Label.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/library/gui/widgets.Label.lua b/test/library/gui/widgets.Label.lua
index 9a5d462fa..6b0097d1e 100644
--- a/test/library/gui/widgets.Label.lua
+++ b/test/library/gui/widgets.Label.lua
@@ -95,7 +95,7 @@ function test.scroll()
     local o = fs{frame_height=3}
     local txt = o.subviews.text
     expect.eq(1, txt.start_line_num)
-    
+
     txt:scroll(1)
     expect.eq(2, txt.start_line_num)
     txt:scroll('+page')

From 0ae4fed3cfd04a6f5a5d25263d3382ac025dd49d Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Mon, 8 Aug 2022 10:56:17 -0700
Subject: [PATCH 511/854] add mouse support for CycleHotkeyLabel widgets

---
 library/lua/gui/widgets.lua | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/library/lua/gui/widgets.lua b/library/lua/gui/widgets.lua
index 3ac74bb52..4053826cf 100644
--- a/library/lua/gui/widgets.lua
+++ b/library/lua/gui/widgets.lua
@@ -763,7 +763,6 @@ function HotkeyLabel:onInput(keys)
         self.on_activate()
         return true
     end
-
 end
 
 ----------------------
@@ -838,6 +837,15 @@ function CycleHotkeyLabel:getOptionValue(option_idx)
     return option
 end
 
+function CycleHotkeyLabel:onInput(keys)
+    if CycleHotkeyLabel.super.onInput(self, keys) then
+        return true
+    elseif keys._MOUSE_L and self:getMousePos() then
+        self:cycle()
+        return true
+    end
+end
+
 -----------------------
 -- ToggleHotkeyLabel --
 -----------------------

From 7c3b06d71ee48751adf83afc6cc6d04f86addb9a Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Mon, 8 Aug 2022 10:56:47 -0700
Subject: [PATCH 512/854] update changelog

---
 docs/changelog.txt | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/docs/changelog.txt b/docs/changelog.txt
index 637dd03f0..3afcd3e5c 100644
--- a/docs/changelog.txt
+++ b/docs/changelog.txt
@@ -52,6 +52,8 @@ changelog.txt uses a syntax similar to RST, with a few special sequences:
 - `orders`: added useful library of manager orders. see them with ``orders list`` and import them with, for example, ``orders import library/basic``
 - `prospect`: add new ``--show`` option to give the player control over which report sections are shown. e.g. ``prospect all --show ores`` will just show information on ores.
 - `seedwatch`: ``seedwatch all`` now adds all plants with seeds to the watchlist, not just the "basic" crops.
+- UX: You can now move the cursor around in DFHack text fields in ``gui/`` scripts (e.g. `gui/blueprint`, `gui/quickfort`, or `gui/gm-editor`). You can move the cursor by clicking where you want it to go with the mouse or using the Left/Right arrow keys.  Ctrl+Left/Right will move one word at a time, and Alt+Left/Right will move to the beginning/end of the text.
+- UX: You can now click on the hotkey hint text in many ``gui/`` script windows to activate the hotkey, like a button. Not all scripts have been updated to use the clickable widget yet, but you can try it in `gui/blueprint` or `gui/quickfort`.
 
 ## Documentation
 
@@ -65,6 +67,11 @@ changelog.txt uses a syntax similar to RST, with a few special sequences:
 
 ## Lua
 - ``tile-material``: fix the order of declarations. The ``GetTileMat`` function now returns the material as intended (always returned nil before). Also changed the license info, with permission of the original author.
+- ``widgets.EditField``: new ``onsubmit2`` callback attribute is called when the user hits Shift-Enter.
+- ``widgets.EditField``: new function: ``setCursor(position)`` sets the input cursor.
+- ``widgets.Label``: ``scroll`` function now interprets the keywords ``+page``, ``-page``, ``+halfpage``, and ``-halfpage`` in addition to simple positive and negative numbers.
+- ``widgets.HotkeyLabel``: clicking on the widget will now call ``on_activate()``.
+- ``widgets.CycleHotkeyLabel``: clicking on the widget will now cycle the options and trigger ``on_change()``. This also applies to the ``ToggleHotkeyLabel`` subclass.
 
 # 0.47.05-r6
 

From 7dddb5e2edf2aad28289916ff43c1a3c62251b16 Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Mon, 8 Aug 2022 11:02:29 -0700
Subject: [PATCH 513/854] document widget mouse integration

---
 docs/Lua API.rst | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/docs/Lua API.rst b/docs/Lua API.rst
index 369fd0260..9bab6b494 100644
--- a/docs/Lua API.rst	
+++ b/docs/Lua API.rst	
@@ -3903,7 +3903,8 @@ release keyboard focus, but first it will restore the text that was displayed
 before the ``EditField`` gained focus and then call the ``on_change`` callback.
 
 The ``EditField`` cursor can be moved to where you want to insert/remove text.
-The following cursor movement keys are recognized:
+You can click where you want the cursor to move or you can use any of the
+following keyboard hotkeys:
 
 - Left/Right arrow: move the cursor one character to the left or right.
 - Ctrl-Left/Right arrow: move the cursor one word to the left or right.
@@ -4072,7 +4073,7 @@ HotkeyLabel class
 -----------------
 
 This Label subclass is a convenience class for formatting text that responds to
-a hotkey.
+a hotkey or mouse click.
 
 It has the following attributes:
 
@@ -4082,13 +4083,13 @@ It has the following attributes:
 :label: The string (or a function that returns a string) to display after the
     hotkey.
 :on_activate: If specified, it is the callback that will be called whenever
-    the hotkey is pressed.
+    the hotkey is pressed or the label is clicked.
 
 CycleHotkeyLabel class
 ----------------------
 
 This Label subclass represents a group of related options that the user can
-cycle through by pressing a specified hotkey.
+cycle through by pressing a specified hotkey or clicking on the text.
 
 It has the following attributes:
 
@@ -4131,7 +4132,8 @@ This is a specialized subclass of CycleHotkeyLabel that has two options:
 List class
 ----------
 
-The List widget implements a simple list with paging.
+The List widget implements a simple list with paging. You can click on a list
+item to call the ``on_submit`` callback for that item.
 
 It has the following attributes:
 
@@ -4142,8 +4144,8 @@ It has the following attributes:
 :on_select: Selection change callback; called as ``on_select(index,choice)``.
             This is also called with *nil* arguments if ``setChoices`` is called
             with an empty list.
-:on_submit: Enter key callback; if specified, the list reacts to the key
-            and calls it as ``on_submit(index,choice)``.
+:on_submit: Enter key or mouse click callback; if specified, the list reacts to the
+            key/click and calls the callback as ``on_submit(index,choice)``.
 :on_submit2: Shift-Enter key callback; if specified, the list reacts to the key
              and calls it as ``on_submit2(index,choice)``.
 :row_height: Height of every row in text lines.

From 22f9f3b042b615f22ab23b8590fdb6e6b7b76b45 Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Mon, 8 Aug 2022 11:44:33 -0700
Subject: [PATCH 514/854] add unit tests for new widget functionality

---
 library/lua/gui/widgets.lua            | 14 +++----
 test/library/gui/widgets.EditField.lua | 56 ++++++++++++++++++++++++++
 test/library/gui/widgets.lua           | 39 +++++++++++++-----
 3 files changed, 92 insertions(+), 17 deletions(-)
 create mode 100644 test/library/gui/widgets.EditField.lua

diff --git a/library/lua/gui/widgets.lua b/library/lua/gui/widgets.lua
index 4053826cf..ff34008e1 100644
--- a/library/lua/gui/widgets.lua
+++ b/library/lua/gui/widgets.lua
@@ -307,10 +307,10 @@ function EditField:onInput(keys)
     elseif keys.CURSOR_LEFT then
         self:setCursor(self.cursor - 1)
         return true
-    elseif keys.A_MOVE_W_DOWN then -- Ctrl-Left (prev word start)
-        local _, prev_word_start = self.text:sub(1, self.cursor-1):
-                                                    find('.*[^%w_%-]+[%w_%-]')
-        self:setCursor(prev_word_start or 1)
+    elseif keys.A_MOVE_W_DOWN then -- Ctrl-Left (end of prev word)
+        local _, prev_word_end = self.text:sub(1, self.cursor-1):
+                                                    find('.*[%w_%-][^%w_%-]')
+        self:setCursor(prev_word_end or 1)
         return true
     elseif keys.A_CARE_MOVE_W then -- Alt-Left (home)
         self:setCursor(1)
@@ -318,9 +318,9 @@ function EditField:onInput(keys)
     elseif keys.CURSOR_RIGHT then
         self:setCursor(self.cursor + 1)
         return true
-    elseif keys.A_MOVE_E_DOWN then -- Ctrl-Right (next word end)
-        local _, next_word_end = self.text:find('[%w_%-]+[^%w_%-]', self.cursor)
-        self:setCursor(next_word_end)
+    elseif keys.A_MOVE_E_DOWN then -- Ctrl-Right (beginning of next word)
+        local _,next_word_start = self.text:find('[^%w_%-][%w_%-]', self.cursor)
+        self:setCursor(next_word_start)
         return true
     elseif keys.A_CARE_MOVE_E then -- Alt-Right (end)
         self:setCursor()
diff --git a/test/library/gui/widgets.EditField.lua b/test/library/gui/widgets.EditField.lua
new file mode 100644
index 000000000..15acfddb0
--- /dev/null
+++ b/test/library/gui/widgets.EditField.lua
@@ -0,0 +1,56 @@
+local widgets = require('gui.widgets')
+
+function test.editfield_cursor()
+    local e = widgets.EditField{}
+    e:setFocus(true)
+    expect.eq(1, e.cursor, 'cursor should be after the empty string')
+
+    e:onInput{_STRING=string.byte('a')}
+    expect.eq('a', e.text)
+    expect.eq(2, e.cursor)
+
+    e:setText('one two three')
+    expect.eq(14, e.cursor, 'cursor should be after the last char')
+    e:onInput{_STRING=string.byte('s')}
+    expect.eq('one two threes', e.text)
+    expect.eq(15, e.cursor)
+
+    e:setCursor(4)
+    e:onInput{_STRING=string.byte('s')}
+    expect.eq('ones two threes', e.text)
+    expect.eq(5, e.cursor)
+
+    e:onInput{CURSOR_LEFT=true}
+    expect.eq(4, e.cursor)
+    e:onInput{CURSOR_RIGHT=true}
+    expect.eq(5, e.cursor)
+    e:onInput{A_CARE_MOVE_W=true}
+    expect.eq(1, e.cursor, 'interpret alt-left as home')
+    e:onInput{A_MOVE_E_DOWN=true}
+    expect.eq(6, e.cursor, 'interpret ctrl-right as goto beginning of next word')
+    e:onInput{A_CARE_MOVE_E=true}
+    expect.eq(16, e.cursor, 'interpret alt-right as end')
+    e:onInput{A_MOVE_W_DOWN=true}
+    expect.eq(9, e.cursor, 'interpret ctrl-left as goto end of previous word')
+end
+
+function test.editfield_click()
+    local e = widgets.EditField{text='word'}
+    e:setFocus(true)
+    expect.eq(5, e.cursor)
+
+    mock.patch(e, 'getMousePos', mock.func(0), function()
+            e:onInput{_MOUSE_L=true}
+            expect.eq(1, e.cursor)
+        end)
+
+    mock.patch(e, 'getMousePos', mock.func(20), function()
+            e:onInput{_MOUSE_L=true}
+            expect.eq(5, e.cursor, 'should only seek to end of text')
+        end)
+
+    mock.patch(e, 'getMousePos', mock.func(2), function()
+            e:onInput{_MOUSE_L=true}
+            expect.eq(3, e.cursor)
+        end)
+end
diff --git a/test/library/gui/widgets.lua b/test/library/gui/widgets.lua
index 1eed30e4f..95dbd34f1 100644
--- a/test/library/gui/widgets.lua
+++ b/test/library/gui/widgets.lua
@@ -1,18 +1,37 @@
 local widgets = require('gui.widgets')
 
+function test.hotkeylabel_click()
+    local func = mock.func()
+    local l = widgets.HotkeyLabel{key='SELECT', on_activate=func}
+
+    mock.patch(l, 'getMousePos', mock.func(0), function()
+            l:onInput{_MOUSE_L=true}
+            expect.eq(1, func.call_count)
+        end)
+end
+
 function test.togglehotkeylabel()
-   local toggle = widgets.ToggleHotkeyLabel{}
-   expect.true_(toggle:getOptionValue())
-   toggle:cycle()
-   expect.false_(toggle:getOptionValue())
-   toggle:cycle()
-   expect.true_(toggle:getOptionValue())
+    local toggle = widgets.ToggleHotkeyLabel{}
+    expect.true_(toggle:getOptionValue())
+    toggle:cycle()
+    expect.false_(toggle:getOptionValue())
+    toggle:cycle()
+    expect.true_(toggle:getOptionValue())
 end
 
 function test.togglehotkeylabel_default_value()
-   local toggle = widgets.ToggleHotkeyLabel{initial_option=2}
-   expect.false_(toggle:getOptionValue())
+    local toggle = widgets.ToggleHotkeyLabel{initial_option=2}
+    expect.false_(toggle:getOptionValue())
+
+    toggle = widgets.ToggleHotkeyLabel{initial_option=false}
+    expect.false_(toggle:getOptionValue())
+end
 
-   toggle = widgets.ToggleHotkeyLabel{initial_option=false}
-   expect.false_(toggle:getOptionValue())
+function test.togglehotkeylabel_click()
+    local l = widgets.ToggleHotkeyLabel{}
+    expect.true_(l:getOptionValue())
+    mock.patch(l, 'getMousePos', mock.func(0), function()
+            l:onInput{_MOUSE_L=true}
+            expect.false_(l:getOptionValue())
+        end)
 end

From 7f0791f6c3977cbc23d7c776255c383f8b354d6e Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Mon, 15 Aug 2022 16:22:56 -0700
Subject: [PATCH 515/854] use setText() accessor method instead of direct
 access

---
 library/lua/gui/widgets.lua | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/library/lua/gui/widgets.lua b/library/lua/gui/widgets.lua
index ff34008e1..d1801e764 100644
--- a/library/lua/gui/widgets.lua
+++ b/library/lua/gui/widgets.lua
@@ -1162,7 +1162,7 @@ end
 
 function FilteredList:setChoices(choices, pos)
     choices = choices or {}
-    self.edit.text = ''
+    self.edit:setText('')
     self.list:setChoices(choices, pos)
     self.choices = self.list.choices
     self.not_found.visible = (#choices == 0)
@@ -1204,7 +1204,7 @@ function FilteredList:setFilter(filter, pos)
     local cidx = nil
 
     filter = filter or ''
-    self.edit.text = filter
+    self.edit:setText(filter)
 
     if filter ~= '' then
         local tokens = filter:split()

From 84cd3f0e6d90218f55309ea9a19e00db6dd74771 Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Fri, 15 Jul 2022 09:07:14 -0700
Subject: [PATCH 516/854] add getEntries() to the CommandHistory API

so we can export them to lua
also bump the default history size to 5000 from the paltry 100 we had
---
 library/include/Console.h | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/library/include/Console.h b/library/include/Console.h
index f0f56ca85..39a19b152 100644
--- a/library/include/Console.h
+++ b/library/include/Console.h
@@ -32,6 +32,7 @@ distribution.
 #include <assert.h>
 #include <iostream>
 #include <string>
+#include <vector>
 namespace tthread
 {
     class mutex;
@@ -114,6 +115,12 @@ namespace  DFHack
         {
             history.pop_front();
         }
+        /// adds the current list of entries to the given vector
+        void getEntries(std::vector<std::string> &entries)
+        {
+            for (auto &entry : history)
+                entries.push_back(entry);
+        }
     private:
         std::size_t capacity;
         std::deque <std::string> history;

From 6fd0f4505fbd5a02782ee30a86eb8282dee4c305 Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Fri, 15 Jul 2022 09:18:27 -0700
Subject: [PATCH 517/854] add dfhack history repository and expose to lua

---
 docs/Lua API.rst   | 16 +++++++++++++++-
 library/LuaApi.cpp | 39 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 54 insertions(+), 1 deletion(-)

diff --git a/docs/Lua API.rst b/docs/Lua API.rst
index 9bab6b494..527a9f3b4 100644
--- a/docs/Lua API.rst	
+++ b/docs/Lua API.rst	
@@ -524,6 +524,20 @@ Input & Output
   lock. Using an explicit ``dfhack.with_suspend`` will prevent
   this, forcing the function to block on input with lock held.
 
+* ``dfhack.getCommandHistory(history_id, history_filename)``
+
+  Returns the list of strings in the specified history. Intended to be used by
+  GUI scripts that don't have access to a console and so can't use
+  ``dfhack.lineedit``. The ``history_id`` parameter is some unique string that
+  the script uses to identify its command history, such as the script's name. If
+  this is the first time the history with the given ``history_id`` is being
+  accessed, it is initialized from the given file.
+
+* ``dfhack.addCommandToHistory(history_id, history_filename, command)``
+
+  Adds a command to the specified history and saves the updated history to the
+  specified file.
+
 * ``dfhack.interpreter([prompt[,history_filename[,env]]])``
 
   Starts an interactive lua interpreter, using the specified prompt
@@ -837,6 +851,7 @@ can be omitted.
 * ``dfhack.getGitXmlExpectedCommit()``
 * ``dfhack.gitXmlMatch()``
 * ``dfhack.isRelease()``
+* ``dfhack.isPrerelease()``
 
   Return information about the DFHack build in use.
 
@@ -890,7 +905,6 @@ can be omitted.
   from ``dfhack.TranslateName()``), use ``print(dfhack.df2console(text))`` to
   ensure proper display on all platforms.
 
-
 * ``dfhack.utf2df(string)``
 
   Convert a string from UTF-8 to DF's CP437 encoding.
diff --git a/library/LuaApi.cpp b/library/LuaApi.cpp
index 101b645fd..12b0a7310 100644
--- a/library/LuaApi.cpp
+++ b/library/LuaApi.cpp
@@ -1359,6 +1359,38 @@ static void OpenRandom(lua_State *state)
     lua_pop(state, 1);
 }
 
+
+/*********************************
+* Commandline history repository *
+**********************************/
+
+static std::map<std::string, CommandHistory> commandHistories;
+
+static CommandHistory * ensureCommandHistory(std::string id,
+                                             std::string src_file) {
+    if (!commandHistories.count(id)) {
+        commandHistories[id].load(src_file.c_str());
+    }
+    return &commandHistories[id];
+}
+
+static int getCommandHistory(lua_State *state)
+{
+    std::string id = lua_tostring(state, 1);
+    std::string src_file = lua_tostring(state, 2);
+    std::vector<std::string> entries;
+    ensureCommandHistory(id, src_file)->getEntries(entries);
+    Lua::PushVector(state, entries);
+    return 1;
+}
+
+static void addCommandToHistory(std::string id, std::string src_file,
+                                std::string command) {
+    CommandHistory *history = ensureCommandHistory(id, src_file);
+    history->add(command);
+    history->save(src_file.c_str());
+}
+
 /************************
  * Wrappers for C++ API *
  ************************/
@@ -1450,6 +1482,12 @@ static const LuaWrapper::FunctionReg dfhack_module[] = {
     WRAP_VERSION_FUNC(gitXmlMatch, git_xml_match),
     WRAP_VERSION_FUNC(isRelease, is_release),
     WRAP_VERSION_FUNC(isPrerelease, is_prerelease),
+    WRAP(addCommandToHistory),
+    { NULL, NULL }
+};
+
+static const luaL_Reg dfhack_funcs[] = {
+    { "getCommandHistory", getCommandHistory },
     { NULL, NULL }
 };
 
@@ -3113,6 +3151,7 @@ void OpenDFHackApi(lua_State *state)
     OpenRandom(state);
 
     LuaWrapper::SetFunctionWrappers(state, dfhack_module);
+    luaL_setfuncs(state, dfhack_funcs, 0);
     OpenModule(state, "gui", dfhack_gui_module, dfhack_gui_funcs);
     OpenModule(state, "job", dfhack_job_module, dfhack_job_funcs);
     OpenModule(state, "units", dfhack_units_module, dfhack_units_funcs);

From f7a0423566acf84516dfac82dfef776068296a04 Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Mon, 8 Aug 2022 12:07:25 -0700
Subject: [PATCH 518/854] update changelog

---
 docs/changelog.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/changelog.txt b/docs/changelog.txt
index 3afcd3e5c..d64c2ab0d 100644
--- a/docs/changelog.txt
+++ b/docs/changelog.txt
@@ -66,6 +66,7 @@ changelog.txt uses a syntax similar to RST, with a few special sequences:
 - ``Gui::getSelectedItem()``, ``Gui::getAnyItem()``: added support for the artifacts screen
 
 ## Lua
+- History: added ``dfhack.getCommandHistory(history_id, history_filename)`` and ``dfhack.addCommandToHistory(history_id, history_filename, command)`` so gui scripts can access a commandline history without requiring a terminal.
 - ``tile-material``: fix the order of declarations. The ``GetTileMat`` function now returns the material as intended (always returned nil before). Also changed the license info, with permission of the original author.
 - ``widgets.EditField``: new ``onsubmit2`` callback attribute is called when the user hits Shift-Enter.
 - ``widgets.EditField``: new function: ``setCursor(position)`` sets the input cursor.

From 8672282fd894861d19e8e4dfcbe9f7a0fcbfc380 Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Mon, 8 Aug 2022 12:55:27 -0700
Subject: [PATCH 519/854] add helpdb, unit test, and document API

note that we have to dynamically sort some of the expected lists for
locale agnosticism
---
 docs/Lua API.rst           |  81 ++++
 docs/changelog.txt         |   1 +
 library/LuaApi.cpp         | 107 ++++++
 library/include/LuaTools.h |   2 +
 library/lua/helpdb.lua     | 735 +++++++++++++++++++++++++++++++++++++
 test/library/helpdb.lua    | 648 ++++++++++++++++++++++++++++++++
 6 files changed, 1574 insertions(+)
 create mode 100644 library/lua/helpdb.lua
 create mode 100644 test/library/helpdb.lua

diff --git a/docs/Lua API.rst b/docs/Lua API.rst
index 527a9f3b4..ebd7a1287 100644
--- a/docs/Lua API.rst	
+++ b/docs/Lua API.rst	
@@ -3068,6 +3068,87 @@ function:
   argument specifies the indentation step size in spaces. For
   the other arguments see the original documentation link above.
 
+helpdb
+======
+
+Unified interface for DFHack tool help text. Help text is read from the rendered
+text in ``hack/docs/docs/``. If no rendered text exists, help is read from the
+script sources (for scripts) or the string passed to the ``PluginCommand``
+initializer (for plugins). See `documentation` for details on how DFHack's help
+system works.
+
+The database is lazy-loaded when an API method is called. It rechecks its help
+sources for updates if an API method has not been called in the last 60 seconds.
+
+Each entry has several properties associated with it:
+
+- The entry name, which is the name of a plugin, script, or command provided by
+  a plugin.
+- The entry types, which can be ``builtin``, ``plugin``, and/or ``command``.
+  Entries for built-in commands (like ``ls`` or ``quicksave``) are both type
+  ``builtin`` and ``command``. Entries named after plugins are type ``plugin``,
+  and if that plugin also provides a command with the same name as the plugin,
+  then the entry is also type ``command``. Entry types are returned as a map
+  of one or more of the type strings to ``true``.
+- Short help, a the ~54 character description string.
+- Long help, the entire contents of the associated help file.
+- A list of tags that define the groups that the entry belongs to.
+
+* ``helpdb.is_entry(str)``, ``helpdb.is_entry(list)``
+
+  Returns whether the given string (or list of strings) is an entry (are all
+  entries) in the db.
+
+* ``helpdb.get_entry_types(entry)``
+
+  Returns the set (that is, a map of string to ``true``) of entry types for the
+  given entry.
+
+* ``helpdb.get_entry_short_help(entry)``
+
+  Returns the short (~54 character) description for the given entry.
+
+* ``helpdb.get_entry_long_help(entry)``
+
+  Returns the full help text for the given entry.
+
+* ``helpdb.get_entry_tags(entry)``
+
+  Returns the set of tag names for the given entry.
+
+* ``helpdb.is_tag(str)``, ``helpdb.is_tag(list)``
+
+  Returns whether the given string (or list of strings) is a (are all) valid tag
+  name(s).
+
+* ``helpdb.get_tags()``
+
+  Returns the full alphabetized list of valid tag names.
+
+* ``helpdb.get_tag_data(tag)``
+
+  Returns a list of entries that have the given tag. The returned table also
+  has a ``description`` key that contains the string description of the tag.
+
+* ``helpdb.search_entries([include[, exclude]])``
+
+  Returns a list of names for entries that match the given filters. The list is
+  alphabetized by their last path component, with populated path components
+  coming before null path components (e.g. ``autobutcher`` will immediately
+  follow ``gui/autobutcher``).
+  The optional ``include`` and ``exclude`` filter params are maps with the
+  following elements:
+
+  :str:   if a string, filters by the given substring. if a table of strings,
+          includes entry names that match any of the given substrings.
+  :tag:   if a string, filters by the given tag name. if a table of strings,
+          includes entries that match any of the given tags.
+  :entry_type: if a string, matches entries of the given type. if a table of
+          strings, includes entries that match any of the given types.
+
+  If ``include`` is ``nil`` or empty, then all entries are included. If
+  ``exclude`` is ``nil`` or empty, then no entries are filtered out.
+
 profiler
 ========
 
diff --git a/docs/changelog.txt b/docs/changelog.txt
index d64c2ab0d..2639de182 100644
--- a/docs/changelog.txt
+++ b/docs/changelog.txt
@@ -67,6 +67,7 @@ changelog.txt uses a syntax similar to RST, with a few special sequences:
 
 ## Lua
 - History: added ``dfhack.getCommandHistory(history_id, history_filename)`` and ``dfhack.addCommandToHistory(history_id, history_filename, command)`` so gui scripts can access a commandline history without requiring a terminal.
+- ``helpdb``: database and query interface for DFHack tool help text
 - ``tile-material``: fix the order of declarations. The ``GetTileMat`` function now returns the material as intended (always returned nil before). Also changed the license info, with permission of the original author.
 - ``widgets.EditField``: new ``onsubmit2`` callback attribute is called when the user hits Shift-Enter.
 - ``widgets.EditField``: new function: ``setCursor(position)`` sets the input cursor.
diff --git a/library/LuaApi.cpp b/library/LuaApi.cpp
index 12b0a7310..aaf780f74 100644
--- a/library/LuaApi.cpp
+++ b/library/LuaApi.cpp
@@ -148,6 +148,16 @@ void Lua::Push(lua_State *state, df::coord2d pos)
     lua_setfield(state, -2, "y");
 }
 
+void Lua::GetVector(lua_State *state, std::vector<std::string> &pvec)
+{
+    lua_pushnil(state);   // first key
+    while (lua_next(state, 1) != 0)
+    {
+        pvec.push_back(lua_tostring(state, -1));
+        lua_pop(state, 1);  // remove value, leave key
+    }
+}
+
 int Lua::PushPosXYZ(lua_State *state, df::coord pos)
 {
     if (!pos.isValid())
@@ -3061,6 +3071,99 @@ static int internal_findScript(lua_State *L)
     return 1;
 }
 
+static int internal_listPlugins(lua_State *L)
+{
+    auto plugins = Core::getInstance().getPluginManager();
+
+    int i = 1;
+    lua_newtable(L);
+    for (auto it = plugins->begin(); it != plugins->end(); ++it)
+    {
+        lua_pushinteger(L, i++);
+        lua_pushstring(L, it->first.c_str());
+        lua_settable(L, -3);
+    }
+    return 1;
+}
+
+static int internal_listCommands(lua_State *L)
+{
+    auto plugins = Core::getInstance().getPluginManager();
+
+    const char *name = luaL_checkstring(L, 1);
+
+    auto plugin = plugins->getPluginByName(name);
+    if (!plugin)
+    {
+        lua_pushnil(L);
+        return 1;
+    }
+
+    size_t num_commands = plugin->size();
+    lua_newtable(L);
+    for (size_t i = 0; i < num_commands; ++i)
+    {
+        lua_pushinteger(L, i + 1);
+        lua_pushstring(L, (*plugin)[i].name.c_str());
+        lua_settable(L, -3);
+    }
+    return 1;
+}
+
+static const PluginCommand * getPluginCommand(const char * command)
+{
+    auto plugins = Core::getInstance().getPluginManager();
+    auto plugin = plugins->getPluginByCommand(command);
+    if (!plugin)
+    {
+        return NULL;
+    }
+
+    size_t num_commands = plugin->size();
+    for (size_t i = 0; i < num_commands; ++i)
+    {
+        if ((*plugin)[i].name == command)
+            return &(*plugin)[i];
+    }
+
+    // not found (somehow)
+    return NULL;
+}
+
+static int internal_getCommandHelp(lua_State *L)
+{
+    const PluginCommand *pc = getPluginCommand(luaL_checkstring(L, 1));
+    if (!pc)
+    {
+        lua_pushnil(L);
+        return 1;
+    }
+
+    std::string help = pc->description;
+    if (help.size() && help[help.size()-1] != '.')
+        help += ".";
+    if (pc->usage.size())
+        help += "\n" + pc->usage;
+    lua_pushstring(L, help.c_str());
+    return 1;
+}
+
+static int internal_getCommandDescription(lua_State *L)
+{
+    const PluginCommand *pc = getPluginCommand(luaL_checkstring(L, 1));
+    if (!pc)
+    {
+        lua_pushnil(L);
+        return 1;
+    }
+
+    std::string help = pc->description;
+    if (help.size() && help[help.size()-1] != '.')
+        help += ".";
+    lua_pushstring(L, help.c_str());
+    return 1;
+}
+
 static int internal_threadid(lua_State *L)
 {
     std::stringstream ss;
@@ -3132,6 +3235,10 @@ static const luaL_Reg dfhack_internal_funcs[] = {
     { "removeScriptPath", internal_removeScriptPath },
     { "getScriptPaths", internal_getScriptPaths },
     { "findScript", internal_findScript },
+    { "listPlugins", internal_listPlugins },
+    { "listCommands", internal_listCommands },
+    { "getCommandHelp", internal_getCommandHelp },
+    { "getCommandDescription", internal_getCommandDescription },
     { "threadid", internal_threadid },
     { "md5File", internal_md5file },
     { NULL, NULL }
diff --git a/library/include/LuaTools.h b/library/include/LuaTools.h
index df89d184f..6dc5ae0bd 100644
--- a/library/include/LuaTools.h
+++ b/library/include/LuaTools.h
@@ -339,6 +339,8 @@ namespace DFHack {namespace Lua {
         }
     }
 
+    DFHACK_EXPORT void GetVector(lua_State *state, std::vector<std::string> &pvec);
+
     DFHACK_EXPORT int PushPosXYZ(lua_State *state, df::coord pos);
     DFHACK_EXPORT int PushPosXY(lua_State *state, df::coord2d pos);
 
diff --git a/library/lua/helpdb.lua b/library/lua/helpdb.lua
new file mode 100644
index 000000000..e6bd9133b
--- /dev/null
+++ b/library/lua/helpdb.lua
@@ -0,0 +1,735 @@
+-- The help text database and query interface.
+--
+-- Help text is read from the rendered text in hack/docs/docs/. If no rendered
+-- text exists, it is read from the script sources (for scripts) or the string
+-- passed to the PluginCommand initializer (for plugins).
+--
+-- There should be one help file for each plugin that contains a summary for the
+-- plugin itself and help for all the commands that plugin provides (if any).
+-- Each script should also have one documentation file.
+--
+-- The database is lazy-loaded when an API method is called. It rechecks its
+-- help sources for updates if an API method has not been called in the last
+-- 60 seconds.
+
+local _ENV = mkmodule('helpdb')
+
+local MAX_STALE_MS = 60000
+
+-- paths
+local RENDERED_PATH = 'hack/docs/docs/tools/'
+local TAG_DEFINITIONS = 'hack/docs/docs/Tags.txt'
+
+-- used when reading help text embedded in script sources
+local SCRIPT_DOC_BEGIN = '[====['
+local SCRIPT_DOC_END = ']====]'
+local SCRIPT_DOC_BEGIN_RUBY = '=begin'
+local SCRIPT_DOC_END_RUBY = '=end'
+
+-- enums
+local ENTRY_TYPES = {
+    BUILTIN='builtin',
+    PLUGIN='plugin',
+    COMMAND='command'
+}
+
+local HELP_SOURCES = {
+    RENDERED='rendered', -- from the installed, rendered help text
+    PLUGIN='plugin',     -- from the plugin source code
+    SCRIPT='script',     -- from the script source code
+    STUB='stub',         -- from a generated stub
+}
+
+-- builtin command names, with aliases mapped to their canonical form
+local BUILTINS = {
+    ['?']='help',
+    alias=true,
+    clear='cls',
+    cls=true,
+    ['devel/dump-rpc']=true,
+    die=true,
+    dir='ls',
+    disable=true,
+    enable=true,
+    fpause=true,
+    help=true,
+    hide=true,
+    keybinding=true,
+    ['kill-lua']=true,
+    ['load']=true,
+    ls=true,
+    man='help',
+    plug=true,
+    reload=true,
+    script=true,
+    ['sc-script']=true,
+    show=true,
+    tags=true,
+    ['type']=true,
+    unload=true,
+}
+
+---------------------------------------------------------------------------
+-- data structures
+---------------------------------------------------------------------------
+
+-- help text database, keys are a subset of the entry database
+-- entry name -> {
+--   help_source (element of HELP_SOURCES),
+--   short_help (string),
+--   long_help (string),
+--   tags (set),
+--   source_timestamp (mtime, 0 for non-files),
+--   source_path (string, nil for non-files)
+-- }
+local textdb = {}
+
+-- entry database, points to text in textdb
+-- entry name -> {
+--   entry_types (set of ENTRY_TYPES),
+--   short_help (string, if not nil then overrides short_help in text_entry),
+--   text_entry (string)
+-- }
+--
+-- entry_types is a set because plugin commands can also be the plugin names.
+local entrydb = {}
+
+
+-- tag name -> list of entry names
+-- Tags defined in the TAG_DEFINITIONS file that have no associated db entries
+-- will have an empty list.
+local tag_index = {}
+
+---------------------------------------------------------------------------
+-- data ingestion
+---------------------------------------------------------------------------
+
+local function get_rendered_path(entry_name)
+    return RENDERED_PATH .. entry_name .. '.txt'
+end
+
+local function has_rendered_help(entry_name)
+    return dfhack.filesystem.mtime(get_rendered_path(entry_name)) ~= -1
+end
+
+local DEFAULT_HELP_TEMPLATE = [[
+%s
+%s
+
+No help available.
+]]
+local function make_default_entry(entry_name, help_source, kwargs)
+    local default_long_help = DEFAULT_HELP_TEMPLATE:format(
+                                            entry_name, ('*'):rep(#entry_name))
+    return {
+        help_source=help_source,
+        short_help='No help available.',
+        long_help=default_long_help,
+        tags={},
+        source_timestamp=kwargs.source_timestamp or 0,
+        source_path=kwargs.source_path}
+end
+
+-- updates the short_text, the long_text, and the tags in the given entry based
+-- on the text returned from the iterator.
+-- if defined, opts can have the following fields:
+--   begin_marker (string that marks the beginning of the help text; all text
+--                 before this marker is ignored)
+--   end_marker (string that marks the end of the help text; text will stop
+--               being parsed after this marker is seen)
+--   no_header (don't try to find the entity name at the top of the help text)
+--   first_line_is_short_help (if set, then read the short help text from the
+--                             first commented line of the script instead of
+--                             using the first sentence of the long help text.
+--                             value is the comment character.)
+local function update_entry(entry, iterator, opts)
+    opts = opts or {}
+    local lines, tags = {}, ''
+    local first_line_is_short_help = opts.first_line_is_short_help
+    local begin_marker_found,header_found = not opts.begin_marker,opts.no_header
+    local tags_found, short_help_found = false, opts.skip_short_help
+    local in_tags, in_short_help = false, false
+    for line in iterator do
+        if not short_help_found and first_line_is_short_help then
+            line = line:trim()
+            local _,_,text = line:find('^'..first_line_is_short_help..'%s*(.*)')
+            if not text then
+                -- if no first-line short help found, fall back to getting the
+                -- first sentence of the help text.
+                first_line_is_short_help = false
+            else
+                if not text:endswith('.') then
+                    text = text .. '.'
+                end
+                entry.short_help = text
+                short_help_found = true
+                goto continue
+            end
+        end
+        if not begin_marker_found then
+            local _, endpos = line:find(opts.begin_marker, 1, true)
+            if endpos == #line then
+                begin_marker_found = true
+            end
+            goto continue
+        end
+        if opts.end_marker then
+            local _, endpos = line:find(opts.end_marker, 1, true)
+            if endpos == #line then
+                break
+            end
+        end
+        if not header_found and line:find('%w') then
+            header_found = true
+        elseif in_tags then
+            if #line == 0 then
+                in_tags = false
+            else
+                tags = tags .. line
+            end
+        elseif not tags_found and line:find('^[*]*Tags:[*]*') then
+            _,_,tags = line:trim():find('[*]*Tags:[*]* *(.*)')
+            in_tags, tags_found = true, true
+        elseif not short_help_found and
+                line:find('^%w') then
+            if in_short_help then
+                entry.short_help = entry.short_help .. ' ' .. line
+            else
+                entry.short_help = line
+            end
+            local sentence_end = entry.short_help:find('.', 1, true)
+            if sentence_end then
+                entry.short_help = entry.short_help:sub(1, sentence_end)
+                short_help_found = true
+            else
+                in_short_help = true
+            end
+        end
+        table.insert(lines, line)
+        ::continue::
+    end
+    entry.tags = {}
+    for _,tag in ipairs(tags:split('[ ,|]+')) do
+        if #tag > 0 and tag_index[tag] then
+            entry.tags[tag] = true
+        end
+    end
+    if #lines > 0 then
+        entry.long_help = table.concat(lines, '\n')
+    end
+end
+
+-- create db entry based on parsing sphinx-rendered help text
+local function make_rendered_entry(old_entry, entry_name, kwargs)
+    local source_path = get_rendered_path(entry_name)
+    local source_timestamp = dfhack.filesystem.mtime(source_path)
+    if old_entry and old_entry.help_source == HELP_SOURCES.RENDERED and
+            old_entry.source_timestamp >= source_timestamp then
+        -- we already have the latest info
+        return old_entry
+    end
+    kwargs.source_path, kwargs.source_timestamp = source_path, source_timestamp
+    local entry = make_default_entry(entry_name, HELP_SOURCES.RENDERED, kwargs)
+    local ok, lines = pcall(io.lines, source_path)
+    if not ok then
+        return entry
+    end
+    update_entry(entry, lines)
+    return entry
+end
+
+-- create db entry based on the help text in the plugin source (used by
+-- out-of-tree plugins)
+local function make_plugin_entry(old_entry, entry_name, kwargs)
+    if old_entry and old_entry.source == HELP_SOURCES.PLUGIN then
+        -- we can't tell when a plugin is reloaded, so we can either choose to
+        -- always refresh or never refresh. let's go with never for now for
+        -- performance.
+        return old_entry
+    end
+    local entry = make_default_entry(entry_name, HELP_SOURCES.PLUGIN, kwargs)
+    local long_help = dfhack.internal.getCommandHelp(entry_name)
+    if long_help and #long_help:trim() > 0 then
+        update_entry(entry, long_help:trim():gmatch('[^\n]*'), {no_header=true})
+    end
+    return entry
+end
+
+-- create db entry based on the help text in the script source (used by
+-- out-of-tree scripts)
+local function make_script_entry(old_entry, entry_name, kwargs)
+    local source_path = kwargs.source_path
+    local source_timestamp = dfhack.filesystem.mtime(source_path)
+    if old_entry and old_entry.source == HELP_SOURCES.SCRIPT and
+            old_entry.source_path == source_path and
+            old_entry.source_timestamp >= source_timestamp then
+        -- we already have the latest info
+        return old_entry
+    end
+    kwargs.source_timestamp, kwargs.entry_type = source_timestamp
+    local entry = make_default_entry(entry_name, HELP_SOURCES.SCRIPT, kwargs)
+    local ok, lines = pcall(io.lines, source_path)
+    if not ok then
+        return entry
+    end
+    local is_rb = source_path:endswith('.rb')
+    update_entry(entry, lines,
+            {begin_marker=(is_rb and SCRIPT_DOC_BEGIN_RUBY or SCRIPT_DOC_BEGIN),
+             end_marker=(is_rb and SCRIPT_DOC_BEGIN_RUBY or SCRIPT_DOC_END),
+             first_line_is_short_help=(is_rb and '#' or '%-%-')})
+    return entry
+end
+
+-- updates the dbs (and associated tag index) with a new entry if the entry_name
+-- doesn't already exist in the dbs.
+local function update_db(old_db, entry_name, text_entry, help_source, kwargs)
+    if entrydb[entry_name] then
+        -- already in db (e.g. from a higher-priority script dir); skip
+        return
+    end
+    entrydb[entry_name] = {
+        entry_types=kwargs.entry_types,
+        short_help=kwargs.short_help,
+        text_entry=text_entry
+    }
+    if entry_name ~= text_entry then
+        return
+    end
+
+    local text_entry, old_entry = nil, old_db[entry_name]
+    if help_source == HELP_SOURCES.RENDERED then
+        text_entry = make_rendered_entry(old_entry, entry_name, kwargs)
+    elseif help_source == HELP_SOURCES.PLUGIN then
+        text_entry = make_plugin_entry(old_entry, entry_name, kwargs)
+    elseif help_source == HELP_SOURCES.SCRIPT then
+        text_entry = make_script_entry(old_entry, entry_name, kwargs)
+    elseif help_source == HELP_SOURCES.STUB then
+        text_entry = make_default_entry(entry_name, HELP_SOURCES.STUB, kwargs)
+    else
+        error('unhandled help source: ' .. help_source)
+    end
+    textdb[entry_name] = text_entry
+end
+
+-- add the builtin commands to the db
+local function scan_builtins(old_db)
+    local entry_types = {[ENTRY_TYPES.BUILTIN]=true, [ENTRY_TYPES.COMMAND]=true}
+    for builtin,canonical in pairs(BUILTINS) do
+        if canonical == true then canonical = builtin end
+        update_db(old_db, builtin, canonical,
+            has_rendered_help(canonical) and
+                HELP_SOURCES.RENDERED or HELP_SOURCES.STUB,
+            {entry_types=entry_types})
+    end
+end
+
+-- scan for enableable plugins and plugin-provided commands and add their help
+-- to the db
+local function scan_plugins(old_db)
+    local plugin_names = dfhack.internal.listPlugins()
+    for _,plugin in ipairs(plugin_names) do
+        local commands = dfhack.internal.listCommands(plugin)
+        local includes_plugin = false
+        for _,command in ipairs(commands) do
+            local kwargs = {entry_types={[ENTRY_TYPES.COMMAND]=true}}
+            if command == plugin then
+                kwargs.entry_types[ENTRY_TYPES.PLUGIN]=true
+                includes_plugin = true
+            end
+            kwargs.short_help = dfhack.internal.getCommandDescription(command)
+            update_db(old_db, command, plugin,
+                      has_rendered_help(plugin) and
+                            HELP_SOURCES.RENDERED or HELP_SOURCES.PLUGIN,
+                      kwargs)
+        end
+        if not includes_plugin then
+            update_db(old_db, plugin, plugin,
+                      has_rendered_help(plugin) and
+                            HELP_SOURCES.RENDERED or HELP_SOURCES.STUB,
+                      {entry_types={[ENTRY_TYPES.PLUGIN]=true}})
+        end
+    end
+end
+
+-- scan for scripts and add their help to the db
+local function scan_scripts(old_db)
+    local entry_types = {[ENTRY_TYPES.COMMAND]=true}
+    for _,script_path in ipairs(dfhack.internal.getScriptPaths()) do
+        local files = dfhack.filesystem.listdir_recursive(
+                                            script_path, nil, false)
+        if not files then goto skip_path end
+        for _,f in ipairs(files) do
+            if f.isdir or
+                (not f.path:endswith('.lua') and not f.path:endswith('.rb')) or
+                    f.path:startswith('test/') or
+                    f.path:startswith('internal/') then
+                goto continue
+            end
+            local dot_index = f.path:find('%.[^.]*$')
+            local entry_name = f.path:sub(1, dot_index - 1)
+            local source_path = script_path .. '/' .. f.path
+            update_db(old_db, entry_name, entry_name,
+                      has_rendered_help(entry_name) and
+                            HELP_SOURCES.RENDERED or HELP_SOURCES.SCRIPT,
+                      {entry_types=entry_types, source_path=source_path})
+            ::continue::
+        end
+        ::skip_path::
+    end
+end
+
+-- read tags and descriptions from the TAG_DEFINITIONS file and add them all
+-- to tag_index, initizlizing each entry with an empty list.
+local function initialize_tags()
+    local tag, desc, in_desc = nil, nil, false
+    local ok, lines = pcall(io.lines, TAG_DEFINITIONS)
+    if not ok then return end
+    for line in lines do
+        if in_desc then
+            line = line:trim()
+            if #line == 0 then
+                in_desc = false
+                goto continue
+            end
+            desc = desc .. ' ' .. line
+            tag_index[tag].description = desc
+        else
+            _,_,tag,desc = line:find('^%* (%w+): (.+)')
+            if not tag then goto continue end
+            tag_index[tag] = {description=desc}
+            in_desc = true
+        end
+        ::continue::
+    end
+end
+
+local function index_tags()
+    for entry_name,entry in pairs(entrydb) do
+        for tag in pairs(textdb[entry.text_entry].tags) do
+            -- ignore unknown tags
+            if tag_index[tag] then
+                table.insert(tag_index[tag], entry_name)
+            end
+        end
+    end
+end
+
+-- ensures the db is up to date by scanning all help sources. does not do
+-- anything if it has already been run within the last MAX_STALE_MS milliseconds
+local last_refresh_ms = 0
+local function ensure_db()
+    local now_ms = dfhack.getTickCount()
+    if now_ms - last_refresh_ms <= MAX_STALE_MS then return end
+    last_refresh_ms = now_ms
+
+    local old_db = textdb
+    textdb, entrydb, tag_index = {}, {}, {}
+
+    initialize_tags()
+    scan_builtins(old_db)
+    scan_plugins(old_db)
+    scan_scripts(old_db)
+    index_tags()
+end
+
+---------------------------------------------------------------------------
+-- get API
+---------------------------------------------------------------------------
+
+-- converts strings into single-element lists containing that string
+local function normalize_string_list(l)
+    if not l or #l == 0 then return nil end
+    if type(l) == 'string' then
+        return {l}
+    end
+    return l
+end
+
+local function has_keys(str, dict)
+    if not str or #str == 0 then
+        return false
+    end
+    for _,s in ipairs(normalize_string_list(str)) do
+        if not dict[s] then
+            return false
+        end
+    end
+    return true
+end
+
+-- returns whether the given string (or list of strings) is an entry (are all
+-- entries) in the db
+function is_entry(str)
+    ensure_db()
+    return has_keys(str, entrydb)
+end
+
+local function get_db_property(entry_name, property)
+    ensure_db()
+    if not entrydb[entry_name] then
+        error(('helpdb entry not found: "%s"'):format(entry_name))
+    end
+    return entrydb[entry_name][property] or
+            textdb[entrydb[entry_name].text_entry][property]
+end
+
+function get_entry_types(entry)
+    return get_db_property(entry, 'entry_types')
+end
+
+-- returns the ~54 char summary blurb associated with the entry
+function get_entry_short_help(entry)
+    return get_db_property(entry, 'short_help')
+end
+
+-- returns the full help documentation associated with the entry
+function get_entry_long_help(entry)
+    return get_db_property(entry, 'long_help')
+end
+
+-- returns the set of tags associated with the entry
+function get_entry_tags(entry)
+    return get_db_property(entry, 'tags')
+end
+
+-- returns whether the given string (or list of strings) matches a tag name
+function is_tag(str)
+    ensure_db()
+    return has_keys(str, tag_index)
+end
+
+local function set_to_sorted_list(set)
+    local list = {}
+    for item in pairs(set) do
+        table.insert(list, item)
+    end
+    table.sort(list)
+    return list
+end
+
+-- returns the defined tags in alphabetical order
+function get_tags()
+    ensure_db()
+    return set_to_sorted_list(tag_index)
+end
+
+function get_tag_data(tag)
+    ensure_db()
+    if not tag_index[tag] then
+        error(('helpdb tag not found: "%s"'):format(tag))
+    end
+    return tag_index[tag]
+end
+
+---------------------------------------------------------------------------
+-- search API
+---------------------------------------------------------------------------
+
+-- returns a list of path elements in reverse order
+local function chunk_for_sorting(str)
+    local parts = str:split('/')
+    local chunks = {}
+    for i=1,#parts do
+        chunks[#parts - i + 1] = parts[i]
+    end
+    return chunks
+end
+
+-- sorts by last path component, then by parent path components.
+-- something comes before nothing.
+-- e.g. gui/autofarm comes immediately before autofarm
+function sort_by_basename(a, b)
+    local a = chunk_for_sorting(a)
+    local b = chunk_for_sorting(b)
+    local i = 1
+    while a[i] do
+        if not b[i] then
+            return true
+        end
+        if a[i] ~= b[i] then
+            return a[i] < b[i]
+        end
+        i = i + 1
+    end
+    return false
+end
+
+local function matches(entry_name, filter)
+    if filter.tag then
+        local matched = false
+        local tags = get_db_property(entry_name, 'tags')
+        for _,tag in ipairs(filter.tag) do
+            if tags[tag] then
+                matched = true
+                break
+            end
+        end
+        if not matched then
+            return false
+        end
+    end
+    if filter.entry_type then
+        local matched = false
+        local etypes = get_db_property(entry_name, 'entry_types')
+        for _,etype in ipairs(filter.entry_type) do
+            if etypes[etype] then
+                matched = true
+                break
+            end
+        end
+        if not matched then
+            return false
+        end
+    end
+    if filter.str then
+        local matched = false
+        for _,str in ipairs(filter.str) do
+            if entry_name:find(str, 1, true) then
+                matched = true
+                break
+            end
+        end
+        if not matched then
+            return false
+        end
+    end
+    return true
+end
+
+-- normalizes the lists in the filter and returns nil if no filter elements are
+-- populated
+local function normalize_filter(f)
+    if not f then return nil end
+    local filter = {}
+    filter.str = normalize_string_list(f.str)
+    filter.tag = normalize_string_list(f.tag)
+    filter.entry_type = normalize_string_list(f.entry_type)
+    if not filter.str and not filter.tag and not filter.entry_type then
+        return nil
+    end
+    return filter
+end
+
+-- returns a list of entry names, alphabetized by their last path component,
+-- with populated path components coming before null path components (e.g.
+-- autobutcher will immediately follow gui/autobutcher).
+-- the optional include and exclude filter params are maps with the following
+-- elements:
+--   str - if a string, filters by the given substring. if a table of strings,
+--         includes entry names that match any of the given substrings.
+--   tag - if a string, filters by the given tag name. if a table of strings,
+--         includes entries that match any of the given tags.
+--   entry_type - if a string, matches entries of the given type. if a table of
+--         strings, includes entries that match any of the given types. valid
+--         types are: "builtin", "plugin", "command". note that many plugin
+--         commands have the same name as the plugin, so those entries will
+--         match both "plugin" and "command" types.
+function search_entries(include, exclude)
+    ensure_db()
+    include = normalize_filter(include)
+    exclude = normalize_filter(exclude)
+    local entries = {}
+    for entry in pairs(entrydb) do
+        if (not include or matches(entry, include)) and
+                (not exclude or not matches(entry, exclude)) then
+            table.insert(entries, entry)
+        end
+    end
+    table.sort(entries, sort_by_basename)
+    return entries
+end
+
+-- returns a list of all commands. used by Core's autocomplete functionality.
+function get_commands()
+    local include = {entry_type=ENTRY_TYPES.COMMAND}
+    return search_entries(include)
+end
+
+function is_builtin(command)
+    return is_entry(command) and get_entry_types(command)[ENTRY_TYPES.BUILTIN]
+end
+
+---------------------------------------------------------------------------
+-- print API (outputs to console)
+---------------------------------------------------------------------------
+
+-- implements the 'help' builtin command
+function help(entry)
+    ensure_db()
+    if not entrydb[entry] then
+        dfhack.printerr(('No help entry found for "%s"'):format(entry))
+        return
+    end
+    print(get_entry_long_help(entry))
+end
+
+-- prints col1text (width 21), a one space gap, and col2 (width 58)
+-- if col1text is longer than 21 characters, col2text is printed starting on the
+-- next line. if col2text is longer than 58 characters, it is wrapped. col2text
+-- lines on lines below the col1text output are indented by one space further
+-- than the col2text on the first line.
+local COL1WIDTH, COL2WIDTH = 20, 58
+local function print_columns(col1text, col2text)
+    col2text = col2text:wrap(COL2WIDTH)
+    local wrapped_col2 = {}
+    for line in col2text:gmatch('[^'..NEWLINE..']*') do
+        table.insert(wrapped_col2, line)
+    end
+    local col2_start_line = 1
+    if #col1text > COL1WIDTH then
+        print(col1text)
+    else
+        print(('%-'..COL1WIDTH..'s %s'):format(col1text, wrapped_col2[1]))
+        col2_start_line = 2
+    end
+    for i=col2_start_line,#wrapped_col2 do
+        print(('%'..COL1WIDTH..'s  %s'):format(' ', wrapped_col2[i]))
+    end
+end
+
+-- implements the 'tags' builtin command
+function tags()
+    local tags = get_tags()
+    for _,tag in ipairs(tags) do
+        print_columns(tag, get_tag_data(tag).description)
+    end
+end
+
+-- prints the requested entries to the console. include and exclude filters are
+-- defined as in search_entries() above.
+local function list_entries(skip_tags, include, exclude)
+    local entries = search_entries(include, exclude)
+    for _,entry in ipairs(entries) do
+        print_columns(entry, get_entry_short_help(entry))
+        if not skip_tags then
+            local tags = set_to_sorted_list(get_entry_tags(entry))
+            if #tags > 0 then
+                print(('    tags: %s'):format(table.concat(tags, ', ')))
+            end
+        end
+    end
+    if #entries == 0 then
+        print('No matches.')
+    end
+end
+
+-- wraps the list_entries() API to provide a more convenient interface for Core
+-- to implement the 'ls' builtin command.
+--   filter_str - if a tag name, will filter by that tag. otherwise, will filter
+--                as a substring
+--   skip_tags - whether to skip printing tag info
+--   show_dev_commands - if true, will include scripts in the modtools/ and
+--                       devel/ directories. otherwise those scripts will be
+--                       excluded
+function ls(filter_str, skip_tags, show_dev_commands)
+    local include = {entry_type={ENTRY_TYPES.COMMAND}}
+    if is_tag(filter_str) then
+        include.tag = filter_str
+    else
+        include.str = filter_str
+    end
+    list_entries(skip_tags, include,
+                 show_dev_commands and {} or {tag='dev'})
+end
+
+return _ENV
diff --git a/test/library/helpdb.lua b/test/library/helpdb.lua
new file mode 100644
index 000000000..6c2ef2e9b
--- /dev/null
+++ b/test/library/helpdb.lua
@@ -0,0 +1,648 @@
+local h = require('helpdb')
+
+local mock_plugin_db = {
+    hascommands={
+        boxbinders={description="Box your binders.", help=[[Box your binders.
+        This command will help you box your binders.]]},
+        bindboxers={description="Bind your boxers.", help=[[Bind your boxers.
+        This command will help you bind your boxers.]]}
+    },
+    samename={
+        samename={description="Samename.", help=[[Samename.
+        This command has the same name as its host plugin.]]}
+    },
+    nocommand={},
+    nodocs_hascommands={
+        nodoc_command={description="cpp description.", help=[[cpp description.
+        Rest of help.]]}
+    },
+    nodocs_samename={
+        nodocs_samename={description="Nodocs samename.", help=[[Nodocs samename.
+        This command has the same name as its host plugin but no rst docs.]]}
+    },
+    nodocs_nocommand={},
+}
+
+local mock_command_db = {}
+for k,v in pairs(mock_plugin_db) do
+    for c,d in pairs(v) do
+        mock_command_db[c] = d
+    end
+end
+
+local mock_script_db = {
+    basic=true,
+    ['subdir/scriptname']=true,
+    inscript_docs=true,
+    inscript_short_only=true,
+    nodocs_script=true,
+}
+
+local files = {
+    ['hack/docs/docs/Tags.txt']=[[
+* fort: Tools that are useful while in fort mode.
+
+* armok: Tools that give you complete control over
+  an aspect of the game or provide access to
+  information that the game intentionally keeps
+  hidden.
+
+* map: Tools that interact with the game map.
+
+* units: Tools that interact with units.
+
+* nomembers: Nothing is tagged with this.
+    ]],
+    ['hack/docs/docs/tools/hascommands.txt']=[[
+hascommands
+***********
+
+**Tags:** fort | armok | units
+
+Documented a plugin that
+has commands.
+
+**Command:** "boxbinders"
+
+Documented boxbinders.
+
+**Command:** "bindboxers"
+
+Documented bindboxers.
+
+Documented full help.
+    ]],
+    ['hack/docs/docs/tools/samename.txt']=[[
+samename
+********
+
+**Tags:** fort | armok
+| units
+
+**Command:** "samename"
+
+Documented samename.
+
+Documented full help.
+    ]],
+    ['hack/docs/docs/tools/nocommand.txt']=[[
+nocommand
+*********
+
+**Tags:** fort | armok |
+units
+
+Documented nocommand.
+
+Documented full help.
+    ]],
+    ['hack/docs/docs/tools/basic.txt']=[[
+basic
+*****
+
+**Tags:** map
+
+**Command:** "basic"
+
+Documented basic.
+
+Documented full help.
+    ]],
+    ['hack/docs/docs/tools/subdir/scriptname.txt']=[[
+subdir/scriptname
+*****************
+
+**Tags:** map
+
+**Command:** "subdir/scriptname"
+
+Documented subdir/scriptname.
+
+Documented full help.
+    ]],
+    ['scripts/scriptpath/basic.lua']=[[
+-- in-file short description for basic
+-- [====[
+basic
+=====
+
+**Tags:** map
+
+**Command:** "basic"
+
+in-file basic.
+
+Documented full help.
+]====]
+script contents
+    ]],
+    ['scripts/scriptpath/subdir/scriptname.lua']=[[
+-- in-file short description for scriptname
+-- [====[
+subdir/scriptname
+=================
+
+**Tags:** map
+
+**Command:** "subdir/scriptname"
+
+in-file scriptname.
+
+Documented full help.
+]====]
+script contents
+    ]],
+    ['scripts/scriptpath/inscript_docs.lua']=[[
+-- in-file short description for inscript_docs
+-- [====[
+inscript_docs
+=============
+
+**Tags:** map | badtag
+
+**Command:** "inscript_docs"
+
+in-file inscript_docs.
+
+Documented full help.
+]====]
+script contents
+    ]],
+    ['scripts/scriptpath/nodocs_script.lua']=[[
+    script contents
+    ]],
+    ['scripts/scriptpath/inscript_short_only.lua']=[[
+    -- inscript short desc.
+
+    script contents
+    ]],
+    ['other/scriptpath/basic.lua']=[[
+-- in-file short description for basic (other)
+-- [====[
+basic
+=====
+
+**Tags:** map
+
+**Command:** "basic"
+
+in-file basic (other).
+
+Documented full help.
+]====]
+script contents
+    ]],
+    ['other/scriptpath/subdir/scriptname.lua']=[[
+-- in-file short description for scriptname (other)
+-- [====[
+subdir/scriptname
+=================
+
+**Tags:** map
+
+**Command:** "subdir/scriptname"
+
+in-file scriptname (other).
+
+Documented full help.
+]====]
+script contents
+    ]],
+    ['other/scriptpath/inscript_docs.lua']=[[
+-- in-file short description for inscript_docs (other)
+-- [====[
+inscript_docs
+=============
+
+**Tags:** map
+
+**Command:** "inscript_docs"
+
+in-file inscript_docs (other).
+
+Documented full help.
+]====]
+script contents
+    ]],
+}
+
+local function mock_getCommandHelp(command)
+    if mock_command_db[command] then
+        return mock_command_db[command].help
+    end
+end
+
+local function mock_listPlugins()
+    local list = {}
+    for k in pairs(mock_plugin_db) do
+        table.insert(list, k)
+    end
+    return list
+end
+
+local function mock_listCommands(plugin)
+    local list = {}
+    for k,v in pairs(mock_plugin_db) do
+        if k == plugin then
+            for c in pairs(v) do
+                table.insert(list, c)
+            end
+            break
+        end
+    end
+    return list
+end
+
+local function mock_getCommandDescription(command)
+    if mock_command_db[command] then
+        return mock_command_db[command].description
+    end
+end
+
+local function mock_getScriptPaths()
+    return {'scripts/scriptpath', 'other/scriptpath'}
+end
+
+local function mock_mtime(path)
+    if files[path] then return 1 end
+    return -1
+end
+
+local function mock_listdir_recursive(script_path)
+    local list = {}
+    for s in pairs(mock_script_db) do
+        table.insert(list, {isdir=false, path=s..'.lua'})
+    end
+    return list
+end
+
+local function mock_getTickCount()
+    return 100000
+end
+
+local function mock_pcall(fn, fname)
+    if fn ~= io.lines then error('unexpected fn for pcall') end
+    if not files[fname] then
+        return false
+    end
+    return true, files[fname]:gmatch('([^\n]*)\n?')
+end
+
+config.wrapper = function(test_fn)
+    mock.patch({
+        {h.dfhack.internal, 'getCommandHelp', mock_getCommandHelp},
+        {h.dfhack.internal, 'listPlugins', mock_listPlugins},
+        {h.dfhack.internal, 'listCommands', mock_listCommands},
+        {h.dfhack.internal, 'getCommandDescription', mock_getCommandDescription},
+        {h.dfhack.internal, 'getScriptPaths', mock_getScriptPaths},
+        {h.dfhack.filesystem, 'mtime', mock_mtime},
+        {h.dfhack.filesystem, 'listdir_recursive', mock_listdir_recursive},
+        {h.dfhack, 'getTickCount', mock_getTickCount},
+        {h, 'pcall', mock_pcall},
+    }, test_fn)
+end
+
+function test.is_entry()
+    expect.true_(h.is_entry('ls'),
+        'builtin commands get an entry')
+    expect.true_(h.is_entry('hascommands'),
+        'plugins whose names do not match their commands get an entry')
+    expect.true_(h.is_entry('boxbinders'),
+        'commands whose name does not match the host plugin get an entry')
+    expect.true_(h.is_entry('samename'),
+        'plugins that have a command with the same name get one entry')
+    expect.true_(h.is_entry('nocommand'),
+        'plugins that do not have commands get an entry')
+    expect.true_(h.is_entry('basic'),
+        'scripts in the script path get an entry')
+    expect.true_(h.is_entry('subdir/scriptname'),
+        'scripts in subdirs of a script path get an entry')
+
+    expect.true_(h.is_entry('nodocs_hascommands'),
+        'plugins whose names do not match their commands get an entry')
+    expect.true_(h.is_entry('nodoc_command'),
+        'commands whose name does not match the host plugin get an entry')
+    expect.true_(h.is_entry('nodocs_samename'),
+        'plugins that have a command with the same name get one entry')
+    expect.true_(h.is_entry('nodocs_nocommand'),
+        'plugins that do not have commands get an entry')
+    expect.true_(h.is_entry('inscript_docs'),
+        'scripts in the script path get an entry')
+    expect.true_(h.is_entry('nodocs_script'),
+        'scripts in the script path get an entry')
+    expect.true_(h.is_entry('inscript_short_only'),
+        'scripts in the script path get an entry')
+
+    expect.false_(h.is_entry(nil),
+        'nil is not an entry')
+    expect.false_(h.is_entry(''),
+        'blank is not an entry')
+    expect.false_(h.is_entry('notanentryname'),
+        'strings that are neither plugin names nor command names do not get an entry')
+
+    expect.true_(h.is_entry({'hascommands', 'boxbinders', 'nocommand'}),
+        'list of valid entries')
+    expect.false_(h.is_entry({'hascommands', 'notanentryname'}),
+        'list contains an element that is not an entry')
+end
+
+function test.get_entry_types()
+    expect.table_eq({builtin=true, command=true}, h.get_entry_types('ls'))
+
+    expect.table_eq({plugin=true}, h.get_entry_types('hascommands'))
+    expect.table_eq({command=true}, h.get_entry_types('boxbinders'))
+    expect.table_eq({plugin=true, command=true}, h.get_entry_types('samename'))
+    expect.table_eq({plugin=true}, h.get_entry_types('nocommand'))
+    expect.table_eq({command=true}, h.get_entry_types('basic'))
+    expect.table_eq({command=true}, h.get_entry_types('subdir/scriptname'))
+
+    expect.table_eq({plugin=true}, h.get_entry_types('nodocs_hascommands'))
+    expect.table_eq({command=true}, h.get_entry_types('nodoc_command'))
+    expect.table_eq({plugin=true, command=true}, h.get_entry_types('nodocs_samename'))
+    expect.table_eq({plugin=true}, h.get_entry_types('nodocs_nocommand'))
+    expect.table_eq({command=true}, h.get_entry_types('nodocs_script'))
+    expect.table_eq({command=true}, h.get_entry_types('inscript_docs'))
+    expect.table_eq({command=true}, h.get_entry_types('inscript_short_only'))
+
+    expect.error_match('entry not found', function()
+        h.get_entry_types('notanentry') end)
+end
+
+function test.get_entry_short_help()
+    expect.eq('No help available.', h.get_entry_short_help('ls'),
+        'no docs for builtin fn result in default short description')
+
+    expect.eq('Documented a plugin that has commands.', h.get_entry_short_help('hascommands'))
+    expect.eq('Box your binders.', h.get_entry_short_help('boxbinders'),
+        'should get short help from command description')
+    expect.eq('Samename.', h.get_entry_short_help('samename'),
+        'should get short help from command description')
+    expect.eq('Documented nocommand.', h.get_entry_short_help('nocommand'))
+    expect.eq('Documented basic.', h.get_entry_short_help('basic'))
+    expect.eq('Documented subdir/scriptname.', h.get_entry_short_help('subdir/scriptname'))
+
+    expect.eq('No help available.', h.get_entry_short_help('nodocs_hascommands'))
+    expect.eq('cpp description.', h.get_entry_short_help('nodoc_command'),
+        'should get short help from command description')
+    expect.eq('Nodocs samename.', h.get_entry_short_help('nodocs_samename'),
+        'should get short help from command description')
+    expect.eq('No help available.', h.get_entry_short_help('nodocs_nocommand'))
+    expect.eq('in-file short description for inscript_docs.',
+        h.get_entry_short_help('inscript_docs'),
+        'should get short help from header comment')
+    expect.eq('No help available.',
+        h.get_entry_short_help('nodocs_script'))
+    expect.eq('inscript short desc.',
+        h.get_entry_short_help('inscript_short_only'),
+        'should get short help from header comment')
+end
+
+function test.get_entry_long_help()
+    -- long help for plugins/commands that have doc files should match the
+    -- contents of those files exactly
+    expect.eq(files['hack/docs/docs/tools/hascommands.txt'],
+        h.get_entry_long_help('hascommands'))
+    expect.eq(files['hack/docs/docs/tools/hascommands.txt'],
+        h.get_entry_long_help('boxbinders'))
+    expect.eq(files['hack/docs/docs/tools/samename.txt'],
+        h.get_entry_long_help('samename'))
+    expect.eq(files['hack/docs/docs/tools/nocommand.txt'],
+        h.get_entry_long_help('nocommand'))
+    expect.eq(files['hack/docs/docs/tools/basic.txt'],
+        h.get_entry_long_help('basic'))
+    expect.eq(files['hack/docs/docs/tools/subdir/scriptname.txt'],
+        h.get_entry_long_help('subdir/scriptname'))
+
+    -- plugins/commands that have no doc files get the default template
+    expect.eq([[ls
+**
+
+No help available.
+]], h.get_entry_long_help('ls'))
+    expect.eq([[nodocs_hascommands
+******************
+
+No help available.
+]], h.get_entry_long_help('nodocs_hascommands'))
+    expect.eq([[nodocs_hascommands
+******************
+
+No help available.
+]], h.get_entry_long_help('nodoc_command'))
+    expect.eq([[Nodocs samename.
+        This command has the same name as its host plugin but no rst docs.]], h.get_entry_long_help('nodocs_samename'))
+    expect.eq([[nodocs_nocommand
+****************
+
+No help available.
+]], h.get_entry_long_help('nodocs_nocommand'))
+    expect.eq([[nodocs_script
+*************
+
+No help available.
+]], h.get_entry_long_help('nodocs_script'))
+    expect.eq([[inscript_short_only
+*******************
+
+No help available.
+]], h.get_entry_long_help('inscript_short_only'))
+
+    -- scripts that have no doc files get the docs from the script lua source
+    expect.eq([[inscript_docs
+=============
+
+**Tags:** map | badtag
+
+**Command:** "inscript_docs"
+
+in-file inscript_docs.
+
+Documented full help.]], h.get_entry_long_help('inscript_docs'))
+end
+
+function test.get_entry_tags()
+    expect.table_eq({fort=true, armok=true, units=true},
+        h.get_entry_tags('hascommands'))
+    expect.table_eq({fort=true, armok=true, units=true},
+        h.get_entry_tags('samename'))
+    expect.table_eq({fort=true, armok=true, units=true},
+        h.get_entry_tags('nocommand'))
+    expect.table_eq({map=true}, h.get_entry_tags('basic'))
+    expect.table_eq({map=true}, h.get_entry_tags('inscript_docs'),
+        'bad tags should get filtered out')
+end
+
+function test.is_tag()
+    -- see tags defined in the Tags.txt files entry above
+    expect.true_(h.is_tag('map'))
+    expect.true_(h.is_tag({'map', 'armok'}))
+
+    expect.false_(h.is_tag(nil))
+    expect.false_(h.is_tag(''))
+    expect.false_(h.is_tag('not_tag'))
+    expect.false_(h.is_tag({'map', 'not_tag', 'armok'}))
+end
+
+function test.get_tags()
+    expect.table_eq({'armok', 'fort', 'map', 'nomembers', 'units'},
+        h.get_tags())
+end
+
+function test.get_tag_data()
+    local tag_data = h.get_tag_data('armok')
+    table.sort(tag_data)
+    expect.table_eq({description='Tools that give you complete control over an aspect of the game or provide access to information that the game intentionally keeps hidden.',
+        'bindboxers', 'boxbinders', 'hascommands', 'nocommand', 'samename'},
+        tag_data,
+        'multi-line descriptions should get joined into a single line.')
+
+    tag_data = h.get_tag_data('fort')
+    table.sort(tag_data)
+    expect.table_eq({description='Tools that are useful while in fort mode.',
+        'bindboxers', 'boxbinders', 'hascommands', 'nocommand', 'samename'},
+        tag_data)
+
+    tag_data = h.get_tag_data('units')
+    table.sort(tag_data)
+    expect.table_eq({description='Tools that interact with units.',
+        'bindboxers', 'boxbinders', 'hascommands', 'nocommand', 'samename'},
+        tag_data)
+
+    tag_data = h.get_tag_data('map')
+    table.sort(tag_data)
+    expect.table_eq({description='Tools that interact with the game map.',
+        'basic', 'inscript_docs', 'subdir/scriptname'},
+        tag_data)
+
+    expect.table_eq({description='Nothing is tagged with this.'}, h.get_tag_data('nomembers'))
+
+    expect.error_match('tag not found',
+        function() h.get_tag_data('notatag') end)
+end
+
+function test.search_entries()
+    -- all entries, in alphabetical order by last path component
+    local expected = {'?', 'alias', 'basic', 'bindboxers', 'boxbinders',
+        'clear', 'cls', 'die', 'dir', 'disable', 'devel/dump-rpc', 'enable',
+        'fpause', 'hascommands', 'help', 'hide', 'inscript_docs',
+        'inscript_short_only', 'keybinding', 'kill-lua', 'load', 'ls', 'man',
+        'nocommand', 'nodoc_command', 'nodocs_hascommands', 'nodocs_nocommand',
+        'nodocs_samename', 'nodocs_script', 'plug', 'reload', 'samename',
+        'script', 'subdir/scriptname', 'sc-script', 'show', 'tags', 'type',
+        'unload'}
+    table.sort(expected, h.sort_by_basename)
+    expect.table_eq(expected, h.search_entries())
+    expect.table_eq(expected, h.search_entries({}))
+    expect.table_eq(expected, h.search_entries(nil, {}))
+    expect.table_eq(expected, h.search_entries({}, {}))
+
+    expected = {'inscript_docs', 'subdir/scriptname'}
+    expect.table_eq(expected, h.search_entries({tag='map', str='script'}))
+
+    expected = {'script', 'sc-script'}
+    table.sort(expected, h.sort_by_basename)
+    expect.table_eq(expected, h.search_entries({str='script',
+                                                entry_type='builtin'}))
+
+    expected = {'inscript_docs', 'inscript_short_only','nodocs_script',
+                'subdir/scriptname'}
+    expect.table_eq(expected, h.search_entries({str='script'},
+                                               {entry_type='builtin'}))
+
+    expected = {'bindboxers', 'boxbinders'}
+    expect.table_eq(expected, h.search_entries({str='box'}))
+end
+
+function test.get_commands()
+    local expected = {'?', 'alias', 'basic', 'bindboxers', 'boxbinders',
+        'clear', 'cls', 'die', 'dir', 'disable', 'devel/dump-rpc', 'enable',
+        'fpause', 'help', 'hide', 'inscript_docs', 'inscript_short_only',
+        'keybinding', 'kill-lua', 'load', 'ls', 'man', 'nodoc_command',
+        'nodocs_samename', 'nodocs_script', 'plug', 'reload', 'samename',
+        'script', 'subdir/scriptname', 'sc-script', 'show', 'tags', 'type',
+        'unload'}
+    table.sort(expected, h.sort_by_basename)
+    expect.table_eq(expected, h.get_commands())
+end
+
+function test.is_builtin()
+    expect.true_(h.is_builtin('ls'))
+    expect.false_(h.is_builtin('basic'))
+    expect.false_(h.is_builtin('notanentry'))
+end
+
+function test.help()
+    expect.printerr_match('No help entry found', function() h.help('blarg') end)
+
+    local mock_print = mock.func()
+    mock.patch(h, 'print', mock_print, function()
+        h.help('nocommand')
+        expect.eq(1, mock_print.call_count)
+        expect.eq(files['hack/docs/docs/tools/nocommand.txt'],
+            mock_print.call_args[1][1])
+    end)
+end
+
+function test.tags()
+    local mock_print = mock.func()
+    mock.patch(h, 'print', mock_print, function()
+        h.tags()
+        expect.eq(7, mock_print.call_count)
+        expect.eq('armok                Tools that give you complete control over an aspect of the',
+            mock_print.call_args[1][1])
+        expect.eq('                      game or provide access to information that the game',
+            mock_print.call_args[2][1])
+        expect.eq('                      intentionally keeps hidden.',
+            mock_print.call_args[3][1])
+        expect.eq('fort                 Tools that are useful while in fort mode.',
+            mock_print.call_args[4][1])
+        expect.eq('map                  Tools that interact with the game map.',
+            mock_print.call_args[5][1])
+        expect.eq('nomembers            Nothing is tagged with this.',
+            mock_print.call_args[6][1])
+        expect.eq('units                Tools that interact with units.',
+            mock_print.call_args[7][1])
+    end)
+end
+
+function test.ls()
+    local mock_print = mock.func()
+    mock.patch(h, 'print', mock_print, function()
+        h.ls('doc') -- interpreted as a string
+        expect.eq(5, mock_print.call_count)
+        expect.eq('inscript_docs        in-file short description for inscript_docs.',
+            mock_print.call_args[1][1])
+        expect.eq('    tags: map', mock_print.call_args[2][1])
+        expect.eq('nodoc_command        cpp description.',
+            mock_print.call_args[3][1])
+        expect.eq('nodocs_samename      Nodocs samename.',
+            mock_print.call_args[4][1])
+        expect.eq('nodocs_script        No help available.',
+            mock_print.call_args[5][1])
+    end)
+
+    mock_print = mock.func()
+    mock.patch(h, 'print', mock_print, function()
+        h.ls('armok') -- interpreted as a tag
+        expect.eq(6, mock_print.call_count)
+        expect.eq('bindboxers           Bind your boxers.',
+            mock_print.call_args[1][1])
+        expect.eq('    tags: armok, fort, units',
+            mock_print.call_args[2][1])
+        expect.eq('boxbinders           Box your binders.',
+            mock_print.call_args[3][1])
+        expect.eq('    tags: armok, fort, units',
+            mock_print.call_args[4][1])
+        expect.eq('samename             Samename.',
+            mock_print.call_args[5][1])
+        expect.eq('    tags: armok, fort, units',
+            mock_print.call_args[6][1])
+    end)
+
+    mock_print = mock.func()
+    mock.patch(h, 'print', mock_print, function()
+        h.ls('not a match')
+        expect.eq(1, mock_print.call_count)
+        expect.eq('No matches.', mock_print.call_args[1][1])
+    end)
+end

From 945cdece755bcdbb734a23868a1e35b44e8cd151 Mon Sep 17 00:00:00 2001
From: DFHack-Urist via GitHub Actions
 <63161697+DFHack-Urist@users.noreply.github.com>
Date: Mon, 15 Aug 2022 23:47:01 +0000
Subject: [PATCH 520/854] Auto-update submodules

scripts: master
---
 scripts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts b/scripts
index 3d65c9a75..3adfc16bf 160000
--- a/scripts
+++ b/scripts
@@ -1 +1 @@
-Subproject commit 3d65c9a75a8c7a3607e71529f6264bab3e637755
+Subproject commit 3adfc16bfd097161172221fe4ecb780f0753ca3c

From cc5d564b42b7ae2fafb805eb9356dcde0826e24c Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Mon, 11 Jul 2022 17:23:56 -0700
Subject: [PATCH 521/854] support backtick as a keybinding

and bind it to gui/launcher
---
 data/init/dfhack.keybindings.init | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/data/init/dfhack.keybindings.init b/data/init/dfhack.keybindings.init
index e32a7c58e..f38840e06 100644
--- a/data/init/dfhack.keybindings.init
+++ b/data/init/dfhack.keybindings.init
@@ -8,6 +8,8 @@
 # Generic dwarfmode bindings #
 ##############################
 
+keybinding add ` gui/launcher
+
 # show all current key bindings
 keybinding add Ctrl-F1 hotkeys
 keybinding add Alt-F1 hotkeys

From 471be0699579bb87c10df489ceb8e6898e579904 Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Sun, 7 Aug 2022 22:50:47 -0700
Subject: [PATCH 522/854] add secondary hotkey for gui/launcher

---
 data/init/dfhack.keybindings.init | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/data/init/dfhack.keybindings.init b/data/init/dfhack.keybindings.init
index f38840e06..c8785eba7 100644
--- a/data/init/dfhack.keybindings.init
+++ b/data/init/dfhack.keybindings.init
@@ -8,7 +8,9 @@
 # Generic dwarfmode bindings #
 ##############################
 
+# the GUI command launcher (two bindings since some keyboards don't have `)
 keybinding add ` gui/launcher
+keybinding add Ctrl-Shift-D gui/launcher
 
 # show all current key bindings
 keybinding add Ctrl-F1 hotkeys
@@ -42,7 +44,7 @@ keybinding add Ctrl-K autodump-destroy-item
 # quicksave, only in main dwarfmode screen and menu page
 keybinding add Ctrl-Alt-S@dwarfmode/Default quicksave
 
-# gui/quickfort script - apply pre-made blueprints to the map
+# apply blueprints to the map (Alt-F for compatibility with LNP Quickfort)
 keybinding add Ctrl-Shift-Q@dwarfmode gui/quickfort
 keybinding add Alt-F@dwarfmode gui/quickfort
 

From a167dcc72a245cf76480eadfb5c222fe824f854b Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Mon, 15 Aug 2022 16:58:33 -0700
Subject: [PATCH 523/854] update to scripts head

---
 scripts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts b/scripts
index 3adfc16bf..52e292ecf 160000
--- a/scripts
+++ b/scripts
@@ -1 +1 @@
-Subproject commit 3adfc16bfd097161172221fe4ecb780f0753ca3c
+Subproject commit 52e292ecf7e498c6114a81223380d2b12f3718c1

From b01ef4a96237431d545cf6b999208d4809ecdde7 Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Mon, 15 Aug 2022 23:14:16 -0700
Subject: [PATCH 524/854] add todos about not using strong for text output

---
 docs/sphinx_extensions/dfhack/tool_docs.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/docs/sphinx_extensions/dfhack/tool_docs.py b/docs/sphinx_extensions/dfhack/tool_docs.py
index a051b76af..1c4cd74e0 100644
--- a/docs/sphinx_extensions/dfhack/tool_docs.py
+++ b/docs/sphinx_extensions/dfhack/tool_docs.py
@@ -55,6 +55,7 @@ def render_dfhack_keybind(command) -> List[nodes.paragraph]:
         return out
     for keycmd, key, ctx in _KEYBINDS[command]:
         n = nodes.paragraph()
+        # TODO: use inline instead of strong when rendering to text
         n += nodes.strong('Keybinding:', 'Keybinding:')
         n += nodes.inline(' ', ' ')
         for k in key:
@@ -97,6 +98,7 @@ class DFHackToolDirectiveBase(sphinx.directives.ObjectDescription):
     @staticmethod
     def make_labeled_paragraph(label, content, label_class=nodes.strong, content_class=nodes.inline) -> nodes.paragraph:
         return nodes.paragraph('', '', *[
+            # TODO: use inline instead of strong when rendering to text
             label_class('', '{}:'.format(label)),
             nodes.inline(text=' '),
             content_class('', content),
@@ -121,6 +123,7 @@ class DFHackToolDirective(DFHackToolDirectiveBase):
     }
 
     def render_content(self) -> List[nodes.Node]:
+        # TODO: use inline instead of strong when rendering to text
         tag_nodes = [nodes.strong(text='Tags:'), nodes.inline(text=' ')]
         for tag in self.options.get('tags', []):
             tag_nodes += [

From 7acec133baf4e5c27e8235589f1f6cc465e19de4 Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Mon, 15 Aug 2022 23:14:50 -0700
Subject: [PATCH 525/854] organize tags by group, add more info about tools

---
 conf.py                | 39 ++++++++++++++++++++------------
 docs/Categories.rst    | 13 -----------
 docs/Documentation.rst |  4 ++--
 docs/Tags.rst          | 19 ++++++++++++++++
 docs/Tools.rst         | 50 ++++++++++++++++++++++++++++++++++++++++++
 index.rst              |  2 +-
 6 files changed, 97 insertions(+), 30 deletions(-)
 delete mode 100644 docs/Categories.rst
 create mode 100644 docs/Tools.rst

diff --git a/conf.py b/conf.py
index 0eaeb95f7..c71f69a4b 100644
--- a/conf.py
+++ b/conf.py
@@ -73,29 +73,40 @@ DOC_ALL_DIRS = doc_all_dirs()
 
 
 def get_tags():
-    tags = []
+    groups = {}
+    group_re = re.compile(r'"([^"]+)"')
     tag_re = re.compile(r'- `tag/([^`]+)`: (.*)')
     with open('docs/Tags.rst') as f:
         lines = f.readlines()
         for line in lines:
-            m = re.match(tag_re, line.strip())
+            line = line.strip()
+            m = re.match(group_re, line)
             if m:
-                tags.append((m.group(1), m.group(2)))
-    return tags
+                group = m.group(1)
+                groups[group] = []
+                continue
+            m = re.match(tag_re, line)
+            if m:
+                tag = m.group(1)
+                desc = m.group(2)
+                groups[group].append((tag, desc))
+    return groups
 
 
 def generate_tag_indices():
     os.makedirs('docs/tags', mode=0o755, exist_ok=True)
-    with write_file_if_changed('docs/tags/index.rst') as topidx:
-        for tag_tuple in get_tags():
-            tag = tag_tuple[0]
-            with write_file_if_changed(('docs/tags/{name}.rst').format(name=tag)) as tagidx:
-                tagidx.write('TODO: add links to the tools that have this tag')
-            topidx.write(('.. _tag/{name}:\n\n').format(name=tag))
-            topidx.write(('{name}\n').format(name=tag))
-            topidx.write(('{underline}\n').format(underline='-'*len(tag)))
-            topidx.write(('{desc}\n\n').format(desc=tag_tuple[1]))
-            topidx.write(('.. include:: /docs/tags/{name}.rst\n\n').format(name=tag))
+    tag_groups = get_tags()
+    for tag_group in tag_groups:
+        with write_file_if_changed(('docs/tags/by{group}.rst').format(group=tag_group)) as topidx:
+            for tag_tuple in tag_groups[tag_group]:
+                tag = tag_tuple[0]
+                with write_file_if_changed(('docs/tags/{name}.rst').format(name=tag)) as tagidx:
+                    tagidx.write('TODO: add links to the tools that have this tag')
+                topidx.write(('.. _tag/{name}:\n\n').format(name=tag))
+                topidx.write(('{name}\n').format(name=tag))
+                topidx.write(('{underline}\n').format(underline='*'*len(tag)))
+                topidx.write(('{desc}\n\n').format(desc=tag_tuple[1]))
+                topidx.write(('.. include:: /docs/tags/{name}.rst\n\n').format(name=tag))
 
 
 def write_tool_docs():
diff --git a/docs/Categories.rst b/docs/Categories.rst
deleted file mode 100644
index 46fc71bdf..000000000
--- a/docs/Categories.rst
+++ /dev/null
@@ -1,13 +0,0 @@
-.. _categories:
-
-Tool categories
-===============
-
-DFHack tools are grouped to make them easier to find. Note that a tool can
-belong to more than one category. If you'd like to see the full list of tools
-in one flat list, please refer to the `index <genindex>`.
-
-.. contents:: Contents
-  :local:
-
-.. include:: tags/index.rst
diff --git a/docs/Documentation.rst b/docs/Documentation.rst
index 8908272ca..07b2fa467 100644
--- a/docs/Documentation.rst
+++ b/docs/Documentation.rst
@@ -64,8 +64,8 @@ Tags
 
 To make it easier for players to find related commands, all plugins and commands are marked
 with relevant tags. These are used to compile indices and generate cross-links between the
-commands, both in the HTML documents and in-game. See the list of available tags
-`here <categories>` and think about which categories your new tools belongs in.
+commands, both in the HTML documents and in-game. See the list of available `tag-list` and
+think about which categories your new tool belongs in.
 
 Links
 -----
diff --git a/docs/Tags.rst b/docs/Tags.rst
index 96faf74e2..7f73bf799 100644
--- a/docs/Tags.rst
+++ b/docs/Tags.rst
@@ -1,10 +1,26 @@
 :orphan:
 
+.. _tag-list:
+
+DFHack tool tags
+================
+
+A tool often has at least one tag per group, encompassing when you use the tool,
+why you might want to use it, and what kind of thing you're trying to affect.
+
+See https://docs.google.com/spreadsheets/d/1hiDlo8M_bB_1jE-5HRs2RrrA_VZ4cRu9VXaTctX_nwk/edit#gid=1774645373
+for the tag assignment spreadsheet.
+
+"when" tags
+-----------
 - `tag/adventure`: Tools that are useful while in adventure mode. Note that some tools only tagged with "fort" might also work in adventure mode, but not always in expected ways. Feel free to experiment, though!
 - `tag/fort`: Tools that are useful while in fort mode.
 - `tag/legends`: Tools that are useful while in legends mode.
 - `tag/embark`: Tools that are useful while on the fort embark screen or while creating an adventurer.
 - `tag/dev`: Tools that are useful when developing scripts or mods.
+
+"why" tags
+----------
 - `tag/dfhack`: Tools that you use to run DFHack commands or interact with the DFHack library. This tag also includes tools that help you manage the DF game itself (e.g. settings, saving, etc.)
 - `tag/auto`: Tools that run in the background and automatically manage routine, toilsome aspects of your fortress.
 - `tag/productivity`: Tools that help you do things that you could do manually, but using the tool is better and faster.
@@ -14,6 +30,9 @@
 - `tag/fps`: Tools that help you manage FPS drop.
 - `tag/bugfix`: Tools that fix specific bugs, either permanently or on-demand.
 - `tag/armok`: Tools that give you complete control over an aspect of the game or provide access to information that the game intentionally keeps hidden.
+
+"what" tags
+-----------
 - `tag/animals`: Tools that interact with animals.
 - `tag/buildings`: Tools that interact with buildings and furniture.
 - `tag/stockpiles`: Tools that interact wtih stockpiles.
diff --git a/docs/Tools.rst b/docs/Tools.rst
new file mode 100644
index 000000000..623fc9c1f
--- /dev/null
+++ b/docs/Tools.rst
@@ -0,0 +1,50 @@
+.. _tools:
+
+DFHack tools
+============
+
+DFHack has **a lot** of tools. This page attempts to make it clearer what they
+are, how they work, and how to find the ones you want.
+
+.. contents:: Contents
+  :local:
+
+What tools are and how they work
+--------------------------------
+
+DFHack is a Dwarf Fortress memory access and modification framework, so DFHack
+tools normally access Dwarf Fortress internals and make some specific changes.
+
+Some tools just make a targeted change when you run them, like `unforbid`, which
+scans through all your items and removes the ``forbidden`` flag from each of
+them.
+
+Some tools need to be enabled, and then they run in the background and make
+changes to the game on your behalf, like `autobutcher`, which monitors your
+livestock population and automatically marks excess animals for butchering.
+
+And some tools just exist to give you information that is otherwise hard to
+come by, like `gui/petitions`, which shows you the active petitions for
+guildhalls and temples that you have agreed to.
+
+Finding the tool you need
+-------------------------
+
+DFHack tools are tagged with categories to make them easier to find. Note that a
+tool can belong to more than one category. If you'd like to see the full list of
+tools in one flat list, please refer to the `index <genindex>`.
+
+DFHack tools by game mode
+-------------------------
+
+.. include:: tags/bywhen.rst
+
+DFHack tools by theme
+---------------------
+
+.. include:: tags/bywhy.rst
+
+DFHack tools by what they affect
+--------------------------------
+
+.. include:: tags/bywhat.rst
diff --git a/index.rst b/index.rst
index d627267f0..a54ea87f5 100644
--- a/index.rst
+++ b/index.rst
@@ -28,7 +28,7 @@ User Manual
    /docs/Introduction
    /docs/Installing
    /docs/Core
-   /docs/Categories
+   /docs/Tools
    /docs/guides/index
    /docs/index-dev
    /docs/index-about

From 60458ad885139d19aacebacbf34415de7b21606b Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Mon, 15 Aug 2022 23:43:02 -0700
Subject: [PATCH 526/854] reorganize and alphabetize tags

---
 docs/Tags.rst | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/docs/Tags.rst b/docs/Tags.rst
index 7f73bf799..f1251e391 100644
--- a/docs/Tags.rst
+++ b/docs/Tags.rst
@@ -14,35 +14,35 @@ for the tag assignment spreadsheet.
 "when" tags
 -----------
 - `tag/adventure`: Tools that are useful while in adventure mode. Note that some tools only tagged with "fort" might also work in adventure mode, but not always in expected ways. Feel free to experiment, though!
+- `tag/embark`: Tools that are useful while on the fort embark screen or while creating an adventurer.
 - `tag/fort`: Tools that are useful while in fort mode.
 - `tag/legends`: Tools that are useful while in legends mode.
-- `tag/embark`: Tools that are useful while on the fort embark screen or while creating an adventurer.
-- `tag/dev`: Tools that are useful when developing scripts or mods.
 
 "why" tags
 ----------
-- `tag/dfhack`: Tools that you use to run DFHack commands or interact with the DFHack library. This tag also includes tools that help you manage the DF game itself (e.g. settings, saving, etc.)
+- `tag/armok`: Tools that give you complete control over an aspect of the game or provide access to information that the game intentionally keeps hidden.
 - `tag/auto`: Tools that run in the background and automatically manage routine, toilsome aspects of your fortress.
-- `tag/productivity`: Tools that help you do things that you could do manually, but using the tool is better and faster.
-- `tag/inspection`: Tools that let you view information that is otherwise difficult to find.
+- `tag/bugfix`: Tools that fix specific bugs, either permanently or on-demand.
 - `tag/design`: Tools that help you design your fort.
-- `tag/gameplay`: Tools that introduce new gameplay elements.
+- `tag/dev`: Tools that are useful when developing scripts or mods.
+- `tag/dfhack`: Tools that you use to run DFHack commands or interact with the DFHack library. This tag also includes tools that help you manage the DF game itself (e.g. settings, saving, etc.)
 - `tag/fps`: Tools that help you manage FPS drop.
-- `tag/bugfix`: Tools that fix specific bugs, either permanently or on-demand.
-- `tag/armok`: Tools that give you complete control over an aspect of the game or provide access to information that the game intentionally keeps hidden.
+- `tag/gameplay`: Tools that introduce new gameplay elements.
+- `tag/inspection`: Tools that let you view information that is otherwise difficult to find.
+- `tag/productivity`: Tools that help you do things that you could do manually, but using the tool is better and faster.
 
 "what" tags
 -----------
 - `tag/animals`: Tools that interact with animals.
 - `tag/buildings`: Tools that interact with buildings and furniture.
-- `tag/stockpiles`: Tools that interact wtih stockpiles.
-- `tag/items`: Tools that interact with in-game items.
-- `tag/map`: Tools  that interact with the game map.
+- `tag/graphics`: Tools that interact with game graphics.
 - `tag/interface`: Tools that interact with or extend the DF user interface.
-- `tag/workorders`: Tools that interact with workorders.
+- `tag/items`: Tools that interact with in-game items.
 - `tag/jobs`: Tools that interact with jobs.
 - `tag/labors`: Tools that deal with labor assignment.
+- `tag/map`: Tools  that interact with the game map.
 - `tag/military`: Tools that interact with the military.
-- `tag/graphics`: Tools that interact with game graphics.
 - `tag/plants`: Tools that interact with trees, shrubs, and crops.
+- `tag/stockpiles`: Tools that interact wtih stockpiles.
 - `tag/units`: Tools that interact with units.
+- `tag/workorders`: Tools that interact with workorders.

From 524c49cb2802dfc370def568ac2292193086466f Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Tue, 16 Aug 2022 00:12:08 -0700
Subject: [PATCH 527/854] use easier to read underlining in text output

---
 conf.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/conf.py b/conf.py
index c71f69a4b..c2e820b9a 100644
--- a/conf.py
+++ b/conf.py
@@ -354,3 +354,5 @@ latex_toplevel_sectioning = 'part'
 from sphinx.writers import text
 
 text.MAXWIDTH = 52
+
+text_sectionchars = '=-~`+"*'

From 83e1fa7de0f9282fdffd9fb5184e87c5c81d26b5 Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Tue, 16 Aug 2022 00:12:25 -0700
Subject: [PATCH 528/854] add summary text in its own paragraph element

---
 docs/sphinx_extensions/dfhack/tool_docs.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/sphinx_extensions/dfhack/tool_docs.py b/docs/sphinx_extensions/dfhack/tool_docs.py
index 1c4cd74e0..9b1dbec44 100644
--- a/docs/sphinx_extensions/dfhack/tool_docs.py
+++ b/docs/sphinx_extensions/dfhack/tool_docs.py
@@ -142,7 +142,7 @@ class DFHackToolDirective(DFHackToolDirectiveBase):
             nodes.paragraph('', '', *tag_nodes),
         ]
         if 'no-command' in self.options:
-            ret_nodes += [nodes.inline(text=self.options.get('summary', ''))]
+            ret_nodes += [nodes.paragraph('', '', nodes.inline(text=self.options.get('summary', '')))]
         return ret_nodes
 
     def run(self):
@@ -161,7 +161,7 @@ class DFHackCommandDirective(DFHackToolDirectiveBase):
         command = self.get_name_or_docname()
         return [
             self.make_labeled_paragraph('Command', command, content_class=nodes.literal),
-            nodes.inline(text=self.options.get('summary', '')),
+            nodes.paragraph('', '', nodes.inline(text=self.options.get('summary', ''))),
             *render_dfhack_keybind(command),
         ]
 

From 4373f865a3d015e22e7133063f6da457375c2684 Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Tue, 16 Aug 2022 08:23:48 -0700
Subject: [PATCH 529/854] make `dfhack` a "when" tag

---
 docs/Tags.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/Tags.rst b/docs/Tags.rst
index f1251e391..9f3906d58 100644
--- a/docs/Tags.rst
+++ b/docs/Tags.rst
@@ -14,6 +14,7 @@ for the tag assignment spreadsheet.
 "when" tags
 -----------
 - `tag/adventure`: Tools that are useful while in adventure mode. Note that some tools only tagged with "fort" might also work in adventure mode, but not always in expected ways. Feel free to experiment, though!
+- `tag/dfhack`: Tools that you use to run DFHack commands or interact with the DFHack library. This tag also includes tools that help you manage the DF game itself (e.g. settings, saving, etc.)
 - `tag/embark`: Tools that are useful while on the fort embark screen or while creating an adventurer.
 - `tag/fort`: Tools that are useful while in fort mode.
 - `tag/legends`: Tools that are useful while in legends mode.
@@ -25,7 +26,6 @@ for the tag assignment spreadsheet.
 - `tag/bugfix`: Tools that fix specific bugs, either permanently or on-demand.
 - `tag/design`: Tools that help you design your fort.
 - `tag/dev`: Tools that are useful when developing scripts or mods.
-- `tag/dfhack`: Tools that you use to run DFHack commands or interact with the DFHack library. This tag also includes tools that help you manage the DF game itself (e.g. settings, saving, etc.)
 - `tag/fps`: Tools that help you manage FPS drop.
 - `tag/gameplay`: Tools that introduce new gameplay elements.
 - `tag/inspection`: Tools that let you view information that is otherwise difficult to find.

From 22356e2fd632e865f411342a5fcee6842d928682 Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Tue, 16 Aug 2022 09:36:17 -0700
Subject: [PATCH 530/854] resort tags according to new spreadsheet order

also fix tag syncing command so short descriptions with internal periods
are parsed correctly
---
 docs/plugins/autodump.rst         | 2 +-
 docs/plugins/automaterial.rst     | 2 +-
 docs/plugins/automelt.rst         | 2 +-
 docs/plugins/autotrade.rst        | 2 +-
 docs/plugins/blueprint.rst        | 2 +-
 docs/plugins/burrows.rst          | 2 +-
 docs/plugins/cleaners.rst         | 2 +-
 docs/plugins/cursecheck.rst       | 2 +-
 docs/plugins/dig.rst              | 2 +-
 docs/plugins/embark-assistant.rst | 2 +-
 docs/plugins/embark-tools.rst     | 2 +-
 docs/plugins/filltraffic.rst      | 2 +-
 docs/plugins/mode.rst             | 2 +-
 docs/plugins/prospector.rst       | 2 +-
 docs/plugins/reveal.rst           | 2 +-
 docs/plugins/showmood.rst         | 2 +-
 docs/plugins/stockpiles.rst       | 2 +-
 docs/plugins/stonesense.rst       | 2 +-
 docs/plugins/tweak.rst            | 2 +-
 19 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/docs/plugins/autodump.rst b/docs/plugins/autodump.rst
index e2d812219..f9aad09d6 100644
--- a/docs/plugins/autodump.rst
+++ b/docs/plugins/autodump.rst
@@ -3,7 +3,7 @@ autodump
 
 .. dfhack-tool::
     :summary: Automatically set items in a stockpile to be dumped.
-    :tags: fort productivity fps armok stockpiles items
+    :tags: fort armok fps productivity items stockpiles
     :no-command:
 
 .. dfhack-command:: autodump
diff --git a/docs/plugins/automaterial.rst b/docs/plugins/automaterial.rst
index 513a963d2..e18fe4b72 100644
--- a/docs/plugins/automaterial.rst
+++ b/docs/plugins/automaterial.rst
@@ -3,7 +3,7 @@ automaterial
 
 .. dfhack-tool::
     :summary: Sorts building materials by recent usage.
-    :tags: fort productivity design buildings map
+    :tags: fort design productivity buildings map
     :no-command:
 
 This plugin makes building constructions (walls, floors, fortifications, etc)
diff --git a/docs/plugins/automelt.rst b/docs/plugins/automelt.rst
index 09b35a378..047297d83 100644
--- a/docs/plugins/automelt.rst
+++ b/docs/plugins/automelt.rst
@@ -3,7 +3,7 @@ automelt
 
 .. dfhack-tool::
     :summary: Quickly designate items to be melted.
-    :tags: fort productivity stockpiles items
+    :tags: fort productivity items stockpiles
     :no-command:
 
 When `enabled <enable>`, this plugin adds an option to the :kbd:`q` menu for
diff --git a/docs/plugins/autotrade.rst b/docs/plugins/autotrade.rst
index 946e53508..adff6eade 100644
--- a/docs/plugins/autotrade.rst
+++ b/docs/plugins/autotrade.rst
@@ -3,7 +3,7 @@ autotrade
 
 .. dfhack-tool::
     :summary: Quickly designate items to be traded.
-    :tags: fort productivity stockpiles items
+    :tags: fort productivity items stockpiles
     :no-command:
 
 When `enabled <enable>`, this plugin adds an option to the :kbd:`q` menu for
diff --git a/docs/plugins/blueprint.rst b/docs/plugins/blueprint.rst
index ed3d0b29c..64fb3d556 100644
--- a/docs/plugins/blueprint.rst
+++ b/docs/plugins/blueprint.rst
@@ -3,7 +3,7 @@ blueprint
 
 .. dfhack-tool::
     :summary: Record a live game map in a quickfort blueprint.
-    :tags: fort design buildings stockpiles map
+    :tags: fort design buildings map stockpiles
 
 With ``blueprint``, you can export the structure of a portion of your fortress
 in a blueprint file that you (or anyone else) can later play back with
diff --git a/docs/plugins/burrows.rst b/docs/plugins/burrows.rst
index 1bdbd959f..601fdb6b8 100644
--- a/docs/plugins/burrows.rst
+++ b/docs/plugins/burrows.rst
@@ -3,7 +3,7 @@ burrows
 
 .. dfhack-tool::
     :summary: Auto-expand burrows as you dig.
-    :tags: fort auto productivity design map units
+    :tags: fort auto design productivity map units
     :no-command:
 
 .. dfhack-command:: burrow
diff --git a/docs/plugins/cleaners.rst b/docs/plugins/cleaners.rst
index ca022c440..8cc5e20ca 100644
--- a/docs/plugins/cleaners.rst
+++ b/docs/plugins/cleaners.rst
@@ -6,7 +6,7 @@ cleaners
 
 .. dfhack-tool::
     :summary: Provides commands for cleaning spatter from the map.
-    :tags: adventure fort fps armok items map units
+    :tags: adventure fort armok fps items map units
     :no-command:
 
 .. dfhack-command:: clean
diff --git a/docs/plugins/cursecheck.rst b/docs/plugins/cursecheck.rst
index afe6b537f..6cf74106e 100644
--- a/docs/plugins/cursecheck.rst
+++ b/docs/plugins/cursecheck.rst
@@ -3,7 +3,7 @@ cursecheck
 
 .. dfhack-tool::
     :summary: Check for cursed creatures.
-    :tags: dev fps stockpiles
+    :tags: fort armok inspection units
 
 This command checks a single map tile (or the whole map/world) for cursed
 creatures (ghosts, vampires, necromancers, werebeasts, zombies, etc.).
diff --git a/docs/plugins/dig.rst b/docs/plugins/dig.rst
index 1761b7085..4d096e8b1 100644
--- a/docs/plugins/dig.rst
+++ b/docs/plugins/dig.rst
@@ -6,7 +6,7 @@ dig
 
 .. dfhack-tool::
     :summary: Provides commands for designating tiles for digging.
-    :tags: fort productivity design map
+    :tags: fort design productivity map
     :no-command:
 
 .. dfhack-command:: digv
diff --git a/docs/plugins/embark-assistant.rst b/docs/plugins/embark-assistant.rst
index 22c18996a..797c23c3d 100644
--- a/docs/plugins/embark-assistant.rst
+++ b/docs/plugins/embark-assistant.rst
@@ -3,7 +3,7 @@ embark-assistant
 
 .. dfhack-tool::
     :summary: Embark site selection support.
-    :tags: fort embark interface
+    :tags: embark fort interface
 
 Run this command while the pre-embark screen is displayed to show extended (and
 reasonably correct) resource information for the embark rectangle as well as
diff --git a/docs/plugins/embark-tools.rst b/docs/plugins/embark-tools.rst
index 58b02d47e..df480ff71 100644
--- a/docs/plugins/embark-tools.rst
+++ b/docs/plugins/embark-tools.rst
@@ -3,7 +3,7 @@ embark-tools
 
 .. dfhack-tool::
     :summary: Extend the embark screen functionality.
-    :tags: fort embark interface
+    :tags: embark fort interface
 
 Usage::
 
diff --git a/docs/plugins/filltraffic.rst b/docs/plugins/filltraffic.rst
index ea48fd385..218532790 100644
--- a/docs/plugins/filltraffic.rst
+++ b/docs/plugins/filltraffic.rst
@@ -6,7 +6,7 @@ filltraffic
 
 .. dfhack-tool::
     :summary: Set traffic designations using flood-fill starting at the cursor.
-    :tags: fort productivity design map
+    :tags: fort design productivity map
 
 .. dfhack-command:: alltraffic
     :summary: Set traffic designations for every single tile of the map.
diff --git a/docs/plugins/mode.rst b/docs/plugins/mode.rst
index 94ee7cb44..50cc1d0d2 100644
--- a/docs/plugins/mode.rst
+++ b/docs/plugins/mode.rst
@@ -3,7 +3,7 @@ mode
 
 .. dfhack-tool::
     :summary: See and change the game mode.
-    :tags: dev gameplay armok
+    :tags: armok dev gameplay
 
 .. warning::
 
diff --git a/docs/plugins/prospector.rst b/docs/plugins/prospector.rst
index 7ef3d223c..5764bc44e 100644
--- a/docs/plugins/prospector.rst
+++ b/docs/plugins/prospector.rst
@@ -5,7 +5,7 @@ prospector
 
 .. dfhack-tool::
     :summary: Provides commands that help you analyze natural resources.
-    :tags: fort embark inspection armok map
+    :tags: embark fort armok inspection map
     :no-command:
 
 .. dfhack-command:: prospect
diff --git a/docs/plugins/reveal.rst b/docs/plugins/reveal.rst
index 122280a1e..37497111e 100644
--- a/docs/plugins/reveal.rst
+++ b/docs/plugins/reveal.rst
@@ -5,7 +5,7 @@ reveal
 
 .. dfhack-tool::
     :summary: Reveals the map.
-    :tags: adventure fort inspection armok map
+    :tags: adventure fort armok inspection map
 
 .. dfhack-tool:: unreveal
    :summary: Hides previously hidden tiles again.
diff --git a/docs/plugins/showmood.rst b/docs/plugins/showmood.rst
index 2a294b166..a14dcf225 100644
--- a/docs/plugins/showmood.rst
+++ b/docs/plugins/showmood.rst
@@ -3,7 +3,7 @@ showmood
 
 .. dfhack-tool::
     :summary: Shows all items needed for the active strange mood.
-    :tags: fort inspection armok jobs units
+    :tags: fort armok inspection jobs units
 
 Usage::
 
diff --git a/docs/plugins/stockpiles.rst b/docs/plugins/stockpiles.rst
index 0e30b9dc7..960675d44 100644
--- a/docs/plugins/stockpiles.rst
+++ b/docs/plugins/stockpiles.rst
@@ -5,7 +5,7 @@ stockpiles
 
 .. dfhack-tool::
     :summary: Import and export stockpile settings.
-    :tags: fort productivity design stockpiles
+    :tags: fort design productivity stockpiles
     :no-command:
 
 .. dfhack-command:: copystock
diff --git a/docs/plugins/stonesense.rst b/docs/plugins/stonesense.rst
index b43f95697..bd3d438f2 100644
--- a/docs/plugins/stonesense.rst
+++ b/docs/plugins/stonesense.rst
@@ -3,7 +3,7 @@ stonesense
 
 .. dfhack-tool::
     :summary: A 3D isometric visualizer.
-    :tags: adventure fort map graphics
+    :tags: adventure fort graphics map
 
 .. dfhack-command:: ssense
    :summary: An alias for stonesense.
diff --git a/docs/plugins/tweak.rst b/docs/plugins/tweak.rst
index c04392c62..0bc156960 100644
--- a/docs/plugins/tweak.rst
+++ b/docs/plugins/tweak.rst
@@ -3,7 +3,7 @@ tweak
 
 .. dfhack-tool::
     :summary: A collection of tweaks and bugfixes.
-    :tags: adventure fort fps bugfix armok interface
+    :tags: adventure fort armok bugfix fps interface
 
 Usage::
 

From c5ec1726aac5883cab14b16e2f9ea9ac04b0974a Mon Sep 17 00:00:00 2001
From: DFHack-Urist via GitHub Actions
 <63161697+DFHack-Urist@users.noreply.github.com>
Date: Wed, 17 Aug 2022 07:17:01 +0000
Subject: [PATCH 531/854] Auto-update submodules

scripts: master
---
 scripts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts b/scripts
index 52e292ecf..f4bf697f7 160000
--- a/scripts
+++ b/scripts
@@ -1 +1 @@
-Subproject commit 52e292ecf7e498c6114a81223380d2b12f3718c1
+Subproject commit f4bf697f75431010f71c60e3db5ac62a311599c4

From fe7414baaeba948b59900aef715862607eabe80c Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Wed, 17 Aug 2022 22:22:06 -0400
Subject: [PATCH 532/854] Make .dfhack-tool-summary styles consistent with
 Sphinx 5+

Under Sphinx 5, `topic` nodes now render as `<aside>` elements, and without an
explicit background color
---
 docs/styles/dfhack.css | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/docs/styles/dfhack.css b/docs/styles/dfhack.css
index 0fe608dde..c1a00ed90 100644
--- a/docs/styles/dfhack.css
+++ b/docs/styles/dfhack.css
@@ -61,17 +61,21 @@ span.pre {
     overflow-wrap: break-word;
 }
 
-div.dfhack-tool-summary {
+div.dfhack-tool-summary,
+aside.dfhack-tool-summary {
     margin: 10px 0;
     padding: 10px 15px;
+    background-color: #EEE;
 }
 
-div.dfhack-tool-summary p {
+div.dfhack-tool-summary p,
+aside.dfhack-tool-summary p {
     margin-top: 0;
     margin-bottom: 0.5em;
     line-height: 1em;
 }
 
-div.dfhack-tool-summary p:last-child {
+div.dfhack-tool-summary p:last-child,
+aside.dfhack-tool-summary p:last-child {
    margin-bottom: 0;
 }

From 7e0581204d2dd419c027faa26eac1f4e08edd36c Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Wed, 17 Aug 2022 22:37:03 -0400
Subject: [PATCH 533/854] Refactor everything to use make_labeled_paragraph()

---
 docs/sphinx_extensions/dfhack/tool_docs.py | 44 +++++++++++-----------
 1 file changed, 22 insertions(+), 22 deletions(-)

diff --git a/docs/sphinx_extensions/dfhack/tool_docs.py b/docs/sphinx_extensions/dfhack/tool_docs.py
index 9b1dbec44..b065ee7a7 100644
--- a/docs/sphinx_extensions/dfhack/tool_docs.py
+++ b/docs/sphinx_extensions/dfhack/tool_docs.py
@@ -5,7 +5,7 @@
 
 import logging
 import os
-from typing import List
+from typing import List, Optional
 
 import docutils.nodes as nodes
 import docutils.parsers.rst.directives as rst_directives
@@ -18,6 +18,21 @@ import dfhack.util
 
 logger = sphinx.util.logging.getLogger(__name__)
 
+
+def make_labeled_paragraph(label: Optional[str]=None, content: Optional[str]=None,
+            label_class=nodes.strong, content_class=nodes.inline) -> nodes.paragraph:
+    p = nodes.paragraph('', '')
+    if label is not None:
+        p += [
+            # TODO: use inline instead of strong when rendering to text
+            label_class('', '{}:'.format(label)),
+            nodes.inline('', ' '),
+        ]
+    if content is not None:
+        p += content_class('', content)
+    return p
+
+
 _KEYBINDS = {}
 _KEYBINDS_RENDERED = set()  # commands whose keybindings have been rendered
 
@@ -54,10 +69,7 @@ def render_dfhack_keybind(command) -> List[nodes.paragraph]:
     if command not in _KEYBINDS:
         return out
     for keycmd, key, ctx in _KEYBINDS[command]:
-        n = nodes.paragraph()
-        # TODO: use inline instead of strong when rendering to text
-        n += nodes.strong('Keybinding:', 'Keybinding:')
-        n += nodes.inline(' ', ' ')
+        n = make_labeled_paragraph('Keybinding')
         for k in key:
             n += nodes.inline(k, k, classes=['kbd'])
         if keycmd != command:
@@ -95,15 +107,6 @@ class DFHackToolDirectiveBase(sphinx.directives.ObjectDescription):
         else:
             return self.env.docname.split('/')[-1]
 
-    @staticmethod
-    def make_labeled_paragraph(label, content, label_class=nodes.strong, content_class=nodes.inline) -> nodes.paragraph:
-        return nodes.paragraph('', '', *[
-            # TODO: use inline instead of strong when rendering to text
-            label_class('', '{}:'.format(label)),
-            nodes.inline(text=' '),
-            content_class('', content),
-        ])
-
     @staticmethod
     def wrap_box(*children: List[nodes.Node]) -> nodes.Admonition:
         return nodes.topic('', *children, classes=['dfhack-tool-summary'])
@@ -123,10 +126,9 @@ class DFHackToolDirective(DFHackToolDirectiveBase):
     }
 
     def render_content(self) -> List[nodes.Node]:
-        # TODO: use inline instead of strong when rendering to text
-        tag_nodes = [nodes.strong(text='Tags:'), nodes.inline(text=' ')]
+        tag_paragraph = make_labeled_paragraph('Tags')
         for tag in self.options.get('tags', []):
-            tag_nodes += [
+            tag_paragraph += [
                 addnodes.pending_xref(tag, nodes.inline(text=tag), **{
                     'reftype': 'ref',
                     'refdomain': 'std',
@@ -136,11 +138,9 @@ class DFHackToolDirective(DFHackToolDirectiveBase):
                 }),
                 nodes.inline(text=' | '),
             ]
-        tag_nodes.pop()
+        tag_paragraph.pop()
 
-        ret_nodes = [
-            nodes.paragraph('', '', *tag_nodes),
-        ]
+        ret_nodes = [tag_paragraph]
         if 'no-command' in self.options:
             ret_nodes += [nodes.paragraph('', '', nodes.inline(text=self.options.get('summary', '')))]
         return ret_nodes
@@ -160,7 +160,7 @@ class DFHackCommandDirective(DFHackToolDirectiveBase):
     def render_content(self) -> List[nodes.Node]:
         command = self.get_name_or_docname()
         return [
-            self.make_labeled_paragraph('Command', command, content_class=nodes.literal),
+            make_labeled_paragraph('Command', command, content_class=nodes.literal),
             nodes.paragraph('', '', nodes.inline(text=self.options.get('summary', ''))),
             *render_dfhack_keybind(command),
         ]

From a4e70cf3e12cd8c4ad948aa37260afe22517d6d3 Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Wed, 17 Aug 2022 22:52:10 -0400
Subject: [PATCH 534/854] Remove now-unused dfhack-keybind role

---
 conf.py                                    | 6 ------
 docs/sphinx_extensions/dfhack/tool_docs.py | 8 --------
 2 files changed, 14 deletions(-)

diff --git a/conf.py b/conf.py
index c2e820b9a..924da1577 100644
--- a/conf.py
+++ b/conf.py
@@ -118,12 +118,6 @@ def write_tool_docs():
     for k in DOC_ALL_DIRS:
         header = ':orphan:\n'
         label = ('.. _{name}:\n\n').format(name=k[0])
-        # TODO: can we autogenerate the :dfhack-keybind: line? it would go beneath
-        # the tool header, which is currently in the middle of the included file.
-        # should we remove those headers from the doc files and just generate them
-        # here? That might be easier. But then where will the tags go? It would
-        # look better if they were above the keybinds, but then we'd be in the
-        # same situation.
         include = ('.. include:: /{path}\n\n').format(path=k[1])
         # TODO: generate a footer with links to tools that share at least one
         # tag with this tool. Just the tool names, strung across the bottom of
diff --git a/docs/sphinx_extensions/dfhack/tool_docs.py b/docs/sphinx_extensions/dfhack/tool_docs.py
index b065ee7a7..20e484954 100644
--- a/docs/sphinx_extensions/dfhack/tool_docs.py
+++ b/docs/sphinx_extensions/dfhack/tool_docs.py
@@ -89,13 +89,6 @@ def check_missing_keybinds():
         logger.warning('Undocumented keybindings for command: %s', missing_command)
 
 
-# pylint:disable=unused-argument,dangerous-default-value,too-many-arguments
-def dfhack_keybind_role(role, rawtext, text, lineno, inliner,
-                        options={}, content=[]):
-    """Custom role parser for DFHack default keybinds."""
-    return render_dfhack_keybind(text), []
-
-
 class DFHackToolDirectiveBase(sphinx.directives.ObjectDescription):
     has_content = False
     required_arguments = 0
@@ -169,7 +162,6 @@ class DFHackCommandDirective(DFHackToolDirectiveBase):
 def register(app):
     app.add_directive('dfhack-tool', DFHackToolDirective)
     app.add_directive('dfhack-command', DFHackCommandDirective)
-    app.add_role('dfhack-keybind', dfhack_keybind_role)
 
     _KEYBINDS.update(scan_all_keybinds(os.path.join(dfhack.util.DFHACK_ROOT, 'data', 'init')))
 

From 06c826900204ad3018ca4530a5004ca7a6c73c7d Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Wed, 17 Aug 2022 23:04:17 -0400
Subject: [PATCH 535/854] Update Documentation.rst with examples of dfhack-tool
 and dfhack-command

---
 docs/Documentation.rst | 60 +++++++++++++++++++++++++++++++++---------
 1 file changed, 48 insertions(+), 12 deletions(-)

diff --git a/docs/Documentation.rst b/docs/Documentation.rst
index 07b2fa467..fccf59867 100644
--- a/docs/Documentation.rst
+++ b/docs/Documentation.rst
@@ -127,22 +127,58 @@ Header format
 -------------
 
 The docs **must** begin with a heading which exactly matches the script or plugin name, underlined
-with ``=====`` to the same length. This should be followed by a ``Tags:`` line with
-comma-separated links to the tag indices, and then a ``:dfhack-keybind:`commandname``` line for
-each command provided by the script or plugin. For scripts, this will just be the script name.
-Plugins that do not provide commands (i.e. they can just be enabled for some persistent effect or
-they just export functionality via a Lua API) don't need any ``:dfhack-keybind:`` lines at all.
-The first line of the text should then be the short description that will be used for the script
-or plugin. For example, documentation for the ``build-now`` script might look like::
+with ``=====`` to the same length. This should be followed by a ``.. dfhack-tool:`` directive with
+at least the following parameters:
+
+* ``:summary:`` - a short, single-sentence description of the tool
+* ``:tags:`` - a space-separated list of tags that apply to the tool
+
+By default, ``dfhack-tool`` generates both a description of a tool and a command
+with the same name. For tools (specifically plugins) that do not provide exactly
+1 command with the same name as the tool, pass the ``:no-command:`` parameter (with
+no content after it) to prevent the command block from being generated.
+
+For tools that provide multiple commands, or a command by the same name but with
+significantly different functionality (e.g. a plugin that can be both enabled
+and invoked as a command for different results), use the ``.. dfhack-command:``
+directive for each command. This takes only a ``:summary:`` argument, with the
+same meaning as above.
+
+For example, documentation for the ``build-now`` script might look like::
 
     build-now
     =========
-    Tags: `tag/fort`, `tag/buildings`
-    :dfhack-keybind:`build-now`
 
-    Instantly completes unsuspended building jobs. By default, all
-    constructions and buildings on the map are completed, but the
-    area of effect is configurable.
+    .. dfhack-tool::
+        :summary: Instantly completes unsuspended building construction jobs.
+        :tags: fort armok buildings
+
+    By default, all buildings on the map are completed, but the area of effect is configurable.
+
+And documentation for the ``autodump`` plugin might look like::
+
+    autodump
+    ========
+
+    .. dfhack-tool::
+        :summary: Automatically set items in a stockpile to be dumped.
+        :tags: fort armok fps productivity items stockpiles
+        :no-command:
+
+    .. dfhack-command:: autodump
+        :summary: Teleports items marked for dumping to the cursor position.
+
+    .. dfhack-command:: autodump-destroy-here
+        :summary: Destroy items marked for dumping under the cursor.
+
+    .. dfhack-command:: autodump-destroy-item
+        :summary: Destroys the selected item.
+
+    When `enabled <enable>`, this plugin adds an option to the :kbd:`q` menu for
+    stockpiles.
+
+    When invoked as a command, it can instantly move all unforbidden items marked
+    for dumping to the tile under the cursor.
 
 Usage help
 ----------

From fa8bceba93df6121b115efbd180d323e44b13fd7 Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Wed, 17 Aug 2022 23:17:08 -0400
Subject: [PATCH 536/854] Make paragraph labels render as plain text (not bold)
 under the text builder

---
 docs/sphinx_extensions/dfhack/tool_docs.py | 24 +++++++++++++++-------
 1 file changed, 17 insertions(+), 7 deletions(-)

diff --git a/docs/sphinx_extensions/dfhack/tool_docs.py b/docs/sphinx_extensions/dfhack/tool_docs.py
index 20e484954..3414b4a8c 100644
--- a/docs/sphinx_extensions/dfhack/tool_docs.py
+++ b/docs/sphinx_extensions/dfhack/tool_docs.py
@@ -5,7 +5,7 @@
 
 import logging
 import os
-from typing import List, Optional
+from typing import List, Optional, Type
 
 import docutils.nodes as nodes
 import docutils.parsers.rst.directives as rst_directives
@@ -19,12 +19,17 @@ import dfhack.util
 logger = sphinx.util.logging.getLogger(__name__)
 
 
+def get_label_class(builder: sphinx.builders.Builder) -> Type[nodes.Inline]:
+    if builder.format == 'text':
+        return nodes.inline
+    else:
+        return nodes.strong
+
 def make_labeled_paragraph(label: Optional[str]=None, content: Optional[str]=None,
             label_class=nodes.strong, content_class=nodes.inline) -> nodes.paragraph:
     p = nodes.paragraph('', '')
     if label is not None:
         p += [
-            # TODO: use inline instead of strong when rendering to text
             label_class('', '{}:'.format(label)),
             nodes.inline('', ' '),
         ]
@@ -63,13 +68,13 @@ def scan_all_keybinds(root_dir):
     return keybindings
 
 
-def render_dfhack_keybind(command) -> List[nodes.paragraph]:
+def render_dfhack_keybind(command, builder: sphinx.builders.Builder) -> List[nodes.paragraph]:
     _KEYBINDS_RENDERED.add(command)
     out = []
     if command not in _KEYBINDS:
         return out
     for keycmd, key, ctx in _KEYBINDS[command]:
-        n = make_labeled_paragraph('Keybinding')
+        n = make_labeled_paragraph('Keybinding', label_class=get_label_class(builder))
         for k in key:
             n += nodes.inline(k, k, classes=['kbd'])
         if keycmd != command:
@@ -104,6 +109,11 @@ class DFHackToolDirectiveBase(sphinx.directives.ObjectDescription):
     def wrap_box(*children: List[nodes.Node]) -> nodes.Admonition:
         return nodes.topic('', *children, classes=['dfhack-tool-summary'])
 
+    def make_labeled_paragraph(self, *args, **kwargs):
+        # convenience wrapper to set label_class to the desired builder-specific node type
+        kwargs.setdefault('label_class', get_label_class(self.env.app.builder))
+        return make_labeled_paragraph(*args, **kwargs)
+
     def render_content(self) -> List[nodes.Node]:
         raise NotImplementedError
 
@@ -119,7 +129,7 @@ class DFHackToolDirective(DFHackToolDirectiveBase):
     }
 
     def render_content(self) -> List[nodes.Node]:
-        tag_paragraph = make_labeled_paragraph('Tags')
+        tag_paragraph = self.make_labeled_paragraph('Tags')
         for tag in self.options.get('tags', []):
             tag_paragraph += [
                 addnodes.pending_xref(tag, nodes.inline(text=tag), **{
@@ -153,9 +163,9 @@ class DFHackCommandDirective(DFHackToolDirectiveBase):
     def render_content(self) -> List[nodes.Node]:
         command = self.get_name_or_docname()
         return [
-            make_labeled_paragraph('Command', command, content_class=nodes.literal),
+            self.make_labeled_paragraph('Command', command, content_class=nodes.literal),
             nodes.paragraph('', '', nodes.inline(text=self.options.get('summary', ''))),
-            *render_dfhack_keybind(command),
+            *render_dfhack_keybind(command, builder=self.env.app.builder),
         ]
 
 

From 72de1873e0dbd4f22a9dff28850b1684b1a93132 Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Wed, 17 Aug 2022 23:18:58 -0400
Subject: [PATCH 537/854] Improve keybinding rendering under the text builder

Previously rendered as e.g. "CtrlShiftK"
---
 docs/sphinx_extensions/dfhack/tool_docs.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docs/sphinx_extensions/dfhack/tool_docs.py b/docs/sphinx_extensions/dfhack/tool_docs.py
index 3414b4a8c..bc929f3d5 100644
--- a/docs/sphinx_extensions/dfhack/tool_docs.py
+++ b/docs/sphinx_extensions/dfhack/tool_docs.py
@@ -76,6 +76,8 @@ def render_dfhack_keybind(command, builder: sphinx.builders.Builder) -> List[nod
     for keycmd, key, ctx in _KEYBINDS[command]:
         n = make_labeled_paragraph('Keybinding', label_class=get_label_class(builder))
         for k in key:
+            if builder.format == 'text':
+                k = '[{}]'.format(k)
             n += nodes.inline(k, k, classes=['kbd'])
         if keycmd != command:
             n += nodes.inline(' -> ', ' -> ')

From eb73de4670647253fd7400106f5b00dc1a144f23 Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Wed, 17 Aug 2022 22:42:02 -0700
Subject: [PATCH 538/854] make Usage a proper header

---
 docs/builtins/alias.rst                     | 3 ++-
 docs/builtins/cls.rst                       | 5 ++++-
 docs/builtins/devel/dump-rpc.rst            | 5 ++++-
 docs/builtins/die.rst                       | 5 ++++-
 docs/builtins/disable.rst                   | 5 ++++-
 docs/builtins/enable.rst                    | 5 ++++-
 docs/builtins/fpause.rst                    | 5 ++++-
 docs/builtins/help.rst                      | 5 ++++-
 docs/builtins/hide.rst                      | 5 ++++-
 docs/builtins/keybinding.rst                | 3 ++-
 docs/builtins/kill-lua.rst                  | 5 ++++-
 docs/builtins/load.rst                      | 5 ++++-
 docs/builtins/ls.rst                        | 3 ++-
 docs/builtins/plug.rst                      | 5 ++++-
 docs/builtins/reload.rst                    | 5 ++++-
 docs/builtins/sc-script.rst                 | 3 ++-
 docs/builtins/script.rst                    | 5 ++++-
 docs/builtins/show.rst                      | 5 ++++-
 docs/builtins/tags.rst                      | 5 ++++-
 docs/builtins/type.rst                      | 5 ++++-
 docs/builtins/unload.rst                    | 5 ++++-
 docs/plugins/3dveins.rst                    | 5 ++++-
 docs/plugins/RemoteFortressReader.rst       | 3 ++-
 docs/plugins/autobutcher.rst                | 3 ++-
 docs/plugins/autochop.rst                   | 5 ++++-
 docs/plugins/autoclothing.rst               | 5 ++++-
 docs/plugins/autodump.rst                   | 5 ++++-
 docs/plugins/autofarm.rst                   | 3 ++-
 docs/plugins/autogems.rst                   | 3 ++-
 docs/plugins/autohauler.rst                 | 3 ++-
 docs/plugins/autolabor.rst                  | 5 ++++-
 docs/plugins/automaterial.rst               | 5 ++++-
 docs/plugins/automelt.rst                   | 5 ++++-
 docs/plugins/autonestbox.rst                | 3 ++-
 docs/plugins/autotrade.rst                  | 5 ++++-
 docs/plugins/blueprint.rst                  | 5 ++++-
 docs/plugins/buildingplan.rst               | 5 ++++-
 docs/plugins/burrows.rst                    | 3 ++-
 docs/plugins/changeitem.rst                 | 3 ++-
 docs/plugins/changelayer.rst                | 5 ++++-
 docs/plugins/changevein.rst                 | 5 ++++-
 docs/plugins/cleanconst.rst                 | 5 ++++-
 docs/plugins/cleaners.rst                   | 5 ++++-
 docs/plugins/cleanowned.rst                 | 5 ++++-
 docs/plugins/command-prompt.rst             | 5 ++++-
 docs/plugins/confirm.rst                    | 3 ++-
 docs/plugins/createitem.rst                 | 3 ++-
 docs/plugins/cursecheck.rst                 | 5 ++++-
 docs/plugins/debug.rst                      | 3 ++-
 docs/plugins/deramp.rst                     | 5 ++++-
 docs/plugins/dig-now.rst                    | 5 ++++-
 docs/plugins/dig.rst                        | 3 ++-
 docs/plugins/digFlood.rst                   | 3 ++-
 docs/plugins/diggingInvaders.rst            | 3 ++-
 docs/plugins/dwarfmonitor.rst               | 3 ++-
 docs/plugins/dwarfvet.rst                   | 3 ++-
 docs/plugins/embark-assistant.rst           | 5 ++++-
 docs/plugins/embark-tools.rst               | 5 ++++-
 docs/plugins/fastdwarf.rst                  | 5 ++++-
 docs/plugins/filltraffic.rst                | 5 ++++-
 docs/plugins/fix-unit-occupancy.rst         | 5 ++++-
 docs/plugins/fixveins.rst                   | 5 ++++-
 docs/plugins/flows.rst                      | 5 ++++-
 docs/plugins/follow.rst                     | 5 ++++-
 docs/plugins/forceequip.rst                 | 5 ++++-
 docs/plugins/generated-creature-renamer.rst | 3 ++-
 docs/plugins/getplants.rst                  | 3 ++-
 docs/plugins/hotkeys.rst                    | 5 ++++-
 docs/plugins/infiniteSky.rst                | 3 ++-
 docs/plugins/jobutils.rst                   | 3 ++-
 docs/plugins/labormanager.rst               | 5 ++++-
 docs/plugins/lair.rst                       | 3 ++-
 docs/plugins/liquids.rst                    | 3 ++-
 docs/plugins/manipulator.rst                | 5 ++++-
 docs/plugins/misery.rst                     | 3 ++-
 docs/plugins/mode.rst                       | 3 ++-
 docs/plugins/mousequery.rst                 | 5 ++++-
 docs/plugins/nestboxes.rst                  | 5 ++++-
 docs/plugins/orders.rst                     | 3 ++-
 docs/plugins/petcapRemover.rst              | 3 ++-
 docs/plugins/plants.rst                     | 3 ++-
 docs/plugins/probe.rst                      | 3 ++-
 docs/plugins/prospector.rst                 | 5 ++++-
 docs/plugins/regrass.rst                    | 5 ++++-
 docs/plugins/rename.rst                     | 3 ++-
 docs/plugins/rendermax.rst                  | 3 ++-
 docs/plugins/resume.rst                     | 5 ++++-
 docs/plugins/reveal.rst                     | 3 ++-
 docs/plugins/ruby.rst                       | 5 ++++-
 docs/plugins/search.rst                     | 5 ++++-
 docs/plugins/seedwatch.rst                  | 3 ++-
 docs/plugins/showmood.rst                   | 5 ++++-
 docs/plugins/siege-engine.rst               | 5 ++++-
 docs/plugins/sort.rst                       | 5 ++++-
 docs/plugins/spectate.rst                   | 5 ++++-
 docs/plugins/stockflow.rst                  | 3 ++-
 docs/plugins/stockpiles.rst                 | 3 ++-
 docs/plugins/stocks.rst                     | 5 ++++-
 docs/plugins/stonesense.rst                 | 3 ++-
 docs/plugins/strangemood.rst                | 5 ++++-
 docs/plugins/tailor.rst                     | 5 ++++-
 docs/plugins/tiletypes.rst                  | 3 ++-
 docs/plugins/title-folder.rst               | 5 ++++-
 docs/plugins/title-version.rst              | 5 ++++-
 docs/plugins/trackstop.rst                  | 5 ++++-
 docs/plugins/tubefill.rst                   | 5 ++++-
 docs/plugins/tweak.rst                      | 5 ++++-
 docs/plugins/workNow.rst                    | 3 ++-
 docs/plugins/workflow.rst                   | 3 ++-
 docs/plugins/zone.rst                       | 3 ++-
 110 files changed, 354 insertions(+), 110 deletions(-)

diff --git a/docs/builtins/alias.rst b/docs/builtins/alias.rst
index a9f44386a..69ca42ba0 100644
--- a/docs/builtins/alias.rst
+++ b/docs/builtins/alias.rst
@@ -9,7 +9,8 @@ Aliases are resolved immediately after built-in commands, which means that an
 alias cannot override a built-in command, but can override a command implemented
 by a plugin or script.
 
-Usage:
+Usage
+-----
 
 ``alias list``
     Lists all configured aliases
diff --git a/docs/builtins/cls.rst b/docs/builtins/cls.rst
index 515235a93..a5fc391cd 100644
--- a/docs/builtins/cls.rst
+++ b/docs/builtins/cls.rst
@@ -8,6 +8,9 @@ cls
 Can also be invoked as ``clear``. Note that this command does not delete command
 history. It just clears the text on the screen.
 
-Usage::
+Usage
+-----
+
+::
 
     cls
diff --git a/docs/builtins/devel/dump-rpc.rst b/docs/builtins/devel/dump-rpc.rst
index 977b6e33c..957233b62 100644
--- a/docs/builtins/devel/dump-rpc.rst
+++ b/docs/builtins/devel/dump-rpc.rst
@@ -7,6 +7,9 @@ devel/dump-rpc
 
 Write RPC endpoint information to the specified file.
 
-Usage::
+Usage
+-----
+
+::
 
     devel/dump-rpc <filename>
diff --git a/docs/builtins/die.rst b/docs/builtins/die.rst
index 25a34504d..3b9a08380 100644
--- a/docs/builtins/die.rst
+++ b/docs/builtins/die.rst
@@ -7,6 +7,9 @@ die
 
 Use to exit DF quickly and safely.
 
-Usage::
+Usage
+-----
+
+::
 
     die
diff --git a/docs/builtins/disable.rst b/docs/builtins/disable.rst
index 73d267ccf..7c64f4b39 100644
--- a/docs/builtins/disable.rst
+++ b/docs/builtins/disable.rst
@@ -7,6 +7,9 @@ disable
 
 See the `enable` command for more info.
 
-Usage::
+Usage
+-----
+
+::
 
     disable <plugin> [<plugin> ...]
diff --git a/docs/builtins/enable.rst b/docs/builtins/enable.rst
index 19f98a122..7af10a9f3 100644
--- a/docs/builtins/enable.rst
+++ b/docs/builtins/enable.rst
@@ -16,7 +16,10 @@ and disabled plugins, and shows whether that can be changed through the same
 commands. Passing plugin names to these commands will enable or disable the
 specified plugins.
 
-Usage::
+Usage
+-----
+
+::
 
     enable
     enable <plugin> [<plugin> ...]
diff --git a/docs/builtins/fpause.rst b/docs/builtins/fpause.rst
index 5379caec0..ed5a40cad 100644
--- a/docs/builtins/fpause.rst
+++ b/docs/builtins/fpause.rst
@@ -7,6 +7,9 @@ fpause
 
 This is useful when your FPS drops below 1 and you lose control of the game.
 
-Usage::
+Usage
+-----
+
+::
 
     fpause
diff --git a/docs/builtins/help.rst b/docs/builtins/help.rst
index 95dadefd9..a744e8d69 100644
--- a/docs/builtins/help.rst
+++ b/docs/builtins/help.rst
@@ -7,7 +7,10 @@ help
 
 Can also be invoked as ``?`` or ``man`` (short for "manual").
 
-Usage::
+Usage
+-----
+
+::
 
     help|?|man
     help|?|man <command or plugin>
diff --git a/docs/builtins/hide.rst b/docs/builtins/hide.rst
index b23738860..037679d69 100644
--- a/docs/builtins/hide.rst
+++ b/docs/builtins/hide.rst
@@ -10,6 +10,9 @@ a `keybinding` set beforehand or the in-game `command-prompt`.
 
 Only available on Windows.
 
-Usage::
+Usage
+-----
+
+::
 
     hide
diff --git a/docs/builtins/keybinding.rst b/docs/builtins/keybinding.rst
index ae51d7a37..e7e738bc8 100644
--- a/docs/builtins/keybinding.rst
+++ b/docs/builtins/keybinding.rst
@@ -12,7 +12,8 @@ bindings are not remembered between runs of the game unless re-created in
 Hotkeys can be any combinations of Ctrl/Alt/Shift with A-Z, 0-9, F1-F12, or
 ``\``` (the key below the ``Esc`` key.
 
-Usage:
+Usage
+-----
 
 ``keybinding``
     Show some useful information, including the current game context.
diff --git a/docs/builtins/kill-lua.rst b/docs/builtins/kill-lua.rst
index 3334b3b2b..4cb3e203c 100644
--- a/docs/builtins/kill-lua.rst
+++ b/docs/builtins/kill-lua.rst
@@ -7,7 +7,10 @@ kill-lua
 
 Use this command to stop a misbehaving script that appears to be stuck.
 
-Usage::
+Usage
+-----
+
+::
 
     kill-lua
     kill-lua force
diff --git a/docs/builtins/load.rst b/docs/builtins/load.rst
index 0c199ae3d..a91316262 100644
--- a/docs/builtins/load.rst
+++ b/docs/builtins/load.rst
@@ -7,7 +7,10 @@ load
 
 Also see `unload` and `reload` for related actions.
 
-Usage::
+Usage
+-----
+
+::
 
     load <plugin> [<plugin> ...]
     load -a|--all
diff --git a/docs/builtins/ls.rst b/docs/builtins/ls.rst
index 6ef09d236..6b21e4b53 100644
--- a/docs/builtins/ls.rst
+++ b/docs/builtins/ls.rst
@@ -9,7 +9,8 @@ In order to group related commands, each command is associated with a list of
 tags. You can filter the listed commands by a tag or a substring of the
 command name. Can also be invoked as ``dir``.
 
-Usage:
+Usage
+-----
 
 ``ls [<options>]``
     Lists all available commands and the tags associated with them.
diff --git a/docs/builtins/plug.rst b/docs/builtins/plug.rst
index a1b136306..8df378d3c 100644
--- a/docs/builtins/plug.rst
+++ b/docs/builtins/plug.rst
@@ -5,7 +5,10 @@ plug
     :summary: List available plugins and whether they are enabled.
     :tags: dfhack
 
-Usage::
+Usage
+-----
+
+::
 
     plug [<plugin> [<plugin> ...]]
 
diff --git a/docs/builtins/reload.rst b/docs/builtins/reload.rst
index 17efffb2c..9ee9061a2 100644
--- a/docs/builtins/reload.rst
+++ b/docs/builtins/reload.rst
@@ -8,7 +8,10 @@ reload
 Developers use this command to reload a plugin that they are actively modifying.
 Also see `load` and `unload` for related actions.
 
-Usage::
+Usage
+-----
+
+::
 
     reload <plugin> [<plugin> ...]
     reload -a|--all
diff --git a/docs/builtins/sc-script.rst b/docs/builtins/sc-script.rst
index 5203f1aff..f66aeb412 100644
--- a/docs/builtins/sc-script.rst
+++ b/docs/builtins/sc-script.rst
@@ -8,7 +8,8 @@ sc-script
 This is similar to the static `init-files` but is slightly more flexible since
 it can be set dynamically.
 
-Usage:
+Usage
+-----
 
 ``sc-script [help]``
     Show the list of valid event names.
diff --git a/docs/builtins/script.rst b/docs/builtins/script.rst
index 0f40df5df..0c4ca8c3d 100644
--- a/docs/builtins/script.rst
+++ b/docs/builtins/script.rst
@@ -11,7 +11,10 @@ typed in by the user -- treating the input like `an init file <init-files>`.
 Some other tools, such as `autobutcher` and `workflow`, export their settings as
 the commands to create them - which can later be reloaded with ``script``.
 
-Usage::
+Usage
+-----
+
+::
 
     script <filename>
 
diff --git a/docs/builtins/show.rst b/docs/builtins/show.rst
index c59f4e519..cbfa3a386 100644
--- a/docs/builtins/show.rst
+++ b/docs/builtins/show.rst
@@ -11,6 +11,9 @@ it from a `keybinding` set beforehand or the in-game `command-prompt`.
 
 Only available on Windows.
 
-Usage::
+Usage
+-----
+
+::
 
     show
diff --git a/docs/builtins/tags.rst b/docs/builtins/tags.rst
index 3823a9924..985943647 100644
--- a/docs/builtins/tags.rst
+++ b/docs/builtins/tags.rst
@@ -8,6 +8,9 @@ tags
 You can find groups of related tools by passing the tag name to the `ls`
 command.
 
-Usage::
+Usage
+-----
+
+::
 
     tags
diff --git a/docs/builtins/type.rst b/docs/builtins/type.rst
index dfcb493f9..1bf86e588 100644
--- a/docs/builtins/type.rst
+++ b/docs/builtins/type.rst
@@ -9,6 +9,9 @@ DFHack commands can be provided by plugins, scripts, or by the core library
 itself. The ``type`` command can tell you which is the source of a particular
 command.
 
-Usage::
+Usage
+-----
+
+::
 
     type <command>
diff --git a/docs/builtins/unload.rst b/docs/builtins/unload.rst
index fd9e11a46..6fa52ea9e 100644
--- a/docs/builtins/unload.rst
+++ b/docs/builtins/unload.rst
@@ -7,7 +7,10 @@ unload
 
 Also see `load` and `reload` for related actions.
 
-Usage::
+Usage
+-----
+
+::
 
     unload <plugin> [<plugin> ...]
     unload -a|--all
diff --git a/docs/plugins/3dveins.rst b/docs/plugins/3dveins.rst
index b22ac81e5..f71a14343 100644
--- a/docs/plugins/3dveins.rst
+++ b/docs/plugins/3dveins.rst
@@ -9,7 +9,10 @@ Existing, flat veins are removed and new 3D veins that naturally span z-levels
 are generated in their place. The transformation preserves the mineral counts
 reported by `prospect`.
 
-Usage::
+Usage
+-----
+
+::
 
     3dveins [verbose]
 
diff --git a/docs/plugins/RemoteFortressReader.rst b/docs/plugins/RemoteFortressReader.rst
index 9a925d0fd..c70adc608 100644
--- a/docs/plugins/RemoteFortressReader.rst
+++ b/docs/plugins/RemoteFortressReader.rst
@@ -15,7 +15,8 @@ RemoteFortressReader
 This plugin provides an API for realtime remote fortress visualization. See
 :forums:`Armok Vision <146473>`.
 
-Usage:
+Usage
+-----
 
 ``RemoteFortressReader_version``
     Print the loaded RemoteFortressReader version.
diff --git a/docs/plugins/autobutcher.rst b/docs/plugins/autobutcher.rst
index 9379ae9c1..83c99271a 100644
--- a/docs/plugins/autobutcher.rst
+++ b/docs/plugins/autobutcher.rst
@@ -23,7 +23,8 @@ is above the target (defaults are: 1 male kid, 5 female kids, 1 male adult,
 reliable breeding population due to asexuality etc. See `fix-ster` if this is a
 problem.
 
-Usage:
+Usage
+-----
 
 ``enable autobutcher``
     Start processing livestock according to the configuration. Note that
diff --git a/docs/plugins/autochop.rst b/docs/plugins/autochop.rst
index f0f7932fd..6b51b85cb 100644
--- a/docs/plugins/autochop.rst
+++ b/docs/plugins/autochop.rst
@@ -8,7 +8,10 @@ autochop
 
 This plugin can designate trees for chopping when your stocks are low on logs.
 
-Usage::
+Usage
+-----
+
+::
 
     enable autochop
 
diff --git a/docs/plugins/autoclothing.rst b/docs/plugins/autoclothing.rst
index ed4f2160d..40fd4d996 100644
--- a/docs/plugins/autoclothing.rst
+++ b/docs/plugins/autoclothing.rst
@@ -8,7 +8,10 @@ autoclothing
 This command allows you to set how many of each clothing type every citizen
 should have.
 
-Usage::
+Usage
+-----
+
+::
 
     autoclothing
     autoclothing <material> <item> [quantity]
diff --git a/docs/plugins/autodump.rst b/docs/plugins/autodump.rst
index f9aad09d6..03e10db9c 100644
--- a/docs/plugins/autodump.rst
+++ b/docs/plugins/autodump.rst
@@ -27,7 +27,10 @@ come and move the item to your dump zone.
 
 The cursor must be placed on a floor tile so the items can be dumped there.
 
-Usage::
+Usage
+-----
+
+::
 
     enable autodump
     autodump [<options>]
diff --git a/docs/plugins/autofarm.rst b/docs/plugins/autofarm.rst
index 026a2ad61..8896c3117 100644
--- a/docs/plugins/autofarm.rst
+++ b/docs/plugins/autofarm.rst
@@ -9,7 +9,8 @@ Periodically scan your plant stocks and assign crops to your farm plots based on
 which plant stocks are low (as long as you have the appropriate seeds). The
 target threshold for each crop type is configurable.
 
-Usage:
+Usage
+-----
 
 ``enable autofarm``
     Enable the plugin and start managing crop assignment.
diff --git a/docs/plugins/autogems.rst b/docs/plugins/autogems.rst
index 9efa33499..d4112c6c0 100644
--- a/docs/plugins/autogems.rst
+++ b/docs/plugins/autogems.rst
@@ -12,7 +12,8 @@ autogems
 Automatically cut rough gems. This plugin periodically scans your stocks of
 rough gems and creates manager orders for cutting them at a Jeweler's Workshop.
 
-Usage:
+Usage
+-----
 
 ``enable autogems``
     Enables the plugin and starts autocutting gems according to its
diff --git a/docs/plugins/autohauler.rst b/docs/plugins/autohauler.rst
index 1a4a96c8f..a71d3ed02 100644
--- a/docs/plugins/autohauler.rst
+++ b/docs/plugins/autohauler.rst
@@ -22,7 +22,8 @@ Autohauler allows a skill to be used as a flag to exempt a dwarf from
 ``autohauler``'s effects. By default, this is the unused ALCHEMIST labor, but it
 can be changed by the user.
 
-Usage:
+Usage
+-----
 
 ``enable autohauler``
     Start managing hauling labors. This is normally all you need to do.
diff --git a/docs/plugins/autolabor.rst b/docs/plugins/autolabor.rst
index d2fe49e87..ed39c2666 100644
--- a/docs/plugins/autolabor.rst
+++ b/docs/plugins/autolabor.rst
@@ -21,7 +21,10 @@ untouched by autolabor.
     autolabor will override any manual changes you make to labors while it is
     enabled, including through other tools such as Dwarf Therapist.
 
-Usage::
+Usage
+-----
+
+::
 
     enable autolabor
 
diff --git a/docs/plugins/automaterial.rst b/docs/plugins/automaterial.rst
index e18fe4b72..068664638 100644
--- a/docs/plugins/automaterial.rst
+++ b/docs/plugins/automaterial.rst
@@ -17,7 +17,10 @@ regardless of distance (it only does this in "grouped" mode, as individual item
 lists could be huge). This means you can place most constructions without having
 to search for your preferred material type.
 
-Usage::
+Usage
+-----
+
+::
 
     enable automaterial
 
diff --git a/docs/plugins/automelt.rst b/docs/plugins/automelt.rst
index 047297d83..12e3412e2 100644
--- a/docs/plugins/automelt.rst
+++ b/docs/plugins/automelt.rst
@@ -10,6 +10,9 @@ When `enabled <enable>`, this plugin adds an option to the :kbd:`q` menu for
 stockpiles. When the ``automelt`` option is selected for the stockpile, any
 items placed in the stockpile will automatically be designated to be melted.
 
-Usage::
+Usage
+-----
+
+::
 
     enable automelt
diff --git a/docs/plugins/autonestbox.rst b/docs/plugins/autonestbox.rst
index b82a1a207..9d5683f2b 100644
--- a/docs/plugins/autonestbox.rst
+++ b/docs/plugins/autonestbox.rst
@@ -17,7 +17,8 @@ Note that the age of the units is not checked, so you might get some egg-laying
 kids assigned to the nestbox zones. Most birds grow up quite fast, though, so
 they should be adults and laying eggs soon enough.
 
-Usage:
+Usage
+-----
 
 ``enable autonestbox``
     Start checking for unpastured egg-layers and assigning them to nestbox
diff --git a/docs/plugins/autotrade.rst b/docs/plugins/autotrade.rst
index adff6eade..f355d40ef 100644
--- a/docs/plugins/autotrade.rst
+++ b/docs/plugins/autotrade.rst
@@ -10,6 +10,9 @@ When `enabled <enable>`, this plugin adds an option to the :kbd:`q` menu for
 stockpiles. When the ``autotrade`` option is selected for the stockpile, any
 items placed in the stockpile will automatically be designated to be traded.
 
-Usage::
+Usage
+-----
+
+::
 
     enable autotrade
diff --git a/docs/plugins/blueprint.rst b/docs/plugins/blueprint.rst
index 64fb3d556..9d7d7ef8d 100644
--- a/docs/plugins/blueprint.rst
+++ b/docs/plugins/blueprint.rst
@@ -15,7 +15,10 @@ selected interactively with the ``blueprint gui`` command or, if the GUI is not
 used, starts at the active cursor location and extends right and down for the
 requested width and height.
 
-Usage::
+Usage
+-----
+
+::
 
     blueprint <width> <height> [<depth>] [<name> [<phases>]] [<options>]
     blueprint gui [<name> [<phases>]] [<options>]
diff --git a/docs/plugins/buildingplan.rst b/docs/plugins/buildingplan.rst
index 4e96e3349..ef159443d 100644
--- a/docs/plugins/buildingplan.rst
+++ b/docs/plugins/buildingplan.rst
@@ -17,7 +17,10 @@ available, and place as many as you like. Materials are used to build the
 planned buildings as they are produced, with minimal space dedicated to
 stockpiles.
 
-Usage::
+Usage
+-----
+
+::
 
     enable buildingplan
     buildingplan set
diff --git a/docs/plugins/burrows.rst b/docs/plugins/burrows.rst
index 601fdb6b8..50d736b95 100644
--- a/docs/plugins/burrows.rst
+++ b/docs/plugins/burrows.rst
@@ -12,7 +12,8 @@ burrows
 When a wall inside a burrow with a name ending in ``+`` is dug out, the burrow
 will be extended to newly-revealed adjacent walls.
 
-Usage:
+Usage
+-----
 
 ``burrow enable auto-grow``
     When a wall inside a burrow with a name ending in '+' is dug out, the burrow
diff --git a/docs/plugins/changeitem.rst b/docs/plugins/changeitem.rst
index e49698822..f7418238a 100644
--- a/docs/plugins/changeitem.rst
+++ b/docs/plugins/changeitem.rst
@@ -11,7 +11,8 @@ since some transformations work pretty well and may be desired you can override
 this with ``force``. Note that forced changes can possibly result in items that
 crafters and haulers refuse to touch.
 
-Usage:
+Usage
+-----
 
 ``changeitem info``
    Show details about the selected item. Does not change the item. You can use
diff --git a/docs/plugins/changelayer.rst b/docs/plugins/changelayer.rst
index e44d6f317..f9467315f 100644
--- a/docs/plugins/changelayer.rst
+++ b/docs/plugins/changelayer.rst
@@ -13,7 +13,10 @@ those.
 tl;dr: You will end up with changing large areas in one go, especially if you
 use it in lower z levels. Use this command with care!
 
-Usage::
+Usage
+-----
+
+::
 
    changelayer <material RAW id> [<options>]
 
diff --git a/docs/plugins/changevein.rst b/docs/plugins/changevein.rst
index 4811c416c..f033a4a6a 100644
--- a/docs/plugins/changevein.rst
+++ b/docs/plugins/changevein.rst
@@ -12,7 +12,10 @@ clusters, you will need to use this command multiple times.
 You can use the `probe` command to discover the material RAW ids for existing
 veins that you want to duplicate.
 
-Usage::
+Usage
+-----
+
+::
 
     changevein <material RAW id>
 
diff --git a/docs/plugins/cleanconst.rst b/docs/plugins/cleanconst.rst
index 9417bd539..12b1db0e5 100644
--- a/docs/plugins/cleanconst.rst
+++ b/docs/plugins/cleanconst.rst
@@ -10,6 +10,9 @@ component when they are disassembled, allowing their actual build items to be
 safely deleted. This can improve FPS when you have many constructions on the
 map.
 
-Usage::
+Usage
+-----
+
+::
 
     cleanconst
diff --git a/docs/plugins/cleaners.rst b/docs/plugins/cleaners.rst
index 8cc5e20ca..14a25d62f 100644
--- a/docs/plugins/cleaners.rst
+++ b/docs/plugins/cleaners.rst
@@ -20,7 +20,10 @@ over the map and that clings to your items and units. In an old fortress,
 cleaning with this tool can significantly reduce FPS lag! It can also spoil your
 !!FUN!!, so think before you use it.
 
-Usage::
+Usage
+-----
+
+::
 
     clean all|map|items|units|plants [<options>]
     spotclean
diff --git a/docs/plugins/cleanowned.rst b/docs/plugins/cleanowned.rst
index 7271ce402..57094d14b 100644
--- a/docs/plugins/cleanowned.rst
+++ b/docs/plugins/cleanowned.rst
@@ -10,7 +10,10 @@ heavy wear and then marks those items for dumping. Now you can finally get your
 dwarves to give up their rotten food and tattered loincloths and go get new
 ones!
 
-Usage::
+Usage
+-----
+
+::
 
     cleanowned [<types>] [dryrun]
 
diff --git a/docs/plugins/command-prompt.rst b/docs/plugins/command-prompt.rst
index 802a1898e..7ccad6c71 100644
--- a/docs/plugins/command-prompt.rst
+++ b/docs/plugins/command-prompt.rst
@@ -5,7 +5,10 @@ command-prompt
     :summary: An in-game DFHack terminal where you can run other commands.
     :tags: dfhack
 
-Usage::
+Usage
+-----
+
+::
 
     command-prompt [entry]
 
diff --git a/docs/plugins/confirm.rst b/docs/plugins/confirm.rst
index aef18c9c0..6679cf4e3 100644
--- a/docs/plugins/confirm.rst
+++ b/docs/plugins/confirm.rst
@@ -8,7 +8,8 @@ confirm
 Now you can get the chance to avoid seizing goods from traders or deleting a
 hauling route in case you hit the key accidentally.
 
-Usage:
+Usage
+-----
 
 ``enable confirm``, ``confirm enable all``
     Enable all confirmation options. Replace with ``disable`` to disable all.
diff --git a/docs/plugins/createitem.rst b/docs/plugins/createitem.rst
index dfd286395..b29e41521 100644
--- a/docs/plugins/createitem.rst
+++ b/docs/plugins/createitem.rst
@@ -21,7 +21,8 @@ reaction raws, with the following differences:
 
 Corpses, body parts, and prepared meals cannot be created using this tool.
 
-Usage:
+Usage
+-----
 
 ``createitem <item> <material> [<count>]``
     Create <count> copies (default is 1) of the specified item made out of the
diff --git a/docs/plugins/cursecheck.rst b/docs/plugins/cursecheck.rst
index 6cf74106e..2d623241c 100644
--- a/docs/plugins/cursecheck.rst
+++ b/docs/plugins/cursecheck.rst
@@ -18,7 +18,10 @@ ignored. Undead skeletons, corpses, bodyparts and the like are all thrown into
 the curse category "zombie". Anonymous zombies and resurrected body parts will
 show as "unnamed creature".
 
-Usage::
+Usage
+-----
+
+::
 
    cursecheck [<options>]
 
diff --git a/docs/plugins/debug.rst b/docs/plugins/debug.rst
index a9e601c77..0e184595f 100644
--- a/docs/plugins/debug.rst
+++ b/docs/plugins/debug.rst
@@ -38,7 +38,8 @@ Persistent filters are stored in ``dfhack-config/runtime-debug.json``. Oldest
 filters are applied first. That means a newer filter can override the older
 printing level selection.
 
-Usage:
+Usage
+-----
 
 ``debugfilter category [<plugin regex>] [<category regex>]``
     List available debug plugin and category names. If filters aren't givenm
diff --git a/docs/plugins/deramp.rst b/docs/plugins/deramp.rst
index 4bb96ef0a..fdc0f7619 100644
--- a/docs/plugins/deramp.rst
+++ b/docs/plugins/deramp.rst
@@ -7,6 +7,9 @@ deramp
 
 It also removes any "floating" down ramps that can remain after a cave-in.
 
-Usage::
+Usage
+-----
+
+::
 
     deramp
diff --git a/docs/plugins/dig-now.rst b/docs/plugins/dig-now.rst
index 0562e000a..43ed6ce8f 100644
--- a/docs/plugins/dig-now.rst
+++ b/docs/plugins/dig-now.rst
@@ -18,7 +18,10 @@ Requests for engravings are also skipped since they would depend on the skill
 and creative choices of individual engravers. Other types of engraving (i.e.
 smoothing and track carving) are handled.
 
-Usage::
+Usage
+-----
+
+::
 
     dig-now [<pos> [<pos>]] [<options>]
 
diff --git a/docs/plugins/dig.rst b/docs/plugins/dig.rst
index 4d096e8b1..4384ade65 100644
--- a/docs/plugins/dig.rst
+++ b/docs/plugins/dig.rst
@@ -32,7 +32,8 @@ dig
 
 This plugin provides commands to make complicated dig patterns easy.
 
-Usage:
+Usage
+-----
 
 ``digv [x] [-p<number>]``
     Designate all of the selected vein for digging.
diff --git a/docs/plugins/digFlood.rst b/docs/plugins/digFlood.rst
index 60bbc9423..57d4584a8 100644
--- a/docs/plugins/digFlood.rst
+++ b/docs/plugins/digFlood.rst
@@ -12,7 +12,8 @@ just-finished dig job, so if you want to autodig a vein that has already been
 discovered, you may need to manually designate one tile of the tile for digging
 to get started.
 
-Usage:
+Usage
+-----
 
 ``enable digflood``
     Enable the plugin.
diff --git a/docs/plugins/diggingInvaders.rst b/docs/plugins/diggingInvaders.rst
index bdb65b490..ace04e9fc 100644
--- a/docs/plugins/diggingInvaders.rst
+++ b/docs/plugins/diggingInvaders.rst
@@ -5,7 +5,8 @@ diggingInvaders
     :summary: Invaders dig and destroy to get to your dwarves.
     :tags: fort gameplay military units
 
-Usage:
+Usage
+-----
 
 ``enable diggingInvaders``
     Enable the plugin.
diff --git a/docs/plugins/dwarfmonitor.rst b/docs/plugins/dwarfmonitor.rst
index 1c499639f..bfdbd13b5 100644
--- a/docs/plugins/dwarfmonitor.rst
+++ b/docs/plugins/dwarfmonitor.rst
@@ -7,7 +7,8 @@ dwarfmonitor
 
 It can also show heads-up display widgets with live fort statistics.
 
-Usage:
+Usage
+-----
 
 ``enable dwarfmonitor``
     Enable the plugin.
diff --git a/docs/plugins/dwarfvet.rst b/docs/plugins/dwarfvet.rst
index fc8f84659..e7ddf73d6 100644
--- a/docs/plugins/dwarfvet.rst
+++ b/docs/plugins/dwarfvet.rst
@@ -12,7 +12,8 @@ enabled will come to the hospital to treat animals. Normal medical skills are
 used (and trained), but no experience is given to the Animal Caretaker skill
 itself.
 
-Usage:
+Usage
+-----
 
 ``enable dwarfvet``
     Enables the plugin.
diff --git a/docs/plugins/embark-assistant.rst b/docs/plugins/embark-assistant.rst
index 797c23c3d..c7a3f778e 100644
--- a/docs/plugins/embark-assistant.rst
+++ b/docs/plugins/embark-assistant.rst
@@ -14,7 +14,10 @@ tool.
 If you enable the plugin, you'll also be able to invoke ``embark-assistant``
 with the :kbd:`A` key on the pre-embark screen.
 
-Usage::
+Usage
+-----
+
+::
 
     enable embark-assistant
     embark-assistant
diff --git a/docs/plugins/embark-tools.rst b/docs/plugins/embark-tools.rst
index df480ff71..64db27953 100644
--- a/docs/plugins/embark-tools.rst
+++ b/docs/plugins/embark-tools.rst
@@ -5,7 +5,10 @@ embark-tools
     :summary: Extend the embark screen functionality.
     :tags: embark fort interface
 
-Usage::
+Usage
+-----
+
+::
 
     enable embark-tools
     embark-tools enable|disable all
diff --git a/docs/plugins/fastdwarf.rst b/docs/plugins/fastdwarf.rst
index 7042a71a3..fb0524c3b 100644
--- a/docs/plugins/fastdwarf.rst
+++ b/docs/plugins/fastdwarf.rst
@@ -5,7 +5,10 @@ fastdwarf
     :summary: Dwarves teleport and/or finish jobs instantly.
     :tags: fort armok units
 
-Usage::
+Usage
+-----
+
+::
 
     enable fastdwarf
     fastdwarf <speed mode> [<tele mode>]
diff --git a/docs/plugins/filltraffic.rst b/docs/plugins/filltraffic.rst
index 218532790..beb57dccd 100644
--- a/docs/plugins/filltraffic.rst
+++ b/docs/plugins/filltraffic.rst
@@ -17,7 +17,10 @@ filltraffic
 .. dfhack-command:: restrictliquids
     :summary: Restrict traffic on all visible tiles with liquid.
 
-Usage::
+Usage
+-----
+
+::
 
     filltraffic <designation> [<options>]
     alltraffic <designation>
diff --git a/docs/plugins/fix-unit-occupancy.rst b/docs/plugins/fix-unit-occupancy.rst
index ba75ed389..991c77314 100644
--- a/docs/plugins/fix-unit-occupancy.rst
+++ b/docs/plugins/fix-unit-occupancy.rst
@@ -8,7 +8,10 @@ fix-unit-occupancy
 If you see "unit blocking tile" messages that you can't account for
 (:bug:`3499`), this tool can help.
 
-Usage::
+Usage
+-----
+
+::
 
     enable fix-unit-occupancy
     fix-unit-occupancy [here] [-n]
diff --git a/docs/plugins/fixveins.rst b/docs/plugins/fixveins.rst
index f8b9c4c36..616f84fae 100644
--- a/docs/plugins/fixveins.rst
+++ b/docs/plugins/fixveins.rst
@@ -8,6 +8,9 @@ fixveins
 This tool can also remove invalid references to mineral inclusions if you broke
 your embark with tools like `tiletypes`.
 
-Usage::
+Usage
+-----
+
+::
 
     fixveins
diff --git a/docs/plugins/flows.rst b/docs/plugins/flows.rst
index 994057878..bbb2c6661 100644
--- a/docs/plugins/flows.rst
+++ b/docs/plugins/flows.rst
@@ -8,6 +8,9 @@ flows
 If you suspect that your magma sea leaks into HFS, you can use this tool to be
 sure without revealing the map.
 
-Usage::
+Usage
+-----
+
+::
 
     flows
diff --git a/docs/plugins/follow.rst b/docs/plugins/follow.rst
index b6bc610b2..0bf1e4d0f 100644
--- a/docs/plugins/follow.rst
+++ b/docs/plugins/follow.rst
@@ -9,6 +9,9 @@ Once you exit from the current menu or cursor mode, the screen will stay
 centered on the unit. Handy for watching dwarves running around. Deactivated by
 moving the cursor manually.
 
-Usage::
+Usage
+-----
+
+::
 
     follow
diff --git a/docs/plugins/forceequip.rst b/docs/plugins/forceequip.rst
index b835865e2..a32af524b 100644
--- a/docs/plugins/forceequip.rst
+++ b/docs/plugins/forceequip.rst
@@ -20,7 +20,10 @@ the items. Be sure to unforbid the items that you want to work with!
 
     Weapons are not currently supported.
 
-Usage::
+Usage
+-----
+
+::
 
     forceequip [<options>]
 
diff --git a/docs/plugins/generated-creature-renamer.rst b/docs/plugins/generated-creature-renamer.rst
index 6af13595a..68302dbf5 100644
--- a/docs/plugins/generated-creature-renamer.rst
+++ b/docs/plugins/generated-creature-renamer.rst
@@ -16,7 +16,8 @@ Now, forgotten beasts, titans, necromancer experiments, etc. will have raw token
 names that match the description given in-game instead of unreadable generated
 strings.
 
-Usage:
+Usage
+-----
 
 ``enable generated-creature-renamer``
     Rename generated creatures when a world is loaded.
diff --git a/docs/plugins/getplants.rst b/docs/plugins/getplants.rst
index 90f4203b9..05bac71c9 100644
--- a/docs/plugins/getplants.rst
+++ b/docs/plugins/getplants.rst
@@ -8,7 +8,8 @@ getplants
 Specify the types of trees to cut down and/or shrubs to gather by their plant
 names.
 
-Usage:
+Usage
+-----
 
 ``getplants [-t|-s|-f]``
     List valid tree/shrub ids, optionally restricted to the specified type.
diff --git a/docs/plugins/hotkeys.rst b/docs/plugins/hotkeys.rst
index 6115bc90c..6780efca1 100644
--- a/docs/plugins/hotkeys.rst
+++ b/docs/plugins/hotkeys.rst
@@ -8,7 +8,10 @@ hotkeys
 The command opens an in-game screen showing which DFHack keybindings are active
 in the current context. See also `hotkey-notes`.
 
-Usage::
+Usage
+-----
+
+::
 
     hotkeys
 
diff --git a/docs/plugins/infiniteSky.rst b/docs/plugins/infiniteSky.rst
index 144c6c6e7..f9a68a05a 100644
--- a/docs/plugins/infiniteSky.rst
+++ b/docs/plugins/infiniteSky.rst
@@ -9,7 +9,8 @@ If enabled, this plugin will automatically allocate new z-levels of sky at the
 top of the map as you build up. Or it can allocate one or many additional levels
 at your command.
 
-Usage:
+Usage
+-----
 
 ``enable infiniteSky``
     Enables monitoring of constructions. If you build anything in the second
diff --git a/docs/plugins/jobutils.rst b/docs/plugins/jobutils.rst
index 46b221f89..9d083d92f 100644
--- a/docs/plugins/jobutils.rst
+++ b/docs/plugins/jobutils.rst
@@ -17,7 +17,8 @@ jobutils
 .. dfhack-command:: job-material
     :summary: Alters the material of the selected job.
 
-Usage:
+Usage
+-----
 
 ``job``
     Print details of the current job. The job can be selected in a workshop or
diff --git a/docs/plugins/labormanager.rst b/docs/plugins/labormanager.rst
index b168a3b7a..5c3632b6a 100644
--- a/docs/plugins/labormanager.rst
+++ b/docs/plugins/labormanager.rst
@@ -24,7 +24,10 @@ untouched.
     labors while it is enabled, including through other tools such as Dwarf
     Therapist. Do not run both autolabor and labormanager at the same time!
 
-Usage::
+Usage
+-----
+
+::
 
     enable labormanager
 
diff --git a/docs/plugins/lair.rst b/docs/plugins/lair.rst
index f42cc0777..ed2816818 100644
--- a/docs/plugins/lair.rst
+++ b/docs/plugins/lair.rst
@@ -7,7 +7,8 @@ lair
 
 This avoids item scatter when the fortress is abandoned.
 
-Usage:
+Usage
+-----
 
 ``lair``
     Mark the map as monster lair.
diff --git a/docs/plugins/liquids.rst b/docs/plugins/liquids.rst
index a498364fc..5bc24d04f 100644
--- a/docs/plugins/liquids.rst
+++ b/docs/plugins/liquids.rst
@@ -16,7 +16,8 @@ this functionality.
 Also, if you only want to add or remove water or magma from a single tile, the
 `source` script may be easier to use.
 
-Usage:
+Usage
+-----
 
 ``liquids``
     Start the interactive terminal settings interpreter. This command must be
diff --git a/docs/plugins/manipulator.rst b/docs/plugins/manipulator.rst
index a0c8ec38e..3dc7f35b7 100644
--- a/docs/plugins/manipulator.rst
+++ b/docs/plugins/manipulator.rst
@@ -10,7 +10,10 @@ It is equivalent to the popular Dwarf Therapist utility.
 
 To activate, open the unit screen and press :kbd:`l`.
 
-Usage::
+Usage
+-----
+
+::
 
     enable manipulator
 
diff --git a/docs/plugins/misery.rst b/docs/plugins/misery.rst
index af71ae19a..b3634d2ac 100644
--- a/docs/plugins/misery.rst
+++ b/docs/plugins/misery.rst
@@ -8,7 +8,8 @@ misery
 When enabled, negative thoughts that your dwarves have will multiply by the
 specified factor.
 
-Usage:
+Usage
+-----
 
 ``enable misery``
     Start multiplying negative thoughts.
diff --git a/docs/plugins/mode.rst b/docs/plugins/mode.rst
index 50cc1d0d2..33173a5d3 100644
--- a/docs/plugins/mode.rst
+++ b/docs/plugins/mode.rst
@@ -12,7 +12,8 @@ mode
     Not all combinations are good for every situation and most of them will
     produce undesirable results. There are a few good ones though.
 
-Usage:
+Usage
+-----
 
 ``mode``
     Print the current game mode.
diff --git a/docs/plugins/mousequery.rst b/docs/plugins/mousequery.rst
index eb6550d60..12f4092bd 100644
--- a/docs/plugins/mousequery.rst
+++ b/docs/plugins/mousequery.rst
@@ -9,7 +9,10 @@ Adds mouse controls to the DF interface. For example, with ``mousequery`` you
 can click on buildings to configure them, hold the mouse button to draw dig
 designations, or click and drag to move the map around.
 
-Usage::
+Usage
+-----
+
+::
 
     enable mousequery
     mousequery [rbutton|track|edge|live] [enable|disable]
diff --git a/docs/plugins/nestboxes.rst b/docs/plugins/nestboxes.rst
index 9182eee09..3c07cc30c 100644
--- a/docs/plugins/nestboxes.rst
+++ b/docs/plugins/nestboxes.rst
@@ -10,6 +10,9 @@ This plugin will automatically scan for and forbid fertile eggs incubating in a
 nestbox so that dwarves won't come to collect them for eating. The eggs will
 hatch normally, even when forbidden.
 
-Usage::
+Usage
+-----
+
+::
 
     enable nestboxes
diff --git a/docs/plugins/orders.rst b/docs/plugins/orders.rst
index 036e0df11..298800c96 100644
--- a/docs/plugins/orders.rst
+++ b/docs/plugins/orders.rst
@@ -5,7 +5,8 @@ orders
     :summary: Manage manager orders.
     :tags: fort productivity workorders
 
-Usage:
+Usage
+-----
 
 ``orders orders list``
     Shows the list of previously exported orders, including the orders library.
diff --git a/docs/plugins/petcapRemover.rst b/docs/plugins/petcapRemover.rst
index d4e1f2279..62959e731 100644
--- a/docs/plugins/petcapRemover.rst
+++ b/docs/plugins/petcapRemover.rst
@@ -13,7 +13,8 @@ population more stable and avoid sudden population booms as you go below the
 raised population cap, this plugin counts pregnancies toward the new population
 cap. It can still go over, but only in the case of multiple births.
 
-Usage:
+Usage
+-----
 
 ``enable petcapRemover``
     Enables the plugin and starts running with default settings.
diff --git a/docs/plugins/plants.rst b/docs/plugins/plants.rst
index cc23c84dd..f0a4f4af5 100644
--- a/docs/plugins/plants.rst
+++ b/docs/plugins/plants.rst
@@ -11,7 +11,8 @@ plants
 .. dfhack-command:: plant
    :summary: Create a plant or make an existing plant grow up.
 
-Usage:
+Usage
+-----
 
 ``plant create <ID>``
     Creates a new plant of the specified type at the active cursor position.
diff --git a/docs/plugins/probe.rst b/docs/plugins/probe.rst
index 7da332ba5..f9941bc48 100644
--- a/docs/plugins/probe.rst
+++ b/docs/plugins/probe.rst
@@ -11,7 +11,8 @@ probe
 .. dfhack-command:: cprobe
     :summary: Display low-level properties of the selected unit.
 
-Usage:
+Usage
+-----
 
 ``probe``
     Displays properties of the tile selected with :kbd:`k`. Some of these
diff --git a/docs/plugins/prospector.rst b/docs/plugins/prospector.rst
index 5764bc44e..4628d11c8 100644
--- a/docs/plugins/prospector.rst
+++ b/docs/plugins/prospector.rst
@@ -14,7 +14,10 @@ prospector
 It can also calculate an estimate of resources available in the selected embark
 area.
 
-Usage::
+Usage
+-----
+
+::
 
     prospect [all|hell] [<options>]
 
diff --git a/docs/plugins/regrass.rst b/docs/plugins/regrass.rst
index a4b011a1e..1a3fc7ed9 100644
--- a/docs/plugins/regrass.rst
+++ b/docs/plugins/regrass.rst
@@ -7,7 +7,10 @@ regrass
 
 Use this command if your grazers have eaten everything down to the dirt.
 
-Usage::
+Usage
+-----
+
+::
 
     regrass [max]
 
diff --git a/docs/plugins/rename.rst b/docs/plugins/rename.rst
index c3e4d5b59..137cf56a4 100644
--- a/docs/plugins/rename.rst
+++ b/docs/plugins/rename.rst
@@ -7,7 +7,8 @@ rename
 
 Use `gui/rename` for an in-game interface.
 
-Usage:
+Usage
+-----
 
 ``rename squad <ordinal> "<name>"``
     Rename the indicated squad. The ordinal is the number that corresponds to
diff --git a/docs/plugins/rendermax.rst b/docs/plugins/rendermax.rst
index af3dc6c0c..747b74642 100644
--- a/docs/plugins/rendermax.rst
+++ b/docs/plugins/rendermax.rst
@@ -8,7 +8,8 @@ rendermax
 This plugin provides a collection of OpenGL lighting filters that affect how the
 map is drawn to the screen.
 
-Usage:
+Usage
+-----
 
 ``rendermax light``
     Light the map tiles realisitically. Outside tiles are light during the day
diff --git a/docs/plugins/resume.rst b/docs/plugins/resume.rst
index b8c388738..d6e0b81cb 100644
--- a/docs/plugins/resume.rst
+++ b/docs/plugins/resume.rst
@@ -14,7 +14,10 @@ When run as a command, it can resume all suspended building jobs, allowing you
 to quickly recover if a bunch of jobs were suspended due to the workers getting
 scared off by wildlife or items temporarily blocking buildling sites.
 
-Usage::
+Usage
+-----
+
+::
 
     enable resume
     resume all
diff --git a/docs/plugins/reveal.rst b/docs/plugins/reveal.rst
index 37497111e..19066076b 100644
--- a/docs/plugins/reveal.rst
+++ b/docs/plugins/reveal.rst
@@ -26,7 +26,8 @@ This reveals all z-layers in fort mode. It also works in adventure mode, but any
 of its effects are negated once you move. When you use it this way, you don't
 need to run ``unreveal`` to hide the map again.
 
-Usage:
+Usage
+-----
 
 ``reveal [hell|demon]``
     Reveal the whole map. If ``hell`` is specified, also reveal HFS areas, but
diff --git a/docs/plugins/ruby.rst b/docs/plugins/ruby.rst
index f808735d4..f1fafbb36 100644
--- a/docs/plugins/ruby.rst
+++ b/docs/plugins/ruby.rst
@@ -14,7 +14,10 @@ ruby
 .. dfhack-command:: rb_eval
    :summary: Eval() a ruby string.
 
-Usage::
+Usage
+-----
+
+::
 
     enable ruby
     rb "ruby expression"
diff --git a/docs/plugins/search.rst b/docs/plugins/search.rst
index 937e09885..c489b4c40 100644
--- a/docs/plugins/search.rst
+++ b/docs/plugins/search.rst
@@ -13,7 +13,10 @@ aassignment candidates), Military (position candidates), Burrows (unit list),
 Rooms, Announcements, Job List, and Unit List screens all get hotkeys that allow
 you to dynamically filter the displayed lists.
 
-Usage::
+Usage
+-----
+
+::
 
     enable search
 
diff --git a/docs/plugins/seedwatch.rst b/docs/plugins/seedwatch.rst
index 7d31c160c..c471f467d 100644
--- a/docs/plugins/seedwatch.rst
+++ b/docs/plugins/seedwatch.rst
@@ -14,7 +14,8 @@ The plugin needs a fortress to be loaded and will deactivate automatically
 otherwise. You have to reactivate with ``enable seedwatch`` after you load a
 fort.
 
-Usage:
+Usage
+-----
 
 ``enable seedwatch``
     Start managing seed and plant cooking. By default, no types are watched.
diff --git a/docs/plugins/showmood.rst b/docs/plugins/showmood.rst
index a14dcf225..e12770341 100644
--- a/docs/plugins/showmood.rst
+++ b/docs/plugins/showmood.rst
@@ -5,6 +5,9 @@ showmood
     :summary: Shows all items needed for the active strange mood.
     :tags: fort armok inspection jobs units
 
-Usage::
+Usage
+-----
+
+::
 
     showmood
diff --git a/docs/plugins/siege-engine.rst b/docs/plugins/siege-engine.rst
index a6b3e87a8..d01fc524c 100644
--- a/docs/plugins/siege-engine.rst
+++ b/docs/plugins/siege-engine.rst
@@ -14,7 +14,10 @@ in four directions. To make them useful above-ground, this plugin allows you to:
 * load any object into a catapult, not just stones
 * aim at a rectangular area in any direction, and across Z-levels
 
-Usage::
+Usage
+-----
+
+::
 
     enable siege-engine
 
diff --git a/docs/plugins/sort.rst b/docs/plugins/sort.rst
index c746f1c79..f5bce9bae 100644
--- a/docs/plugins/sort.rst
+++ b/docs/plugins/sort.rst
@@ -12,7 +12,10 @@ sort
 .. dfhack-command:: sort-units
    :summary: Sort the visible unit list.
 
-Usage::
+Usage
+-----
+
+::
 
     sort-items <property> [<property> ...]
     sort-units <property> [<property> ...]
diff --git a/docs/plugins/spectate.rst b/docs/plugins/spectate.rst
index 96147695a..d9e9d3929 100644
--- a/docs/plugins/spectate.rst
+++ b/docs/plugins/spectate.rst
@@ -6,7 +6,10 @@ spectate
     :tags: fort interface
     :no-command:
 
-Usage::
+Usage
+-----
+
+::
 
     enable spectate
 
diff --git a/docs/plugins/stockflow.rst b/docs/plugins/stockflow.rst
index 358305a96..9ce91eaca 100644
--- a/docs/plugins/stockflow.rst
+++ b/docs/plugins/stockflow.rst
@@ -22,7 +22,8 @@ number of identical orders already in the queue.
 This plugin is similar to `workflow`, but uses stockpiles to manage job triggers
 instead of abstract stock quantities.
 
-Usage:
+Usage
+-----
 
 ``enable stockflow``
     Enable the plugin.
diff --git a/docs/plugins/stockpiles.rst b/docs/plugins/stockpiles.rst
index 960675d44..e7f02f970 100644
--- a/docs/plugins/stockpiles.rst
+++ b/docs/plugins/stockpiles.rst
@@ -21,7 +21,8 @@ When the plugin is enabled, the :kbd:`q` menu of each stockpile will have an
 option for saving or loading the stockpile settings. See `gui/stockpiles` for
 an in-game interface.
 
-Usage:
+Usage
+-----
 
 ``enable stockpiles``
     Add a hotkey that you can hit to easily save and load settings from
diff --git a/docs/plugins/stocks.rst b/docs/plugins/stocks.rst
index 144ba2287..d8fae9579 100644
--- a/docs/plugins/stocks.rst
+++ b/docs/plugins/stocks.rst
@@ -12,7 +12,10 @@ When the plugin is enabled, two new hotkeys become available:
 * :kbd:`i` when a stockpile is selected in :kbd:`q` mode will launch the
   stockpile inventory management screen.
 
-Usage::
+Usage
+-----
+
+::
 
     enable stocks
     stocks show
diff --git a/docs/plugins/stonesense.rst b/docs/plugins/stonesense.rst
index bd3d438f2..23c20ef0a 100644
--- a/docs/plugins/stonesense.rst
+++ b/docs/plugins/stonesense.rst
@@ -8,7 +8,8 @@ stonesense
 .. dfhack-command:: ssense
    :summary: An alias for stonesense.
 
-Usage:
+Usage
+-----
 
 ``stonesense`` or ``ssense``
     Open the visualiser in a new window.
diff --git a/docs/plugins/strangemood.rst b/docs/plugins/strangemood.rst
index 8d1fc8081..7aabda93d 100644
--- a/docs/plugins/strangemood.rst
+++ b/docs/plugins/strangemood.rst
@@ -5,7 +5,10 @@ strangemood
     :summary: Trigger a strange mood.
     :tags: fort armok units
 
-Usage::
+Usage
+-----
+
+::
 
     stangemood [<options>]
 
diff --git a/docs/plugins/tailor.rst b/docs/plugins/tailor.rst
index 646e73f91..af7d253b2 100644
--- a/docs/plugins/tailor.rst
+++ b/docs/plugins/tailor.rst
@@ -16,7 +16,10 @@ raw materials that you have on hand in the fort. For example, if you have
 lots of silk, but no cloth, then ``tailor`` will order only silk clothing to
 be made.
 
-Usage::
+Usage
+-----
+
+::
 
     enable tailor
     tailor status
diff --git a/docs/plugins/tiletypes.rst b/docs/plugins/tiletypes.rst
index ee3d4a02f..44fba00df 100644
--- a/docs/plugins/tiletypes.rst
+++ b/docs/plugins/tiletypes.rst
@@ -30,7 +30,8 @@ Both paint and filter can have many different properties, like general shape
 materials (MICROCLINE, MARBLE, etc.), state of 'designated', 'hidden', and
 'light' flags, and many others.
 
-Usage:
+Usage
+-----
 
 ``tiletypes``
     Start the interactive terminal prompt where you can iteratively modify
diff --git a/docs/plugins/title-folder.rst b/docs/plugins/title-folder.rst
index ca349a0ed..a6c7ee63c 100644
--- a/docs/plugins/title-folder.rst
+++ b/docs/plugins/title-folder.rst
@@ -6,6 +6,9 @@ title-folder
     :tags: interface
     :no-command:
 
-Usage::
+Usage
+-----
+
+::
 
     enable title-folder
diff --git a/docs/plugins/title-version.rst b/docs/plugins/title-version.rst
index 239b08bc2..307a4da18 100644
--- a/docs/plugins/title-version.rst
+++ b/docs/plugins/title-version.rst
@@ -6,6 +6,9 @@ title-version
     :tags: interface
     :no-command:
 
-Usage::
+Usage
+-----
+
+::
 
     enable title-version
diff --git a/docs/plugins/trackstop.rst b/docs/plugins/trackstop.rst
index 1c638dfd7..3ca47f465 100644
--- a/docs/plugins/trackstop.rst
+++ b/docs/plugins/trackstop.rst
@@ -11,6 +11,9 @@ completely blank in vanilla DF. This allows you to view and/or change the track
 stop's friction and dump direction settings, using the keybindings from the
 track stop building interface.
 
-Usage::
+Usage
+-----
+
+::
 
     enable trackstop
diff --git a/docs/plugins/tubefill.rst b/docs/plugins/tubefill.rst
index 865e4341d..1085897c8 100644
--- a/docs/plugins/tubefill.rst
+++ b/docs/plugins/tubefill.rst
@@ -7,7 +7,10 @@ tubefill
 
 Veins that were originally hollow will be left alone.
 
-Usage::
+Usage
+-----
+
+::
 
     tubefill [hollow]
 
diff --git a/docs/plugins/tweak.rst b/docs/plugins/tweak.rst
index 0bc156960..bb125fc0d 100644
--- a/docs/plugins/tweak.rst
+++ b/docs/plugins/tweak.rst
@@ -5,7 +5,10 @@ tweak
     :summary: A collection of tweaks and bugfixes.
     :tags: adventure fort armok bugfix fps interface
 
-Usage::
+Usage
+-----
+
+::
 
     tweak <command> [disable]
 
diff --git a/docs/plugins/workNow.rst b/docs/plugins/workNow.rst
index 27709c166..55004bca2 100644
--- a/docs/plugins/workNow.rst
+++ b/docs/plugins/workNow.rst
@@ -9,7 +9,8 @@ After finishing a job, dwarves will wander away for a while before picking up a
 new job. This plugin will automatically poke the game to assign dwarves to new
 tasks.
 
-Usage:
+Usage
+-----
 
 ``workNow``
     Print current plugin status.
diff --git a/docs/plugins/workflow.rst b/docs/plugins/workflow.rst
index db615c876..6bf89008b 100644
--- a/docs/plugins/workflow.rst
+++ b/docs/plugins/workflow.rst
@@ -29,7 +29,8 @@ configure all the vanilla manager options. Also see the `orders` plugin for
 a library of manager orders that may make managing your stocks even more
 convenient than ``workflow`` can.
 
-Usage:
+Usage
+-----
 
 ``enable workflow``
     Start monitoring for and managing workshop jobs that are set to repeat.
diff --git a/docs/plugins/zone.rst b/docs/plugins/zone.rst
index bf9428a6c..93b244399 100644
--- a/docs/plugins/zone.rst
+++ b/docs/plugins/zone.rst
@@ -5,7 +5,8 @@ zone
     :summary: Manage activity zones, cages, and the animals therein.
     :tags: fort productivity animals buildings
 
-Usage:
+Usage
+-----
 
 ``enable zone``
    Add helpful filters to the pen/pasture sidebar menu (e.g. show only caged

From d0967b7e59e5bccb57c742ba5cf647aa3b9daa5c Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Fri, 19 Aug 2022 09:34:38 -0700
Subject: [PATCH 539/854] add alt-N keybinding for do-job-now

---
 data/init/dfhack.keybindings.init | 3 +++
 docs/changelog.txt                | 3 ++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/data/init/dfhack.keybindings.init b/data/init/dfhack.keybindings.init
index c8785eba7..a5d34f14a 100644
--- a/data/init/dfhack.keybindings.init
+++ b/data/init/dfhack.keybindings.init
@@ -81,6 +81,9 @@ keybinding add Alt-I@dwarfmode/ViewUnits|unitlist gui/unit-info-viewer
 # set workorder item details (on workorder details screen press D again)
 keybinding add D@workquota_details gui/workorder-details
 
+# boost priority of jobs related tot he selected entity
+keybinding add Alt-N do-job-now
+
 ##############################
 # Generic adv mode bindings  #
 ##############################
diff --git a/docs/changelog.txt b/docs/changelog.txt
index 2639de182..955298b47 100644
--- a/docs/changelog.txt
+++ b/docs/changelog.txt
@@ -45,7 +45,8 @@ changelog.txt uses a syntax similar to RST, with a few special sequences:
 ## Misc Improvements
 - Init scripts: ``dfhack.init`` and other init scripts have moved to ``dfhack-config/init/``. If you have customized your ``dfhack.init`` file and want to keep your changes, please move the part that you have customized to the new location at ``dfhack-config/init/dfhack.init``. If you do not have changes that you want to keep, do not copy anything, and the new defaults will be used automatically.
 - History files: ``dfhack.history``, ``tiletypes.history``, ``lua.history``, and ``liquids.history`` have moved to the ``dfhack-config`` directory. If you'd like to keep the contents of your current history files, please move them to ``dfhack-config``.
-- `keybinding`: support backquote (\`) as a hotkey
+- `do-job-now`: new global keybinding for boosting the priority of the jobs associated with the selected building/work order/unit/item etc.: Alt-N
+- `keybinding`: support backquote (\`) as a hotkey (and assign the hotkey to the new `gui/launcher` interface)
 - `manipulator`: add a library of useful default professions
 - `manipulator`: move professions configuration from ``professions/`` to ``dfhack-config/professions/`` to keep it together with other dfhack configuration. If you have saved professions that you would like to keep, please manually move them to the new folder.
 - ``materials.ItemTraitsDialog``: added a default ``on_select``-handler which toggles the traits.

From 36e9af8c2b1bdfd52b452257df9449d8fec0f6ca Mon Sep 17 00:00:00 2001
From: Myk <myk002@yahoo.com>
Date: Fri, 19 Aug 2022 09:38:03 -0700
Subject: [PATCH 540/854] Update data/init/dfhack.keybindings.init

Co-authored-by: Alan <lethosor@users.noreply.github.com>
---
 data/init/dfhack.keybindings.init | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/init/dfhack.keybindings.init b/data/init/dfhack.keybindings.init
index a5d34f14a..85d010c84 100644
--- a/data/init/dfhack.keybindings.init
+++ b/data/init/dfhack.keybindings.init
@@ -81,7 +81,7 @@ keybinding add Alt-I@dwarfmode/ViewUnits|unitlist gui/unit-info-viewer
 # set workorder item details (on workorder details screen press D again)
 keybinding add D@workquota_details gui/workorder-details
 
-# boost priority of jobs related tot he selected entity
+# boost priority of jobs related to the selected entity
 keybinding add Alt-N do-job-now
 
 ##############################

From 751c2eb7d10fe3466270188f4768725532c5b493 Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Fri, 19 Aug 2022 16:19:19 -0700
Subject: [PATCH 541/854] fix detection of short description start

now that labels are no longer bolded in the text rendering, the header
detection code needs updating
---
 library/lua/helpdb.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/library/lua/helpdb.lua b/library/lua/helpdb.lua
index e6bd9133b..4e571e86b 100644
--- a/library/lua/helpdb.lua
+++ b/library/lua/helpdb.lua
@@ -191,7 +191,7 @@ local function update_entry(entry, iterator, opts)
             _,_,tags = line:trim():find('[*]*Tags:[*]* *(.*)')
             in_tags, tags_found = true, true
         elseif not short_help_found and
-                line:find('^%w') then
+                line:find('^%w') and not line:find('^%w+:') then
             if in_short_help then
                 entry.short_help = entry.short_help .. ' ' .. line
             else

From 8acda4d6c8d57f1eca216717a23337f1bad30600 Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Fri, 19 Aug 2022 22:40:53 -0700
Subject: [PATCH 542/854] Interpret '4' & '6' as strings, not movement keys

---
 library/lua/gui/widgets.lua | 40 ++++++++++++++++++-------------------
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/library/lua/gui/widgets.lua b/library/lua/gui/widgets.lua
index d1801e764..788e16c4f 100644
--- a/library/lua/gui/widgets.lua
+++ b/library/lua/gui/widgets.lua
@@ -304,6 +304,26 @@ function EditField:onInput(keys)
             self:setCursor(self.start_pos + mouse_x)
             return true
         end
+    elseif keys._STRING then
+        local old = self.text
+        if keys._STRING == 0 then
+            -- handle backspace
+            local del_pos = self.cursor - 1
+            if del_pos > 0 then
+                self:setText(old:sub(1, del_pos-1) .. old:sub(del_pos+1),
+                             del_pos)
+            end
+        else
+            local cv = string.char(keys._STRING)
+            if not self.on_char or self.on_char(cv, old) then
+                self:setText(old:sub(1,self.cursor-1)..cv..old:sub(self.cursor),
+                             self.cursor + 1)
+            end
+        end
+        if self.on_change and self.text ~= old then
+            self.on_change(self.text, old)
+        end
+        return true
     elseif keys.CURSOR_LEFT then
         self:setCursor(self.cursor - 1)
         return true
@@ -325,26 +345,6 @@ function EditField:onInput(keys)
     elseif keys.A_CARE_MOVE_E then -- Alt-Right (end)
         self:setCursor()
         return true
-    elseif keys._STRING then
-        local old = self.text
-        if keys._STRING == 0 then
-            -- handle backspace
-            local del_pos = self.cursor - 1
-            if del_pos > 0 then
-                self:setText(old:sub(1, del_pos-1) .. old:sub(del_pos+1),
-                             del_pos)
-            end
-        else
-            local cv = string.char(keys._STRING)
-            if not self.on_char or self.on_char(cv, old) then
-                self:setText(old:sub(1,self.cursor-1)..cv..old:sub(self.cursor),
-                             self.cursor + 1)
-            end
-        end
-        if self.on_change and self.text ~= old then
-            self.on_change(self.text, old)
-        end
-        return true
     end
 
     -- if we're modal, then unconditionally eat all the input

From 83b2b46d7b4bc61da76a894716fcfeb65c694c38 Mon Sep 17 00:00:00 2001
From: DFHack-Urist via GitHub Actions
 <63161697+DFHack-Urist@users.noreply.github.com>
Date: Sat, 20 Aug 2022 07:17:11 +0000
Subject: [PATCH 543/854] Auto-update submodules

scripts: master
---
 scripts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts b/scripts
index f4bf697f7..0161b0273 160000
--- a/scripts
+++ b/scripts
@@ -1 +1 @@
-Subproject commit f4bf697f75431010f71c60e3db5ac62a311599c4
+Subproject commit 0161b02731a6a8dab4041ae8b214295b285fcfae

From ce7bc4cdf48def686e0b92ccc6a24ed8d77b1014 Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Wed, 24 Aug 2022 19:13:10 -0400
Subject: [PATCH 544/854] Update scripts

---
 scripts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts b/scripts
index 0161b0273..f97a09e1a 160000
--- a/scripts
+++ b/scripts
@@ -1 +1 @@
-Subproject commit 0161b02731a6a8dab4041ae8b214295b285fcfae
+Subproject commit f97a09e1a67187a2b3ad2ba0923864399addd3d7

From 66924be4ea64415a396b58785472c971eaab8ac5 Mon Sep 17 00:00:00 2001
From: DFHack-Urist via GitHub Actions
 <63161697+DFHack-Urist@users.noreply.github.com>
Date: Thu, 25 Aug 2022 07:23:44 +0000
Subject: [PATCH 545/854] Auto-update submodules

scripts: master
---
 scripts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts b/scripts
index f97a09e1a..7d5c8f24b 160000
--- a/scripts
+++ b/scripts
@@ -1 +1 @@
-Subproject commit f97a09e1a67187a2b3ad2ba0923864399addd3d7
+Subproject commit 7d5c8f24b634f4197975963d27760c9fa3259e7e

From 25c99b5d1fee28f14778353415c042f10509ab5b Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Thu, 25 Aug 2022 21:46:23 -0700
Subject: [PATCH 546/854] make summary text easier to read in text mode

---
 docs/sphinx_extensions/dfhack/tool_docs.py | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/docs/sphinx_extensions/dfhack/tool_docs.py b/docs/sphinx_extensions/dfhack/tool_docs.py
index bc929f3d5..178303744 100644
--- a/docs/sphinx_extensions/dfhack/tool_docs.py
+++ b/docs/sphinx_extensions/dfhack/tool_docs.py
@@ -37,6 +37,15 @@ def make_labeled_paragraph(label: Optional[str]=None, content: Optional[str]=Non
         p += content_class('', content)
     return p
 
+def make_summary(builder: sphinx.builders.Builder, summary: str) -> nodes.paragraph:
+    para = nodes.paragraph('', '')
+    if builder.format == 'text':
+        # It might be clearer to block indent instead of just indenting the
+        # first line, but this is clearer than nothing.
+        para += nodes.inline(text='  ')
+    para += nodes.inline(text=summary)
+    return para
+
 
 _KEYBINDS = {}
 _KEYBINDS_RENDERED = set()  # commands whose keybindings have been rendered
@@ -147,7 +156,7 @@ class DFHackToolDirective(DFHackToolDirectiveBase):
 
         ret_nodes = [tag_paragraph]
         if 'no-command' in self.options:
-            ret_nodes += [nodes.paragraph('', '', nodes.inline(text=self.options.get('summary', '')))]
+            ret_nodes += [make_summary(self.env.app.builder, self.options.get('summary', ''))]
         return ret_nodes
 
     def run(self):
@@ -166,7 +175,7 @@ class DFHackCommandDirective(DFHackToolDirectiveBase):
         command = self.get_name_or_docname()
         return [
             self.make_labeled_paragraph('Command', command, content_class=nodes.literal),
-            nodes.paragraph('', '', nodes.inline(text=self.options.get('summary', ''))),
+            make_summary(self.env.app.builder, self.options.get('summary', '')),
             *render_dfhack_keybind(command, builder=self.env.app.builder),
         ]
 

From 0d3f5c2904ccedd20f6343f5afb19037a723fe4b Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Thu, 25 Aug 2022 21:53:35 -0700
Subject: [PATCH 547/854] get new script docs to compile

---
 docs/changelog.txt     | 2 +-
 docs/plugins/probe.rst | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/docs/changelog.txt b/docs/changelog.txt
index 955298b47..8b7343811 100644
--- a/docs/changelog.txt
+++ b/docs/changelog.txt
@@ -1053,7 +1053,7 @@ changelog.txt uses a syntax similar to RST, with a few special sequences:
 - `caravan`: documented (new in 0.44.10-alpha1)
 - `deathcause`: added "slaughtered" to descriptions
 - `fix/retrieve-units`: now re-adds units to active list to counteract `fix/dead-units`
-- `item-descriptions`: fixed several grammatical errors
+- ``item-descriptions``: fixed several grammatical errors
 - `modtools/create-unit`:
     - added quantity argument
     - now selects a caste at random if none is specified
diff --git a/docs/plugins/probe.rst b/docs/plugins/probe.rst
index f9941bc48..17573b99a 100644
--- a/docs/plugins/probe.rst
+++ b/docs/plugins/probe.rst
@@ -1,3 +1,5 @@
+.. _bprobe:
+
 probe
 =====
 

From 594dc9f9cdc1319ff88f7905e8645bfdd1954c6b Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Thu, 25 Aug 2022 21:53:50 -0700
Subject: [PATCH 548/854] update to latest scripts head

---
 scripts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts b/scripts
index f4bf697f7..4509c9156 160000
--- a/scripts
+++ b/scripts
@@ -1 +1 @@
-Subproject commit f4bf697f75431010f71c60e3db5ac62a311599c4
+Subproject commit 4509c915687dcc665395f8aed603ff65300fb84f

From 4edbded982f269799d082f8761791f73e8420fbf Mon Sep 17 00:00:00 2001
From: DFHack-Urist via GitHub Actions
 <63161697+DFHack-Urist@users.noreply.github.com>
Date: Fri, 26 Aug 2022 07:23:09 +0000
Subject: [PATCH 549/854] Auto-update submodules

scripts: master
---
 scripts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts b/scripts
index 7d5c8f24b..4509c9156 160000
--- a/scripts
+++ b/scripts
@@ -1 +1 @@
-Subproject commit 7d5c8f24b634f4197975963d27760c9fa3259e7e
+Subproject commit 4509c915687dcc665395f8aed603ff65300fb84f

From a080872a0a35f88704ec3bcbe4fb9b12cd46cc46 Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Fri, 26 Aug 2022 13:37:58 -0700
Subject: [PATCH 550/854] include other doc build types in ninja clean

---
 CMakeLists.txt | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 60bffa758..8aa57d574 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -486,11 +486,17 @@ if(BUILD_DOCS)
         DIRECTORY PROPERTY ADDITIONAL_CLEAN_FILES TRUE
         "${CMAKE_CURRENT_SOURCE_DIR}/docs/changelogs"
         "${CMAKE_CURRENT_SOURCE_DIR}/docs/html"
+        "${CMAKE_CURRENT_SOURCE_DIR}/docs/pdf"
+        "${CMAKE_CURRENT_SOURCE_DIR}/docs/pseudoxml"
         "${CMAKE_CURRENT_SOURCE_DIR}/docs/tags"
         "${CMAKE_CURRENT_SOURCE_DIR}/docs/text"
         "${CMAKE_CURRENT_SOURCE_DIR}/docs/tools"
+        "${CMAKE_CURRENT_SOURCE_DIR}/docs/xml"
         "${CMAKE_BINARY_DIR}/docs/html"
+        "${CMAKE_BINARY_DIR}/docs/pdf"
+        "${CMAKE_BINARY_DIR}/docs/pseudoxml"
         "${CMAKE_BINARY_DIR}/docs/text"
+        "${CMAKE_BINARY_DIR}/docs/xml"
     )
     add_custom_command(OUTPUT ${SPHINX_OUTPUT}
         COMMAND "${Python3_EXECUTABLE}" "${CMAKE_CURRENT_SOURCE_DIR}/docs/build.py"

From b0ae9ed9c0810e1cfca3677acb29975ff01a8049 Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Fri, 26 Aug 2022 13:38:19 -0700
Subject: [PATCH 551/854] align quickfort guides with new defaults

---
 docs/guides/quickfort-library-guide.rst | 4 +---
 docs/guides/quickfort-user-guide.rst    | 2 +-
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/docs/guides/quickfort-library-guide.rst b/docs/guides/quickfort-library-guide.rst
index ab80bab5f..be76c7afe 100644
--- a/docs/guides/quickfort-library-guide.rst
+++ b/docs/guides/quickfort-library-guide.rst
@@ -5,9 +5,7 @@ Blueprint Library Index
 =======================
 
 This guide contains a high-level overview of the blueprints available in the
-:source:`quickfort blueprint library <data/blueprints/library>`. You can list
-library blueprints by running ``quickfort list --library`` or by hitting
-:kbd:`Alt`:kbd:`l` in the ``gui/quickfort`` file load dialog.
+:source:`quickfort blueprint library <data/blueprints/library>`.
 
 Each file is hyperlinked to its online version so you can see exactly what the
 blueprints do before you run them. Also, if you use `gui/quickfort`, you will
diff --git a/docs/guides/quickfort-user-guide.rst b/docs/guides/quickfort-user-guide.rst
index e92b7d3e8..0af0924b0 100644
--- a/docs/guides/quickfort-user-guide.rst
+++ b/docs/guides/quickfort-user-guide.rst
@@ -29,7 +29,7 @@ For those just looking to apply existing blueprints, check out the `quickfort
 command's documentation <quickfort>` for syntax. There are also many
 ready-to-use blueprints available in the ``blueprints/library`` subfolder in
 your DFHack installation. Browse them on your computer or
-:source:`online <data/blueprints/library>`, or run ``quickfort list -l`` at the
+:source:`online <data/blueprints/library>`, or run ``quickfort list`` at the
 ``[DFHack]#`` prompt to list them, and then ``quickfort run`` to apply them to
 your fort!
 

From 65dd62a96e4c4c8569957a471f1ed686ec62d009 Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Fri, 26 Aug 2022 16:51:29 -0700
Subject: [PATCH 552/854] remove unnecessary label for probe

---
 docs/plugins/probe.rst | 2 --
 1 file changed, 2 deletions(-)

diff --git a/docs/plugins/probe.rst b/docs/plugins/probe.rst
index 17573b99a..f9941bc48 100644
--- a/docs/plugins/probe.rst
+++ b/docs/plugins/probe.rst
@@ -1,5 +1,3 @@
-.. _bprobe:
-
 probe
 =====
 

From 4a1a322cd7c6133355370a4d2934d23eab3624cc Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Fri, 26 Aug 2022 16:51:42 -0700
Subject: [PATCH 553/854] adapt to the new summary layout

---
 library/lua/helpdb.lua | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/library/lua/helpdb.lua b/library/lua/helpdb.lua
index 4e571e86b..2f41bbb2c 100644
--- a/library/lua/helpdb.lua
+++ b/library/lua/helpdb.lua
@@ -191,11 +191,11 @@ local function update_entry(entry, iterator, opts)
             _,_,tags = line:trim():find('[*]*Tags:[*]* *(.*)')
             in_tags, tags_found = true, true
         elseif not short_help_found and
-                line:find('^%w') and not line:find('^%w+:') then
+                line:find('^%s*%w') and not line:find('^%w+:') then
             if in_short_help then
                 entry.short_help = entry.short_help .. ' ' .. line
             else
-                entry.short_help = line
+                entry.short_help = line:trim()
             end
             local sentence_end = entry.short_help:find('.', 1, true)
             if sentence_end then

From fcd096ffaf4afc9cad2d1689b17b0c214f76ff1a Mon Sep 17 00:00:00 2001
From: DFHack-Urist via GitHub Actions
 <63161697+DFHack-Urist@users.noreply.github.com>
Date: Sat, 27 Aug 2022 00:25:50 +0000
Subject: [PATCH 554/854] Auto-update submodules

scripts: master
---
 scripts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts b/scripts
index 4509c9156..f6c877881 160000
--- a/scripts
+++ b/scripts
@@ -1 +1 @@
-Subproject commit 4509c915687dcc665395f8aed603ff65300fb84f
+Subproject commit f6c8778817b760a0d53c6fc8a176679df7a6e660

From 19c231071b9d6494161795d2f606f620dd609cae Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Fri, 26 Aug 2022 18:00:24 -0700
Subject: [PATCH 555/854] adapt to new quickfort api

---
 test/quickfort/ecosystem.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/quickfort/ecosystem.lua b/test/quickfort/ecosystem.lua
index 716f22e01..d55bc2389 100644
--- a/test/quickfort/ecosystem.lua
+++ b/test/quickfort/ecosystem.lua
@@ -85,7 +85,7 @@ local function get_blueprint_sets()
     local mock_print = mock.func()
     mock.patch(quickfort_list, 'print', mock_print,
         function()
-            dfhack.run_script('quickfort', 'list', '-l', input_dir)
+            dfhack.run_script('quickfort', 'list', input_dir)
         end)
 
     -- group blueprint sets

From 306822b1750084d0e7475915fa3f3ce960edaeeb Mon Sep 17 00:00:00 2001
From: Tachytaenius <henryfthomson@gmail.com>
Date: Sun, 10 Jul 2022 18:05:16 +0100
Subject: [PATCH 556/854] Update changelog.txt

---
 docs/changelog.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/changelog.txt b/docs/changelog.txt
index 955298b47..2cbf253d4 100644
--- a/docs/changelog.txt
+++ b/docs/changelog.txt
@@ -57,6 +57,7 @@ changelog.txt uses a syntax similar to RST, with a few special sequences:
 - UX: You can now click on the hotkey hint text in many ``gui/`` script windows to activate the hotkey, like a button. Not all scripts have been updated to use the clickable widget yet, but you can try it in `gui/blueprint` or `gui/quickfort`.
 
 ## Documentation
+- Made ``DFHACK_`` prefix in ``custom-raw-tokens``' documentation ``EXAMPLE_MOD_`` and explained why.
 
 ## API
 - Removed "egg" ("eggy") hook support (Linux only). The only remaining method of hooking into DF is by interposing SDL calls, which has been the method used by all binary releases of DFHack.

From 155525b853edd377d7711aeaebc6fc677169625f Mon Sep 17 00:00:00 2001
From: Tachytaenius <henryfthomson@gmail.com>
Date: Sun, 10 Jul 2022 18:10:40 +0100
Subject: [PATCH 557/854] Update Lua API.rst

---
 docs/Lua API.rst | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/docs/Lua API.rst b/docs/Lua API.rst
index ebd7a1287..14770c16d 100644
--- a/docs/Lua API.rst	
+++ b/docs/Lua API.rst	
@@ -3348,24 +3348,27 @@ A module for reading custom tokens added to the raws by mods.
   The same as ``getToken(plantGrowthItem, token)`` but with a specified plant and growth, using growth name
   (e.g. "LEAVES") instead of number.
 
+It is recommended to prefix custom raw tokens with the name of your mod to avoid duplicate behaviour where
+two mods make callbacks that work on the same tag.
+
 Examples:
 
 * Using an eventful onReactionComplete hook, something for disturbing dwarven science::
 
-    if customRawTokens.getToken(reaction, "DFHACK_CAUSES_INSANITY") then
+    if customRawTokens.getToken(reaction, "EXAMPLE_MOD_CAUSES_INSTANITY") then
         -- make unit who performed reaction go insane
 
 * Using an eventful onProjItemCheckMovement hook, a fast or slow-firing crossbow::
 
     -- check projectile distance flown is zero, get firer, etc...
-    local multiplier = tonumber(customRawTokens.getToken(bow, "DFHACK_FIRE_RATE_MULTIPLIER")) or 1
+    local multiplier = tonumber(customRawTokens.getToken(bow, "EXAMPLE_MOD_FIRE_RATE_MULTIPLIER")) or 1
     firer.counters.think_counter = firer.counters.think_counter * multiplier
 
 * Something for a script that prints help text about different types of units::
 
     local unit = dfhack.gui.getSelectedUnit()
     if not unit then return end
-    local helpText = customRawTokens.getToken(unit, "DFHACK_HELP_TEXT")
+    local helpText = customRawTokens.getToken(unit, "EXAMPLE_MOD_HELP_TEXT")
     if helpText then print(helpText) end
 
 * Healing armour::
@@ -3374,7 +3377,7 @@ Examples:
     local healAmount = 0
     for _, entry in ipairs(unit.inventory) do
         if entry.mode == 2 then -- Worn
-            healAmount = healAmount + tonumber((customRawTokens.getToken(entry.item, "DFHACK_HEAL_AMOUNT")) or 0)
+            healAmount = healAmount + tonumber((customRawTokens.getToken(entry.item, "EXAMPLE_MOD_HEAL_AMOUNT")) or 0)
         end
     end
     unit.body.blood_count = math.min(unit.body.blood_max, unit.body.blood_count + healAmount)

From 0b6178f5d23f806fa10ac8165c7dd33f53a58374 Mon Sep 17 00:00:00 2001
From: Tachytaenius <henryfthomson@gmail.com>
Date: Sat, 27 Aug 2022 15:24:22 +0100
Subject: [PATCH 558/854] Apply suggestions from code review

Co-authored-by: Myk <myk.taylor@gmail.com>
---
 docs/Lua API.rst   | 2 +-
 docs/changelog.txt | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/docs/Lua API.rst b/docs/Lua API.rst
index 14770c16d..b20377958 100644
--- a/docs/Lua API.rst	
+++ b/docs/Lua API.rst	
@@ -3355,7 +3355,7 @@ Examples:
 
 * Using an eventful onReactionComplete hook, something for disturbing dwarven science::
 
-    if customRawTokens.getToken(reaction, "EXAMPLE_MOD_CAUSES_INSTANITY") then
+    if customRawTokens.getToken(reaction, "EXAMPLE_MOD_CAUSES_INSANITY") then
         -- make unit who performed reaction go insane
 
 * Using an eventful onProjItemCheckMovement hook, a fast or slow-firing crossbow::
diff --git a/docs/changelog.txt b/docs/changelog.txt
index 2cbf253d4..955298b47 100644
--- a/docs/changelog.txt
+++ b/docs/changelog.txt
@@ -57,7 +57,6 @@ changelog.txt uses a syntax similar to RST, with a few special sequences:
 - UX: You can now click on the hotkey hint text in many ``gui/`` script windows to activate the hotkey, like a button. Not all scripts have been updated to use the clickable widget yet, but you can try it in `gui/blueprint` or `gui/quickfort`.
 
 ## Documentation
-- Made ``DFHACK_`` prefix in ``custom-raw-tokens``' documentation ``EXAMPLE_MOD_`` and explained why.
 
 ## API
 - Removed "egg" ("eggy") hook support (Linux only). The only remaining method of hooking into DF is by interposing SDL calls, which has been the method used by all binary releases of DFHack.

From 27e189fef2411b61646cb77469b2935e881a96c1 Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Mon, 29 Aug 2022 15:17:17 -0700
Subject: [PATCH 559/854] no cursor position reset when updating list filter

---
 library/lua/gui/widgets.lua | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/library/lua/gui/widgets.lua b/library/lua/gui/widgets.lua
index 788e16c4f..8d5b4f8ab 100644
--- a/library/lua/gui/widgets.lua
+++ b/library/lua/gui/widgets.lua
@@ -1204,7 +1204,9 @@ function FilteredList:setFilter(filter, pos)
     local cidx = nil
 
     filter = filter or ''
-    self.edit:setText(filter)
+    if filter ~= self.edit.text then
+        self.edit:setText(filter)
+    end
 
     if filter ~= '' then
         local tokens = filter:split()

From 8804dab18246aa4882de770a2f6e11daa1d8709d Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Mon, 29 Aug 2022 22:04:22 -0700
Subject: [PATCH 560/854] update dreamfort traffic designations

---
 data/blueprints/library/dreamfort.csv | 106 +++++++++++++++++++++++++-
 docs/changelog.txt                    |   1 +
 2 files changed, 106 insertions(+), 1 deletion(-)

diff --git a/data/blueprints/library/dreamfort.csv b/data/blueprints/library/dreamfort.csv
index ff0b8b4fc..d13b71795 100644
--- a/data/blueprints/library/dreamfort.csv
+++ b/data/blueprints/library/dreamfort.csv
@@ -33,7 +33,7 @@ Put that file in your dfhack-config/init/ directory -- the same directory that h
 ""
 "Also check out https://docs.dfhack.org/en/stable/docs/Plugins.html#professions for more information on the default labor professions that are distributed with DFHack, including suggestions on how many dwarves of each profession you are likely to need at each stage of fort maturity."
 ""
-"Once you have your starting surface workshops up and running, you might want to configure buildingplan (in its global settings, accessible from any building placement screen, e.g.: b-a-G) to only use blocks for constructions so it won't use your precious wood, boulders, and bars to build floors and walls. If you bring at least 7 blocks with you on embark, you can even set this in your onMapLoad.init file like this:"
+"Once you have your starting surface workshops up and running, you might want to configure buildingplan (in its global settings, accessible from any building placement screen, e.g.: b-a-G) to only use blocks for constructions so it won't use your precious wood, boulders, and bars to build floors and walls. If you bring at least 7 blocks with you on embark, you can even set this in your dfhack-config/init/onMapLoad.init file like this:"
 on-new-fortress buildingplan set boulders false; buildingplan set logs false
 ""
 "Directly after embark, run ""quickfort run library/dreamfort.csv -n /setup"" with your cursor on your wagon to set settings, and get started building your fort with ""quickfort run library/dreamfort.csv -n /surface1"" on the surface (see /surface_help for how to select a good spot). Read the walkthroughs for each level to understand what's going on and follow the checklist to keep track of where you are in the building process. Good luck, and have fun building an awesome Dreamfort-based fort!"
@@ -50,6 +50,7 @@ interactively."
 ""
 -- Preparation (before you embark!) --
 Copy hack/examples/init/onMapLoad_dreamfort.init to your dfhack-config/init directory inside your DF installation
+Optionally copy the premade Dreamfort embark profile from the online spreadsheets to the data/init/embark_profiles.txt file
 ""
 -- Set settings and preload initial orders --
 quickfort run library/dreamfort.csv -n /setup,# Run before making any manual adjustments to settings! Run the /setup_help blueprint for details on what this blueprint does.
@@ -360,6 +361,7 @@ Once the marked trees are cleared and at least the beehives and weapon rack have
 place/surface_place
 build/surface_build
 query/surface_query
+traffic/surface_traffic
 clear_large/surface_clear_large
 ""
 "#meta label(surface6) start(central stairs) message(Remember to enqueue manager orders for this blueprint.
@@ -979,6 +981,40 @@ You might also want to set the ""trade goods quantum"" stockpile to Auto Trade i
 
 
 
+#dig label(surface_traffic) start(19; 19) hidden() set traffic designations
+
+
+
+,,,`,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,,`
+,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
+,,,`,,`,`,`,`,`,`,`,`,`,`,`,`,,`,,`,`,`,`,`,`,`,`,`,`,`,`,,`
+,,,`,,`,,`,,,,,,,,`,,,,,,`,,,,,,,,,,`,,`
+,,,`,,`,,`,,,,,,,,,,`,`,`,,,,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,,`,,`,`,`,,`,,,,,,,,,,`,,`
+,,,`,,`,,`,,,,,,,,,,`,`,`,,,,,,,,,,,,`,,`
+,,,`,,`,,`,,,,,,,,`,,,,,,`,,,,,,,,,,`,,`
+,,,`,,`,`,`,`,`,`,`,,`,`,`,`,,`,,`,`,`,`,,`,`,`,`,`,`,`,,`
+,,,`,,`,,,,,,,,,`,,ol,ol,ol,ol,ol,,`,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,ol,ol,ol,ol,ol,ol,ol,ol,ol,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,ol,ol,,,,,,ol,ol,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,ol,ol,,,,,,ol,ol,,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,`,,,,,,,,`,,,,,,,,,`,,`
+,,,`,,`,`,`,`,`,`,`,`,`,`,,,,,,,,`,`,`,`,`,`,`,`,`,`,,`
+,,,`,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,`
+,,,`,`,`,`,`,`,`,`,`,`,`,`,ol,ol,ol,ol,ol,ol,ol,`,`,`,`,`,`,`,`,`,`,`,`
+,,,,,,,,,,,,,,,ol,ol,ol,ol,ol,ol,ol
+,,,,,,,,,,,,,,,ol,ol,ol,ol,ol,ol,ol
+
 #dig label(surface_clear_large) start(19; 19) hidden() clear wider area of trees
 t1(37x33)
 
@@ -1529,6 +1565,7 @@ Farming Walkthrough:
 Once furniture has been placed, continue with /farming3.) workshops, stockpiles, and important furniture"
 build/farming_build
 place/farming_place
+traffic/farming_traffic
 query_stockpiles/farming_query_stockpiles
 link_stockpiles/farming_link
 ""
@@ -1601,6 +1638,37 @@ build3/farming_build3
 ,,,,,,,,,,,,,,,ry
 
 
+#dig label(farming_traffic) start(16; 18) hidden() keep hungry dwarves away from the crops and food stores so they prefer the prepared meals
+
+
+,,,,,,,,,ol,ol,ol,,or,or,or,or,or,,ol,ol,ol,ol
+,,,,,,,,,ol,ol,ol,,or,or,or,or,or,,ol,ol,ol,ol
+,,,,,,,,,ol,ol,ol,,or,or,or,or,or,,ol,ol,ol,ol
+,,,,,,,,,,,ol,,or,or,or,or,or,,ol,ol,ol,ol
+,,,,,,,ol,ol,ol,,ol,,or,or,or,or,or,,ol,ol,ol,ol
+,,,,,,,ol,ol,ol,ol,ol,,or,or,or,or,or,,ol,ol,ol,ol
+,,,,,,,ol,ol,ol,,ol,,or,or,or,or,or,,ol
+,,,,,,,,,,,ol,,or,or,or,or,or,,ol,,ol,ol,ol
+,,,,,,ol,ol,ol,ol,,ol,,or,or,or,or,or,,ol,ol,ol,ol,ol
+,,,,,,ol,ol,ol,ol,,ol,,or,or,or,or,or,,ol,,ol,ol,ol
+,,,ol,ol,,ol,ol,ol,ol,,ol,,or,or,or,or,or,,ol
+,,ol,ol,ol,,ol,ol,ol,ol,,ol,,or,or,or,or,or,,ol,,ol,ol,ol,,ol,ol,ol
+,,ol,ol,ol,ol,ol,ol,ol,ol,ol,ol,,,or,,or,,,ol,ol,ol,ol,ol,ol,ol,ol,ol
+,,,ol,ol,,ol,ol,ol,ol,,ol,ol,ol,ol,ol,ol,ol,ol,ol,,ol,ol,ol,,ol,ol,ol
+,,,,or,,,or,,,,,,ol,`,`,`,ol,,,,,or,,,,or
+,,or,or,or,or,or,or,or,or,or,or,,ol,`,~,`,ol,,or,or,or,or,or,or,or,or,or,or
+,,or,or,or,or,or,or,or,or,or,or,or,ol,`,`,`,ol,or,or,or,or,or,or,or,or,or,or,or
+,,or,or,or,or,or,or,or,or,or,or,,ol,ol,ol,ol,ol,,or,or,or,or,or,or,or,or,or,or
+,,or,or,or,or,or,or,or,or,or,,,,ol,,ol,,,,or,or,or,or,or,or,or,or,or
+,,or,or,or,or,or,or,or,or,,,ol,ol,ol,ol,ol,ol,ol,,,or,or,or,or,or,or,or,or
+,,or,or,or,or,or,or,or,or,,ol,ol,,,ol,,,ol,ol,,or,or,or,or,or,or,or,or
+,,or,or,or,or,or,or,or,,,ol,ol,,ol,ol,ol,,ol,ol,,,or,or,or,or,or,or,or
+,,or,or,or,or,or,or,or,,ol,ol,ol,,ol,ol,ol,,ol,ol,ol,,or,or,or,or,or,or,or
+,,or,or,or,or,or,or,or,,ol,ol,ol,,ol,ol,ol,,ol,ol,ol,,or,or,or,or,or,or,or
+,,or,or,or,or,or,or,or,,ol,ol,ol,,,ol,,,ol,ol,ol,,or,or,or,or,or,or,or
+,,,,,,,,,,,,,,,ol
+
+
 "#query label(farming_query_stockpiles) start(16; 18) hidden() message(remember to:
 - assign a minecart to the refuse quantum stockpile (run ""assign-minecarts all"")
 - if the industry level is already built, configure the jugs, pots, and bags stockpiles to take from the ""Goods"" quantum stockpile on the industry level) config stockpiles"
@@ -2507,6 +2575,42 @@ query_jail/services_query_jail
 ,,,,,,,,,,,,,,,`,`,`,`,`
 ,,,,,,,,,,,,,,,`,`,`,`,`
 
+#dig label(services_traffic) start(18; 18) hidden() promote the tavern as the place to eat
+
+,ol,ol,ol,,ol,ol,ol,,ol,ol,ol,,or,or,or,,or,,or,or,or
+,ol,ol,ol,,ol,ol,ol,,ol,ol,ol,,or,or,or,or,or,or,or,or,or
+,ol,ol,ol,,ol,ol,ol,,ol,ol,ol,,or,or,or,,or,,or,or,or
+,,ol,,,,ol,,,,ol,,,,,,,or
+,ol,ol,ol,ol,ol,ol,ol,ol,ol,ol,ol,,or,or,or,,or,,or,or,or,,or,or,or,or,or
+,ol,ol,ol,ol,ol,ol,ol,ol,ol,ol,ol,,or,or,or,or,or,or,or,or,or,,or,or,or,or,or
+,ol,ol,ol,ol,ol,ol,ol,ol,ol,ol,ol,,or,or,or,,or,,or,or,or,,or,or,or,or,or
+,ol,ol,ol,ol,ol,ol,ol,ol,ol,ol,ol,,,,,,or,,,,,,or,or,or,or,or
+,ol,ol,ol,ol,ol,ol,ol,ol,ol,ol,ol,,or,or,or,or,or,or,or,or,or,,or,or,or,or,or
+,ol,ol,ol,ol,ol,ol,ol,ol,ol,ol,ol,,or,or,or,or,or,or,or,or,or,,,,or
+,ol,ol,ol,ol,ol,ol,ol,ol,ol,ol,ol,,or,or,or,or,or,or,or,or,or,or,or,or,or
+,ol,ol,ol,ol,ol,ol,ol,ol,ol,ol,ol,,or,or,or,or,or,or,or,or,or
+,ol,ol,ol,ol,ol,ol,ol,ol,ol,ol,ol,,or,or,or,or,or,or,or,or,or,,or,,or,,or,,or
+,ol,ol,ol,ol,ol,ol,ol,ol,ol,ol,ol,,,,,or,,or,,,,,or,,or,,or,,or
+,oh,oh,oh,oh,oh,oh,oh,oh,oh,oh,oh,,,,oh,oh,oh,oh,oh,,,,or,or,or,or,or,or,or,or,or
+,oh,oh,oh,oh,oh,oh,oh,oh,oh,oh,oh,oh,oh,oh,oh,`,`,`,oh,oh,oh,oh,oh,oh,oh,oh,oh,or,or
+,oh,oh,oh,oh,oh,oh,oh,oh,oh,oh,oh,,`,,oh,`,`,`,oh,,`,,oh,oh,oh,`,oh,or,or,or,or
+,oh,oh,oh,oh,oh,oh,oh,oh,oh,oh,oh,oh,oh,oh,oh,`,`,`,oh,oh,oh,oh,oh,oh,oh,oh,oh,or,or
+,oh,oh,oh,oh,oh,oh,oh,oh,oh,oh,oh,,,,oh,oh,oh,oh,oh,,,,or,or,or,or,or,or,or,or,or
+,oh,oh,oh,oh,oh,oh,oh,oh,oh,oh,oh,,,,,,`,,,,,,or,,or,,or,,or
+,oh,oh,oh,oh,oh,oh,oh,oh,oh,oh,oh,,,,,,,,,,,,or,,or,,or,,or
+,oh,oh,oh,oh,oh,oh,oh,oh,oh,oh,oh
+,oh,oh,oh,oh,oh,oh,oh,oh,oh,oh,oh
+,oh,oh,oh,oh,oh,oh,oh,oh,oh,oh,oh
+,oh,oh,oh,oh,oh,oh,oh,oh,oh,oh,oh
+,oh,oh,oh,oh,oh,oh,oh,oh,oh,oh,oh
+,oh,oh,oh,oh,oh,oh,oh,oh,oh,oh,oh
+,,,,oh,oh,,oh,oh
+,oh,oh,oh,oh,oh,,oh,oh,oh,oh,oh
+,oh,oh,oh,oh,oh,,oh,oh,oh,oh,oh
+,oh,oh,oh,oh,oh,,oh,oh,oh,oh,oh
+,oh,oh,oh,oh,oh,,oh,oh,oh,oh,oh
+,oh,oh,oh,oh,oh,,oh,oh,oh,oh,oh
+
 "#build label(services_build3) start(18; 18) hidden() jail, statues"
 
 ,~,~,~,,~,~,~,,~,~,~,,t,l,b,,`,,t,l,b
diff --git a/docs/changelog.txt b/docs/changelog.txt
index 955298b47..ba2ddbc49 100644
--- a/docs/changelog.txt
+++ b/docs/changelog.txt
@@ -55,6 +55,7 @@ changelog.txt uses a syntax similar to RST, with a few special sequences:
 - `seedwatch`: ``seedwatch all`` now adds all plants with seeds to the watchlist, not just the "basic" crops.
 - UX: You can now move the cursor around in DFHack text fields in ``gui/`` scripts (e.g. `gui/blueprint`, `gui/quickfort`, or `gui/gm-editor`). You can move the cursor by clicking where you want it to go with the mouse or using the Left/Right arrow keys.  Ctrl+Left/Right will move one word at a time, and Alt+Left/Right will move to the beginning/end of the text.
 - UX: You can now click on the hotkey hint text in many ``gui/`` script windows to activate the hotkey, like a button. Not all scripts have been updated to use the clickable widget yet, but you can try it in `gui/blueprint` or `gui/quickfort`.
+- `quickfort`: `Dreamfort <quickfort-blueprint-guide>` blueprint set improvements: set traffic designations to encourage dwarves to eat in the grand hall instead of the manager's office and to eat cooked food instead of raw ingredients
 
 ## Documentation
 

From 2b7a153509f725bf39c849c5b5ba2167d663a22e Mon Sep 17 00:00:00 2001
From: DFHack-Urist via GitHub Actions
 <63161697+DFHack-Urist@users.noreply.github.com>
Date: Tue, 30 Aug 2022 07:26:41 +0000
Subject: [PATCH 561/854] Auto-update submodules

scripts: master
---
 scripts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts b/scripts
index f6c877881..d619a2cf5 160000
--- a/scripts
+++ b/scripts
@@ -1 +1 @@
-Subproject commit f6c8778817b760a0d53c6fc8a176679df7a6e660
+Subproject commit d619a2cf5fc9883d6f24a7ebb1c1e53bfc9c9848

From 074a6ec5cdfc82066dcad4782027cfc4d86b8f7b Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Mon, 29 Aug 2022 11:40:56 -0700
Subject: [PATCH 562/854] allow EditFields to ignore specified keys

like "+" and "-", so you can use them as hotkeys in the parent view
---
 docs/Lua API.rst            | 4 ++++
 docs/changelog.txt          | 2 ++
 library/lua/gui/widgets.lua | 9 +++++++++
 3 files changed, 15 insertions(+)

diff --git a/docs/Lua API.rst b/docs/Lua API.rst
index b20377958..77194c59b 100644
--- a/docs/Lua API.rst	
+++ b/docs/Lua API.rst	
@@ -3986,6 +3986,9 @@ Attributes:
         widgets while it has focus. You can set this to ``true``, for example,
         if you don't want a ``List`` widget to react to arrow keys while the
         user is editing.
+:ignore_keys: If specified, must be a list of key names that the edit field
+              should ignore. This is useful if you have plain string characters
+              that you want to use as hotkeys (like ``+``).
 
 An ``EditField`` will only read and process text input if it has keyboard focus.
 It will automatically acquire keyboard focus when it is added as a subview to
@@ -4311,6 +4314,7 @@ supports:
 :edit_pen: If specified, used instead of ``cursor_pen`` for the edit field.
 :edit_below: If true, the edit field is placed below the list instead of above.
 :edit_key: If specified, the edit field is disabled until this key is pressed.
+:edit_ignore_keys: If specified, must be a list of key names that the filter edit field should ignore.
 :not_found_label: Specifies the text of the label shown when no items match the filter.
 
 The list choices may include the following attributes:
diff --git a/docs/changelog.txt b/docs/changelog.txt
index ba2ddbc49..054ae8cb1 100644
--- a/docs/changelog.txt
+++ b/docs/changelog.txt
@@ -73,6 +73,8 @@ changelog.txt uses a syntax similar to RST, with a few special sequences:
 - ``tile-material``: fix the order of declarations. The ``GetTileMat`` function now returns the material as intended (always returned nil before). Also changed the license info, with permission of the original author.
 - ``widgets.EditField``: new ``onsubmit2`` callback attribute is called when the user hits Shift-Enter.
 - ``widgets.EditField``: new function: ``setCursor(position)`` sets the input cursor.
+- ``widgets.EditField``: new attribute: ``ignore_keys`` lets you ignore specified characters if you want to use them as hotkeys
+- ``widgets.FilteredList``: new attribute: ``edit_ignore_keys`` gets passed to the filter EditField as ``ignore_keys``
 - ``widgets.Label``: ``scroll`` function now interprets the keywords ``+page``, ``-page``, ``+halfpage``, and ``-halfpage`` in addition to simple positive and negative numbers.
 - ``widgets.HotkeyLabel``: clicking on the widget will now call ``on_activate()``.
 - ``widgets.CycleHotkeyLabel``: clicking on the widget will now cycle the options and trigger ``on_change()``. This also applies to the ``ToggleHotkeyLabel`` subclass.
diff --git a/library/lua/gui/widgets.lua b/library/lua/gui/widgets.lua
index 8d5b4f8ab..d05749417 100644
--- a/library/lua/gui/widgets.lua
+++ b/library/lua/gui/widgets.lua
@@ -188,6 +188,7 @@ EditField.ATTRS{
     key = DEFAULT_NIL,
     key_sep = DEFAULT_NIL,
     modal = false,
+    ignore_keys = DEFAULT_NIL,
 }
 
 function EditField:preinit(init_table)
@@ -270,6 +271,12 @@ function EditField:onInput(keys)
         return self:inputToSubviews(keys)
     end
 
+    if self.ignore_keys then
+        for _,ignore_key in ipairs(self.ignore_keys) do
+            if keys[ignore_key] then return false end
+        end
+    end
+
     if self.key and keys.LEAVESCREEN then
         local old = self.text
         self:setText(self.saved_text)
@@ -1099,6 +1106,7 @@ FilteredList = defclass(FilteredList, Widget)
 FilteredList.ATTRS {
     edit_below = false,
     edit_key = DEFAULT_NIL,
+    edit_ignore_keys = DEFAULT_NIL,
 }
 
 function FilteredList:init(info)
@@ -1108,6 +1116,7 @@ function FilteredList:init(info)
         on_change = self:callback('onFilterChange'),
         on_char = self:callback('onFilterChar'),
         key = self.edit_key,
+        ignore_keys = self.edit_ignore_keys,
     }
     self.list = List{
         frame = { t = 2 },

From c178fa35a2e982f250248c0198d200e951ba4ead Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Mon, 29 Aug 2022 11:49:12 -0700
Subject: [PATCH 563/854] unit test EditField ignore_keys

---
 test/library/gui/widgets.EditField.lua | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/test/library/gui/widgets.EditField.lua b/test/library/gui/widgets.EditField.lua
index 15acfddb0..23558987b 100644
--- a/test/library/gui/widgets.EditField.lua
+++ b/test/library/gui/widgets.EditField.lua
@@ -54,3 +54,18 @@ function test.editfield_click()
             expect.eq(3, e.cursor)
         end)
 end
+
+function test.editfield_ignore_keys()
+    local e = widgets.EditField{ignore_keys={'CUSTOM_B', 'CUSTOM_C'}}
+    e:setFocus(true)
+
+    e:onInput{_STRING=string.byte('a'), CUSTOM_A=true}
+    expect.eq('a', e.text, '"a" should be accepted')
+    e:onInput{_STRING=string.byte('b'), CUSTOM_B=true}
+    expect.eq('a', e.text, '"b" should be rejected')
+    e:onInput{_STRING=string.byte('c'), CUSTOM_C=true}
+    expect.eq('a', e.text, '"c" should be rejected')
+    e:onInput{_STRING=string.byte('d'), CUSTOM_D=true}
+    expect.eq('ad', e.text, '"d" should be accepted')
+
+end

From 75b14336a70d8d8c5ac0ce770b51c12ad39d4849 Mon Sep 17 00:00:00 2001
From: DFHack-Urist via GitHub Actions
 <63161697+DFHack-Urist@users.noreply.github.com>
Date: Wed, 31 Aug 2022 17:36:55 +0000
Subject: [PATCH 564/854] Auto-update submodules

scripts: master
---
 scripts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts b/scripts
index d619a2cf5..f18758d93 160000
--- a/scripts
+++ b/scripts
@@ -1 +1 @@
-Subproject commit d619a2cf5fc9883d6f24a7ebb1c1e53bfc9c9848
+Subproject commit f18758d93b8877ea623f0eef851602d9844741aa

From ecb0a470d2525c10a7b2c1d2fb8e3e9a1b3e8eef Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Wed, 31 Aug 2022 17:38:12 -0700
Subject: [PATCH 565/854] declare zone before building chest for hospital

otherwise the hospital doesn't get stocked
---
 data/blueprints/library/dreamfort.csv | 132 +++++++++++++-------------
 1 file changed, 66 insertions(+), 66 deletions(-)

diff --git a/data/blueprints/library/dreamfort.csv b/data/blueprints/library/dreamfort.csv
index d13b71795..72e2161fe 100644
--- a/data/blueprints/library/dreamfort.csv
+++ b/data/blueprints/library/dreamfort.csv
@@ -1003,12 +1003,12 @@ You might also want to set the ""trade goods quantum"" stockpile to Auto Trade i
 ,,,`,,`,,,,,,,,,,`,,`,`,`,,`,,,,,,,,,,`,,`
 ,,,`,,`,,`,,,,,,,,,,`,`,`,,,,,,,,,,,,`,,`
 ,,,`,,`,,`,,,,,,,,`,,,,,,`,,,,,,,,,,`,,`
-,,,`,,`,`,`,`,`,`,`,,`,`,`,`,,`,,`,`,`,`,,`,`,`,`,`,`,`,,`
-,,,`,,`,,,,,,,,,`,,ol,ol,ol,ol,ol,,`,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,ol,ol,ol,ol,ol,ol,ol,ol,ol,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,ol,ol,,,,,,ol,ol,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,ol,ol,,,,,,ol,ol,,,,,,,,,`,,`
-,,,`,,`,,,,,,,,,`,,,,,,,,`,,,,,,,,,`,,`
+,,,`,,`,`,`,`,`,`,`,,`,`,`,`,,`,,`,`,`,`,or,`,`,`,`,`,`,`,,`
+,,,`,,`,,,,,,,,,`,,ol,ol,ol,ol,ol,,`,or,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,ol,ol,ol,ol,ol,ol,ol,ol,ol,or,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,ol,ol,,,,,,ol,ol,or,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,ol,ol,,,,,,ol,ol,or,,,,,,,,`,,`
+,,,`,,`,,,,,,,,,`,,,,,,,,`,or,,,,,,,,`,,`
 ,,,`,,`,`,`,`,`,`,`,`,`,`,,,,,,,,`,`,`,`,`,`,`,`,`,`,,`
 ,,,`,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,`
 ,,,`,`,`,`,`,`,`,`,`,`,`,`,ol,ol,ol,ol,ol,ol,ol,`,`,`,`,`,`,`,`,`,`,`,`
@@ -1737,7 +1737,7 @@ build3/farming_build3
 
 
 ,,,,,,,,,`,`,`,,`,`,`,`,`,,`,`,`,`
-,,,,,,,,,r&,`,`,,`,`,`,`,`,,`,`,`,`
+,,,,,,,,,r&a+&,,,,`,`,`,`,`,,`,`,`,`
 ,,,,,,,,,`,`,`,,`,`,`,`,`,,`,`,r+&h
 ,,,,,,,,,,,`,,`,`,`,`,`,,`,`,`,`
 ,,,,,,,`,`,`,,`,,`,`,`,`,`,,`,`,`,`
@@ -2206,9 +2206,9 @@ Services Walkthrough:
 
 "#meta label(services2) start(central stairs) message(Remember to enqueue manager orders for this blueprint.
 Once furniture has been placed, continue with /services3.) dining hall anchors, stockpiles, hospital, garbage dump"
+zones/services_zones
 build/services_build
 place/services_place
-zones/services_zones
 name_zones/services_name_zones
 query_stockpiles/services_query_stockpiles
 ""
@@ -2221,6 +2221,64 @@ build2/services_build2
 build3/services_build3
 place_jail/services_place_jail
 query_jail/services_query_jail
+"#zone label(services_zones) start(18; 18) hidden() message(If you'd like to fill your wells via bucket brigade, activate the inactive pond zones one level down from where the wells will be built.) garbage dump, hospital, and pond zones"
+
+,`,`,`,,`,`,`,,`,`,`,,`,`,`,,`,,`,`,`
+,`,`,`,,`,`,`,,`,`,`,,`,`,`,`,`,`,`,`,`
+,`,`,`,,`,`,`,,`,`,`,,`,`,`,,`,,`,`,`
+,,`,,,,`,,,,`,,,,,,,`
+,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,,`,,`,`,`,,`,`,`,`,`
+,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,`,`,`,`,`,`,,`,`,`,`,`
+,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,,`,,`,`,`,,`,`,`,`,`
+,`,`,`,`,`,`,`,`,`,`,`,,,,,,`,,,,,,`,`,`,`,`
+,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,`,`,`,`,`,`,,`,`,`,`,`
+,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,`,`,`,`,`,`,,,,`
+,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,`,`,`,`,`,`,`,`,`,`
+,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,`,`,`,`,`,`
+,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,`,`,`,`,`,`,ht,ht,ht,ht,ht,ht,ht,ht,ht
+,`,`,`,`,`,`,`,`,`,`,`,,,,,`,,`,,,,ht,ht,ht,ht,ht,ht,ht,ht,ht,ht
+,`,`,`,`,`,`,`,`,`,`,`,,,,`,`,`,`,`,,,ht,ht,ht,ht,ht,ht,ht,ht,ht,ht
+,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,ht,ht,ht,ht,ht,ht,ht,ht,ht,ht
+,`,`,`,`,`,`,`,`,`,`,`,,`,,`,`,`,`,`,,`,ht,ht,ht,ht,ht,ht,ht,ht,ht,ht
+,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,ht,ht,ht,ht,ht,ht,ht,ht,ht,ht
+,`,`,`,`,`,`,`,`,`,`,`,,,,`,`,`,`,`,,,ht,ht,ht,ht,ht,ht,ht,ht,ht,ht
+,`,`,`,`,`,`,`,`,`,`,`,,,,,,d,,,,,ht,ht,ht,ht,ht,ht,ht,ht,ht,ht
+,`,`,`,`,`,`,`,`,`,`,`,,,,,,,,,,,ht,ht,ht,ht,ht,ht,ht,ht,ht
+,`,`,`,`,`,`,`,`,`,`,`
+,`,`,`,`,`,`,`,`,`,`,`
+,`,`,`,`,`,`,`,`,`,`,`
+,`,`,`,`,`,`,`,`,`,`,`
+,`,`,`,`,`,`,`,`,`,`,`
+,`,`,`,`,`,`,`,`,`,`,`
+,,,,`,`,,`,`
+,`,`,`,`,`,,`,`,`,`,`
+,`,`,`,`,`,,`,`,`,`,`
+,`,`,`,`,`,,`,`,`,`,`
+,`,`,`,`,`,,`,`,`,`,`
+,`,`,`,`,`,,`,`,`,`,`
+
+#>
+
+,,,,,,,,,,,,,`,apPf,`,,`,,`,apPf,`
+,,,,,,,,,,,,,`,`,`,`,`,`,`,`,`
+,,,,,,,,,,,,,,,,,`
+,,,,,,,,,,,,,,,,,`
+,,,,,,,,,,,,,`,apPf,`,,`,,`,apPf,`
+,,,,,,,,,,,,,`,`,`,`,`,`,`,`,`
+,,,,,,,,,,,,,,,,,`
+,,,,,,,,,,,,,,,,,`
+,,,,,,,,,,,,,,,,,`
+,,,,,,,,,,,,,,,,,`
+,,,,,,,,,,,,,,,,,`
+,,,,,,,,,,,,,,,,,`,`,`,`,`,`,`,`,`,`
+,,,,,,,,,,,,,,,,,`,,,,,,,,,`
+,,,,,,,,,,,,,,,,,`,,,,,,,,,`
+,,,,,,,,,,,,,,,`,`,`,`,`,,,,,,,`
+,,,,,,,,,,,,,,,`,`,`,`,`,,,,,,`,`,`
+,,,,,,,,,,,,,,,`,`,`,`,`,,,,,,`,apPf,`
+,,,,,,,,,,,,,,,`,`,`,`,`
+,,,,,,,,,,,,,,,`,`,`,`,`
+
 #build label(services_build) start(18; 18) hidden() build basic hospital and dining room anchor
 
 ,b,b,b,,b,b,b,,b,b,b,,`,`,`,,`,,`,`,`
@@ -2293,64 +2351,6 @@ query_jail/services_query_jail
 ,`,`,`,`,`,,`,`,`,`,`
 ,`,`,`,`,`,,`,`,`,`,`
 
-"#zone label(services_zones) start(18; 18) hidden() message(If you'd like to fill your wells via bucket brigade, activate the inactive pond zones one level down from where the wells will be built.) hospital, garbage dump, and pond zones"
-
-,`,`,`,,`,`,`,,`,`,`,,`,`,`,,`,,`,`,`
-,`,`,`,,`,`,`,,`,`,`,,`,`,`,`,`,`,`,`,`
-,`,`,`,,`,`,`,,`,`,`,,`,`,`,,`,,`,`,`
-,,`,,,,`,,,,`,,,,,,,`
-,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,,`,,`,`,`,,`,`,`,`,`
-,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,`,`,`,`,`,`,,`,`,`,`,`
-,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,,`,,`,`,`,,`,`,`,`,`
-,`,`,`,`,`,`,`,`,`,`,`,,,,,,`,,,,,,`,`,`,`,`
-,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,`,`,`,`,`,`,,`,`,`,`,`
-,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,`,`,`,`,`,`,,,,`
-,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,`,`,`,`,`,`,`,`,`,`
-,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,`,`,`,`,`,`
-,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,`,`,`,`,`,`,,ht,,ht,,ht,,ht
-,`,`,`,`,`,`,`,`,`,`,`,,,,,`,,`,,,,,ht,,ht,,ht,,ht
-,`,`,`,`,`,`,`,`,`,`,`,,,,`,`,`,`,`,,,,ht,ht,ht,ht,ht,ht,ht,ht,ht
-,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,ht,ht,ht,ht,ht,ht,ht
-,`,`,`,`,`,`,`,`,`,`,`,,`,,`,`,`,`,`,,`,,ht,ht,ht,ht,ht,ht,ht,ht,ht
-,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,ht,ht,ht,ht,ht,ht,ht
-,`,`,`,`,`,`,`,`,`,`,`,,,,`,`,`,`,`,,,,ht,ht,ht,ht,ht,ht,ht,ht,ht
-,`,`,`,`,`,`,`,`,`,`,`,,,,,,d,,,,,,ht,,ht,,ht,,ht
-,`,`,`,`,`,`,`,`,`,`,`,,,,,,,,,,,,ht,,ht,,ht,,ht
-,`,`,`,`,`,`,`,`,`,`,`
-,`,`,`,`,`,`,`,`,`,`,`
-,`,`,`,`,`,`,`,`,`,`,`
-,`,`,`,`,`,`,`,`,`,`,`
-,`,`,`,`,`,`,`,`,`,`,`
-,`,`,`,`,`,`,`,`,`,`,`
-,,,,`,`,,`,`
-,`,`,`,`,`,,`,`,`,`,`
-,`,`,`,`,`,,`,`,`,`,`
-,`,`,`,`,`,,`,`,`,`,`
-,`,`,`,`,`,,`,`,`,`,`
-,`,`,`,`,`,,`,`,`,`,`
-
-#>
-
-,,,,,,,,,,,,,`,apPf,`,,`,,`,apPf,`
-,,,,,,,,,,,,,`,`,`,`,`,`,`,`,`
-,,,,,,,,,,,,,,,,,`
-,,,,,,,,,,,,,,,,,`
-,,,,,,,,,,,,,`,apPf,`,,`,,`,apPf,`
-,,,,,,,,,,,,,`,`,`,`,`,`,`,`,`
-,,,,,,,,,,,,,,,,,`
-,,,,,,,,,,,,,,,,,`
-,,,,,,,,,,,,,,,,,`
-,,,,,,,,,,,,,,,,,`
-,,,,,,,,,,,,,,,,,`
-,,,,,,,,,,,,,,,,,`,`,`,`,`,`,`,`,`,`
-,,,,,,,,,,,,,,,,,`,,,,,,,,,`
-,,,,,,,,,,,,,,,,,`,,,,,,,,,`
-,,,,,,,,,,,,,,,`,`,`,`,`,,,,,,,`
-,,,,,,,,,,,,,,,`,`,`,`,`,,,,,,`,`,`
-,,,,,,,,,,,,,,,`,`,`,`,`,,,,,,`,apPf,`
-,,,,,,,,,,,,,,,`,`,`,`,`
-,,,,,,,,,,,,,,,`,`,`,`,`
-
 #query label(services_name_zones) start(18; 18) hidden()
 
 ,`,`,`,,`,`,`,,`,`,`,,`,`,`,,`,,`,`,`

From 3d162a52ce9173ede65edcd3133bc763f8bec6d4 Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Wed, 31 Aug 2022 22:47:43 -0700
Subject: [PATCH 566/854] Add removed scripts to the graveyard

---
 docs/Removed.rst | 37 ++++++++++++++++++++++++++++---------
 1 file changed, 28 insertions(+), 9 deletions(-)

diff --git a/docs/Removed.rst b/docs/Removed.rst
index e94b04cf8..ca198d802 100644
--- a/docs/Removed.rst
+++ b/docs/Removed.rst
@@ -10,14 +10,6 @@ work (e.g. links from the `changelog`).
   :local:
   :depth: 1
 
-.. _devel/unforbidall:
-
-devel/unforbidall
-=================
-
-Replaced by the `unforbid` script. Run ``unforbid all --quiet`` to match the
-behavior of the original ``devel/unforbidall`` script.
-
 .. _deteriorateclothes:
 
 deteriorateclothes
@@ -39,6 +31,13 @@ deterioratefood
 Replaced by the new combined `deteriorate` script. Run
 ``deteriorate --types=food``.
 
+.. _devel/unforbidall:
+
+devel/unforbidall
+=================
+Replaced by the `unforbid` script. Run ``unforbid all --quiet`` to match the
+behavior of the original ``devel/unforbidall`` script.
+
 .. _digfort:
 
 digfort
@@ -49,6 +48,12 @@ existing .csv files. Just move them to the ``blueprints`` folder in your DF
 installation, and instead of ``digfort file.csv``, run
 ``quickfort run file.csv``.
 
+.. _fix/build-location:
+
+fix/build-location
+==================
+The corresponding DF :bug:`5991` was fixed in DF 0.40.05.
+
 .. _fortplan:
 
 fortplan
@@ -59,8 +64,22 @@ script instead. You can use your existing .csv files. Just move them to the
 ``blueprints`` folder in your DF installation, and instead of
 ``fortplan file.csv`` run ``quickfort run file.csv``.
 
+.. _gui/hack-wish:
+
+gui/hack-wish
+=============
+Replaced by `gui/create-item`.
+
+.. _gui/no-dfhack-init:
+
+gui/no-dfhack-init
+==================
+No longer useful since the user doesn't have to create their own ``dfhack.init``
+file now that init files have moved to ``dfhack-config/init``. It used to show
+a warning at startup if :file:`dfhack.init` file was not found.
+
 .. _warn-stuck-trees:
 
 warn-stuck-trees
 ================
-The corresponding DF bug, :bug:`9252` was fixed in DF 0.44.01.
+The corresponding DF :bug:`9252` was fixed in DF 0.44.01.

From 6edd012e6adda010720ce80f2da695f05712ae5c Mon Sep 17 00:00:00 2001
From: DFHack-Urist via GitHub Actions
 <63161697+DFHack-Urist@users.noreply.github.com>
Date: Thu, 1 Sep 2022 05:56:18 +0000
Subject: [PATCH 567/854] Auto-update submodules

scripts: master
---
 scripts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts b/scripts
index f18758d93..7bae77756 160000
--- a/scripts
+++ b/scripts
@@ -1 +1 @@
-Subproject commit f18758d93b8877ea623f0eef851602d9844741aa
+Subproject commit 7bae77756f974aad765251096516a89d9d035977

From d258035b88fdd0e1f248fbfab6634c2aefcc933f Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Wed, 31 Aug 2022 23:39:24 -0700
Subject: [PATCH 568/854] update changelog

---
 docs/changelog.txt | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/docs/changelog.txt b/docs/changelog.txt
index fd2a5dc0d..d1547d34c 100644
--- a/docs/changelog.txt
+++ b/docs/changelog.txt
@@ -39,6 +39,9 @@ changelog.txt uses a syntax similar to RST, with a few special sequences:
 
 ## New Tweaks
 
+## New Internal Commands
+- `tags`: new built-in command to list the tool category tags and their definitions. tags associated with each tool are visible in the tool help and in the output of `ls`.
+
 ## Fixes
 - ``job.removeJob()``: ensure jobs are removed from the world list when they are canceled
 
@@ -47,6 +50,7 @@ changelog.txt uses a syntax similar to RST, with a few special sequences:
 - History files: ``dfhack.history``, ``tiletypes.history``, ``lua.history``, and ``liquids.history`` have moved to the ``dfhack-config`` directory. If you'd like to keep the contents of your current history files, please move them to ``dfhack-config``.
 - `do-job-now`: new global keybinding for boosting the priority of the jobs associated with the selected building/work order/unit/item etc.: Alt-N
 - `keybinding`: support backquote (\`) as a hotkey (and assign the hotkey to the new `gui/launcher` interface)
+- `ls`: can now filter tools by substring or tag. note that dev scripts are hidden by default. pass the ``--dev`` option to show them.
 - `manipulator`: add a library of useful default professions
 - `manipulator`: move professions configuration from ``professions/`` to ``dfhack-config/professions/`` to keep it together with other dfhack configuration. If you have saved professions that you would like to keep, please manually move them to the new folder.
 - ``materials.ItemTraitsDialog``: added a default ``on_select``-handler which toggles the traits.
@@ -58,6 +62,8 @@ changelog.txt uses a syntax similar to RST, with a few special sequences:
 - `quickfort`: `Dreamfort <quickfort-blueprint-guide>` blueprint set improvements: set traffic designations to encourage dwarves to eat in the grand hall instead of the manager's office and to eat cooked food instead of raw ingredients
 
 ## Documentation
+- Update all DFHack tool documentation with standard syntax formatting, usage examples, and overall clarified text.
+- Group DFHack tools by `tag <tools>` so similar tools are grouped and easy to find
 
 ## API
 - Removed "egg" ("eggy") hook support (Linux only). The only remaining method of hooking into DF is by interposing SDL calls, which has been the method used by all binary releases of DFHack.

From 3ef4654966e1d887667a13645b05c58c55e462fa Mon Sep 17 00:00:00 2001
From: Josh Cooper <cooper.s.josh@outlook.com>
Date: Sun, 5 Jun 2022 09:06:55 -0700
Subject: [PATCH 569/854] Adds unpause code to spectate

---
 plugins/spectate.cpp | 115 +++++++++++++++++++++++++++++++++++++++----
 1 file changed, 105 insertions(+), 10 deletions(-)

diff --git a/plugins/spectate.cpp b/plugins/spectate.cpp
index 1161c3f32..7fc5bb2ee 100644
--- a/plugins/spectate.cpp
+++ b/plugins/spectate.cpp
@@ -3,6 +3,7 @@
 //
 
 #include "Core.h"
+#include <modules/Gui.h>
 #include <Console.h>
 #include <Export.h>
 #include <PluginManager.h>
@@ -14,7 +15,9 @@
 #include <df/historical_figure.h>
 #include <df/global_objects.h>
 #include <df/world.h>
+#include <df/viewscreen.h>
 #include <df/ui.h>
+#include <df/interface_key.h>
 
 #include <map>
 #include <set>
@@ -31,11 +34,19 @@ using namespace df::enums;
 
 DFHACK_PLUGIN("spectate");
 DFHACK_PLUGIN_IS_ENABLED(enabled);
+bool dismiss_pause_events = false;
 bool following_dwarf = false;
+df::unit* our_dorf = nullptr;
 void* job_watched = nullptr;
 int32_t timestamp = -1;
 REQUIRE_GLOBAL(world);
 REQUIRE_GLOBAL(ui);
+REQUIRE_GLOBAL(pause_state);
+REQUIRE_GLOBAL(d_init);
+
+// todo: implement as user configurable variables
+#define tick_span 50
+#define base 0.99
 
 command_result spectate (color_ostream &out, std::vector <std::string> & parameters);
 
@@ -46,6 +57,54 @@ DFhackCExport command_result plugin_init (color_ostream &out, std::vector <Plugi
     return CR_OK;
 }
 
+void refresh_camera(color_ostream &out) {
+    if (our_dorf) {
+        df::global::ui->follow_unit = our_dorf->id;
+        const int16_t &x = our_dorf->pos.x;
+        const int16_t &y = our_dorf->pos.y;
+        const int16_t &z = our_dorf->pos.z;
+        Gui::setViewCoords(x, y, z);
+    }
+}
+
+void unpause(color_ostream &out) {
+    if (!world) return;
+    while (!world->status.popups.empty()) {
+        // dismiss?
+        Gui::getCurViewscreen(true)->feed_key(interface_key::CLOSE_MEGA_ANNOUNCEMENT);
+    }
+    if (*pause_state) {
+        // unpause?
+        out.print("unpause? %d", df::global::world->frame_counter);
+        Gui::getCurViewscreen(true)->feed_key(interface_key::D_PAUSE);
+    }
+    refresh_camera(out);
+}
+
+DFhackCExport command_result plugin_onstatechange(color_ostream &out, state_change_event event) {
+    if (enabled) {
+        switch (event) {
+            case SC_PAUSED:
+                out.print("  ===  This is a pause event: %d", world->frame_counter);
+                if(dismiss_pause_events){
+                    unpause(out);
+                    out.print("spectate: May the deities bless your dwarves.");
+                }
+                break;
+            case SC_UNPAUSED:
+                out.print("  ===  This is an pause event: %d", world->frame_counter);
+                break;
+            case SC_MAP_UNLOADED:
+            case SC_BEGIN_UNLOAD:
+            case SC_WORLD_UNLOADED:
+                our_dorf = nullptr;
+            default:
+                break;
+        }
+    }
+    return CR_OK;
+}
+
 DFhackCExport command_result plugin_shutdown (color_ostream &out) {
     return CR_OK;
 }
@@ -66,6 +125,7 @@ DFhackCExport command_result plugin_enable(color_ostream &out, bool enable) {
         EM::registerListener(EventType::JOB_STARTED, start, plugin_self);
         EM::registerListener(EventType::JOB_COMPLETED, complete, plugin_self);
     } else if (!enable && enabled) {
+        // warp 8, engage!
         out.print("Spectate mode disabled!\n");
         EM::unregisterAll(plugin_self);
         job_tracker.clear();
@@ -76,13 +136,39 @@ DFhackCExport command_result plugin_enable(color_ostream &out, bool enable) {
 }
 
 command_result spectate (color_ostream &out, std::vector <std::string> & parameters) {
-    return plugin_enable(out, !enabled);
+    // todo: parse parameters
+    if(!parameters.empty()) {
+        if (parameters[0] == "spectate") {
+            return plugin_enable(out, !enabled);
+        } else if (parameters[0] == "disable") {
+            return plugin_enable(out, false);
+        } else if (parameters[0] == "enable") {
+            return plugin_enable(out, true);
+        } else if (parameters[0] == "godmode") {
+            out.print("todo?"); // todo: adventure as deity?
+        } else if (parameters[0] == "auto-unpause") {
+            dismiss_pause_events = !dismiss_pause_events;
+            out.print(dismiss_pause_events ? "auto-dismiss: on" : "auto-dismiss: off");
+            if (parameters.size() == 2) {
+                out.print("If you want additional options open an issue on github, or mention it on discord.");
+                return DFHack::CR_WRONG_USAGE;
+            }
+        }
+    }
+    return DFHack::CR_WRONG_USAGE;
 }
 
+// every tick check whether to decide to follow a dwarf
 void onTick(color_ostream& out, void* ptr) {
+    if (!df::global::ui) return;
     int32_t tick = df::global::world->frame_counter;
-    // || seems to be redundant as the first always evaluates true when job_watched is nullptr.. todo: figure what is supposed to happen
-    if (!following_dwarf || (job_watched == nullptr && (tick - timestamp) > 50)) {
+    if(our_dorf){
+        if(!Units::isAlive(our_dorf)){
+            following_dwarf = false;
+            df::global::ui->follow_unit = -1;
+        }
+    }
+    if (!following_dwarf || (tick - timestamp) > tick_span || job_watched == nullptr) {
         std::vector<df::unit*> dwarves;
         for (auto unit: df::global::world->units.active) {
             if (!Units::isCitizen(unit)) {
@@ -92,9 +178,9 @@ void onTick(color_ostream& out, void* ptr) {
         }
         std::uniform_int_distribution<uint64_t> follow_any(0, dwarves.size() - 1);
         if (df::global::ui) {
-            df::unit* unit = dwarves[follow_any(RNG)];
-            df::global::ui->follow_unit = unit->id;
-            job_watched = unit->job.current_job;
+            our_dorf = dwarves[follow_any(RNG)];
+            df::global::ui->follow_unit = our_dorf->id;
+            job_watched = our_dorf->job.current_job;
             following_dwarf = true;
             if (!job_watched) {
                 timestamp = tick;
@@ -103,19 +189,26 @@ void onTick(color_ostream& out, void* ptr) {
     }
 }
 
+// every new worked job needs to be considered
 void onJobStart(color_ostream& out, void* job_ptr) {
+    // todo: detect mood jobs
     int32_t tick = df::global::world->frame_counter;
     auto job = (df::job*) job_ptr;
+    // don't forget about it
     int zcount = ++freq[job->pos.z];
     job_tracker.emplace(job->id);
-    if (!following_dwarf || (job_watched == nullptr && (tick - timestamp) > 50)) {
+    // if we're not doing anything~ then let's pick something
+    if (job_watched == nullptr || (tick - timestamp) > tick_span) {
         following_dwarf = true;
-        double p = 0.99 * ((double) zcount / job_tracker.size());
+        // todo: allow the user to configure b, and also revise the math
+        const double b = base;
+        double p = b * ((double) zcount / job_tracker.size());
         std::bernoulli_distribution follow_job(p);
         if (!job->flags.bits.special && follow_job(RNG)) {
             job_watched = job_ptr;
             df::unit* unit = Job::getWorker(job);
             if (df::global::ui && unit) {
+                our_dorf = unit;
                 df::global::ui->follow_unit = unit->id;
             }
         } else {
@@ -135,13 +228,15 @@ void onJobStart(color_ostream& out, void* job_ptr) {
     }
 }
 
+// every job completed can be forgotten about
 void onJobCompletion(color_ostream &out, void* job_ptr) {
     auto job = (df::job*)job_ptr;
+    // forget about it
     freq[job->pos.z]--;
     freq[job->pos.z] = freq[job->pos.z] < 0 ? 0 : freq[job->pos.z];
     job_tracker.erase(job->id);
-    if (following_dwarf && job_ptr == job_watched) {
-        following_dwarf = false;
+    // the job doesn't exist, so we definitely need to get rid of that
+    if (job_watched == job_ptr) {
         job_watched = nullptr;
     }
 }

From 33b92e6f693e4ad506eba178e16b1dc7983078cc Mon Sep 17 00:00:00 2001
From: Josh Cooper <cooper.s.josh@outlook.com>
Date: Wed, 24 Aug 2022 11:45:16 -0700
Subject: [PATCH 570/854] Implements auto-unpause feature for spectate plugin

---
 docs/Plugins.rst     |  1 +
 docs/changelog.txt   |  1 +
 plugins/spectate.cpp | 41 +++++++++++++++++++++++++----------------
 3 files changed, 27 insertions(+), 16 deletions(-)
 create mode 100644 docs/Plugins.rst

diff --git a/docs/Plugins.rst b/docs/Plugins.rst
new file mode 100644
index 000000000..8b1378917
--- /dev/null
+++ b/docs/Plugins.rst
@@ -0,0 +1 @@
+
diff --git a/docs/changelog.txt b/docs/changelog.txt
index d1547d34c..1620f136c 100644
--- a/docs/changelog.txt
+++ b/docs/changelog.txt
@@ -57,6 +57,7 @@ changelog.txt uses a syntax similar to RST, with a few special sequences:
 - `orders`: added useful library of manager orders. see them with ``orders list`` and import them with, for example, ``orders import library/basic``
 - `prospect`: add new ``--show`` option to give the player control over which report sections are shown. e.g. ``prospect all --show ores`` will just show information on ores.
 - `seedwatch`: ``seedwatch all`` now adds all plants with seeds to the watchlist, not just the "basic" crops.
+- `spectate`: ``spectate auto-unpause`` is a new feature that will auto-dismiss pause events when enabled. This does not affect the player's ability to pause at a whim.
 - UX: You can now move the cursor around in DFHack text fields in ``gui/`` scripts (e.g. `gui/blueprint`, `gui/quickfort`, or `gui/gm-editor`). You can move the cursor by clicking where you want it to go with the mouse or using the Left/Right arrow keys.  Ctrl+Left/Right will move one word at a time, and Alt+Left/Right will move to the beginning/end of the text.
 - UX: You can now click on the hotkey hint text in many ``gui/`` script windows to activate the hotkey, like a button. Not all scripts have been updated to use the clickable widget yet, but you can try it in `gui/blueprint` or `gui/quickfort`.
 - `quickfort`: `Dreamfort <quickfort-blueprint-guide>` blueprint set improvements: set traffic designations to encourage dwarves to eat in the grand hall instead of the manager's office and to eat cooked food instead of raw ingredients
diff --git a/plugins/spectate.cpp b/plugins/spectate.cpp
index 7fc5bb2ee..3e745d6cd 100644
--- a/plugins/spectate.cpp
+++ b/plugins/spectate.cpp
@@ -53,7 +53,16 @@ command_result spectate (color_ostream &out, std::vector <std::string> & paramet
 DFhackCExport command_result plugin_init (color_ostream &out, std::vector <PluginCommand> &commands) {
     commands.push_back(PluginCommand("spectate",
                                      "Automated spectator mode.",
-                                     spectate));
+                                     spectate,
+                                     false,
+                                     ""
+                                     " spectate\n"
+                                     "    displays plugin status\n"
+                                     " spectate enable\n"
+                                     " spectate disable\n"
+                                     " spectate auto-unpause\n"
+                                     "    toggle auto-dismissal of game pause events. e.g. a siege event pause\n"
+                                     "\n"));
     return CR_OK;
 }
 
@@ -70,12 +79,11 @@ void refresh_camera(color_ostream &out) {
 void unpause(color_ostream &out) {
     if (!world) return;
     while (!world->status.popups.empty()) {
-        // dismiss?
+        // dismiss announcement(s)
         Gui::getCurViewscreen(true)->feed_key(interface_key::CLOSE_MEGA_ANNOUNCEMENT);
     }
     if (*pause_state) {
-        // unpause?
-        out.print("unpause? %d", df::global::world->frame_counter);
+        // unpause the game
         Gui::getCurViewscreen(true)->feed_key(interface_key::D_PAUSE);
     }
     refresh_camera(out);
@@ -85,14 +93,12 @@ DFhackCExport command_result plugin_onstatechange(color_ostream &out, state_chan
     if (enabled) {
         switch (event) {
             case SC_PAUSED:
-                out.print("  ===  This is a pause event: %d", world->frame_counter);
-                if(dismiss_pause_events){
+                if(dismiss_pause_events && !world->status.popups.empty()){
                     unpause(out);
-                    out.print("spectate: May the deities bless your dwarves.");
+                    out.print("spectate: May the deities bless your dwarves.\n");
                 }
                 break;
             case SC_UNPAUSED:
-                out.print("  ===  This is an pause event: %d", world->frame_counter);
                 break;
             case SC_MAP_UNLOADED:
             case SC_BEGIN_UNLOAD:
@@ -132,30 +138,33 @@ DFhackCExport command_result plugin_enable(color_ostream &out, bool enable) {
         freq.clear();
     }
     enabled = enable;
-    return CR_OK;
+    return DFHack::CR_OK;
 }
 
 command_result spectate (color_ostream &out, std::vector <std::string> & parameters) {
     // todo: parse parameters
     if(!parameters.empty()) {
-        if (parameters[0] == "spectate") {
-            return plugin_enable(out, !enabled);
-        } else if (parameters[0] == "disable") {
+        if (parameters[0] == "disable") {
             return plugin_enable(out, false);
         } else if (parameters[0] == "enable") {
             return plugin_enable(out, true);
         } else if (parameters[0] == "godmode") {
-            out.print("todo?"); // todo: adventure as deity?
+            out.print("todo?\n"); // todo: adventure as deity?
         } else if (parameters[0] == "auto-unpause") {
             dismiss_pause_events = !dismiss_pause_events;
-            out.print(dismiss_pause_events ? "auto-dismiss: on" : "auto-dismiss: off");
+            out.print(dismiss_pause_events ? "auto-unpause: on\n" : "auto-unpause: off\n");
             if (parameters.size() == 2) {
-                out.print("If you want additional options open an issue on github, or mention it on discord.");
+                out.print("If you want additional options open an issue on github, or mention it on discord.\n");
                 return DFHack::CR_WRONG_USAGE;
             }
         }
+    } else {
+        out.print(enabled ? "Spectate is enabled.\n" : "Spectate is disabled.\n");
+        if(enabled) {
+            out.print(dismiss_pause_events ? "auto-unpause: on.\n" : "auto-unpause: off.\n");
+        }
     }
-    return DFHack::CR_WRONG_USAGE;
+    return DFHack::CR_OK;
 }
 
 // every tick check whether to decide to follow a dwarf

From 4fd6c52687541e64c70770e0202cc4baf2023c13 Mon Sep 17 00:00:00 2001
From: Josh Cooper <cooper.s.josh@outlook.com>
Date: Sun, 28 Aug 2022 18:08:40 -0700
Subject: [PATCH 571/854] Extends pausing API in World module

---
 library/Core.cpp                |   3 +
 library/include/modules/World.h |  57 ++++++++++++++
 library/modules/World.cpp       | 134 ++++++++++++++++++++++++++++++++
 3 files changed, 194 insertions(+)

diff --git a/library/Core.cpp b/library/Core.cpp
index 1b3f1409f..15cab5f08 100644
--- a/library/Core.cpp
+++ b/library/Core.cpp
@@ -1911,6 +1911,9 @@ void Core::doUpdate(color_ostream &out, bool first_update)
     // Execute per-frame handlers
     onUpdate(out);
 
+    // Execute per-frame World module maintenance, after plugins and lua timers
+    World::Update();
+
     d->last_autosave_request = df::global::ui->main.autosave_request;
     d->was_load_save = is_load_save;
 
diff --git a/library/include/modules/World.h b/library/include/modules/World.h
index 659786ff5..5b87dd4cf 100644
--- a/library/include/modules/World.h
+++ b/library/include/modules/World.h
@@ -35,6 +35,7 @@ distribution.
 #include "Module.h"
 #include "modules/Persistence.h"
 #include <ostream>
+#include <unordered_set>
 
 #include "DataDefs.h"
 
@@ -61,6 +62,47 @@ namespace DFHack
     };
     class DFContextShared;
 
+    ////////////
+    // Locking mechanisms for control over pausing
+    namespace Pausing
+    {
+        class Lock
+        {
+            bool locked = false;
+            std::string name;
+        public:
+            explicit Lock(const char* name) { this->name = name;};
+            virtual ~Lock()= default;
+            virtual bool isAnyLocked() const = 0;
+            virtual bool isOnlyLocked() const = 0;
+            bool isLocked() const   { return locked; }
+            void lock()             { locked = true; };
+            void unlock()           { locked = false; };
+        };
+
+        // non-blocking lock resource used in conjunction with the announcement functions in World
+        class AnnouncementLock : public Lock
+        {
+            static std::unordered_set<Lock*> locks;
+        public:
+            explicit AnnouncementLock(const char* name): Lock(name) { locks.emplace(this); }
+            ~AnnouncementLock() override { locks.erase(this); }
+            bool isAnyLocked() const override; // returns true if any instance of AnnouncementLock is locked
+            bool isOnlyLocked() const override; // returns true if locked and no other instance is locked
+        };
+
+        // non-blocking lock resource used in conjunction with the Player pause functions in World
+        class PlayerLock : public Lock
+        {
+            static std::unordered_set<Lock*> locks;
+        public:
+            explicit PlayerLock(const char* name): Lock(name) { locks.emplace(this); }
+            ~PlayerLock() override { locks.erase(this); }
+            bool isAnyLocked() const override; // returns true if any instance of PlayerLock is locked
+            bool isOnlyLocked() const override; // returns true if locked and no other instance is locked
+        };
+    }
+
     /**
      * The World module
      * \ingroup grp_modules
@@ -73,6 +115,21 @@ namespace DFHack
         ///true if paused, false if not
         DFHACK_EXPORT void SetPauseState(bool paused);
 
+        // todo: prevent anything else from allocating/deleting?
+        // Acquire & Release pause locks controlling player pausing and announcement pause settings
+        DFHACK_EXPORT Pausing::AnnouncementLock* AcquireAnnouncementPauseLock(const char*);
+        DFHACK_EXPORT Pausing::PlayerLock* AcquirePlayerPauseLock(const char*);
+        DFHACK_EXPORT void ReleasePauseLock(Pausing::Lock*);
+
+        DFHACK_EXPORT bool DisableAnnouncementPausing(); // disable announcement pausing if all locks are open
+        DFHACK_EXPORT bool SaveAnnouncementSettings(); // save current announcement pause settings if all locks are open
+        DFHACK_EXPORT bool RestoreAnnouncementSettings(); // restore saved announcement pause settings if all locks are open
+
+        DFHACK_EXPORT bool EnablePlayerPausing(); // enable player pausing if all locks are open
+        DFHACK_EXPORT bool DisablePlayerPausing(); // disable player pausing if all locks are open
+
+        void Update();
+
         DFHACK_EXPORT uint32_t ReadCurrentTick();
         DFHACK_EXPORT uint32_t ReadCurrentYear();
         DFHACK_EXPORT uint32_t ReadCurrentMonth();
diff --git a/library/modules/World.cpp b/library/modules/World.cpp
index 12b339e95..b8e2da272 100644
--- a/library/modules/World.cpp
+++ b/library/modules/World.cpp
@@ -28,6 +28,7 @@ distribution.
 #include <string>
 #include <vector>
 #include <map>
+#include <unordered_set>
 #include <cstring>
 using namespace std;
 
@@ -51,8 +52,14 @@ using namespace std;
 #include "df/map_block.h"
 #include "df/block_square_event_world_constructionst.h"
 #include "df/viewscreen_legendsst.h"
+#include "df/d_init.h"
+#include "df/viewscreen_dwarfmodest.h"
+#include "df/ui.h"
+#include "VTableInterpose.h"
+#include "PluginManager.h"
 
 using namespace DFHack;
+using namespace Pausing;
 using namespace df::enums;
 
 using df::global::world;
@@ -68,6 +75,133 @@ void World::SetPauseState(bool paused)
     DF_GLOBAL_VALUE(pause_state, dummy) = paused;
 }
 
+std::unordered_set<Lock*> PlayerLock::locks;
+std::unordered_set<Lock*> AnnouncementLock::locks;
+
+bool AnnouncementLock::isAnyLocked() const {
+    return std::any_of(locks.begin(), locks.end(), [](Lock* lock) { return lock->isLocked(); });
+}
+
+bool AnnouncementLock::isOnlyLocked() const {
+    return std::all_of(locks.begin(), locks.end(), [&](Lock* lock) {
+        if (lock == this) {
+            return lock->isLocked();
+        }
+        return !lock->isLocked();
+    });
+}
+
+bool PlayerLock::isAnyLocked() const {
+    return std::any_of(locks.begin(), locks.end(), [](Lock* lock) { return lock->isLocked(); });
+}
+
+bool PlayerLock::isOnlyLocked() const {
+    return std::all_of(locks.begin(), locks.end(), [&](Lock* lock) {
+        if (lock == this) {
+            return lock->isLocked();
+        }
+        return !lock->isLocked();
+    });
+}
+
+namespace pausing {
+    AnnouncementLock announcementLock("monitor");
+    PlayerLock playerLock("monitor");
+
+    const size_t array_size = sizeof(decltype(df::announcements::flags)) / sizeof(df::announcement_flags);
+    bool state_saved = false; // indicates whether a restore state is ok
+    bool announcements_disabled = false; // indicates whether disable or restore was last enacted, could use a better name
+    bool saved_states[array_size]; // state to restore
+    bool locked_states[array_size]; // locked state (re-applied each frame)
+    bool allow_player_pause = true; // toggles player pause ability
+
+    using df::global::ui;
+    using namespace df::enums;
+    struct player_pause_hook : df::viewscreen_dwarfmodest {
+        typedef df::viewscreen_dwarfmodest interpose_base;
+        DEFINE_VMETHOD_INTERPOSE(void, feed, (std::set<df::interface_key>* input)) {
+            if ((ui->main.mode == ui_sidebar_mode::Default) && !allow_player_pause) {
+                input->erase(interface_key::D_PAUSE);
+            }
+            INTERPOSE_NEXT(feed)(input);
+        }
+    };
+
+    IMPLEMENT_VMETHOD_INTERPOSE(player_pause_hook, feed);
+}
+using namespace pausing;
+
+AnnouncementLock* World::AcquireAnnouncementPauseLock(const char* name) {
+    return new AnnouncementLock(name);
+}
+
+PlayerLock* World::AcquirePlayerPauseLock(const char* name) {
+    return new PlayerLock(name);
+}
+
+void World::ReleasePauseLock(Lock* lock){
+    delete lock;
+}
+
+bool World::DisableAnnouncementPausing() {
+    if (!announcementLock.isAnyLocked()) {
+        for (auto& flag : df::global::d_init->announcements.flags) {
+            flag.bits.PAUSE = false;
+        }
+        announcements_disabled = true;
+    }
+    return announcements_disabled;
+}
+
+bool World::SaveAnnouncementSettings() {
+    if (!announcementLock.isAnyLocked()) {
+        for (size_t i = 0; i < array_size; ++i) {
+            saved_states[i] = df::global::d_init->announcements.flags[i].bits.PAUSE;
+        }
+        return true;
+    }
+    return false;
+}
+
+bool World::RestoreAnnouncementSettings() {
+    if (!announcementLock.isAnyLocked() && state_saved) {
+        for (size_t i = 0; i < array_size; ++i) {
+            df::global::d_init->announcements.flags[i].bits.PAUSE = saved_states[i];
+        }
+        announcements_disabled = false;
+        return true;
+    }
+    return false;
+}
+
+bool World::EnablePlayerPausing() {
+    if (!playerLock.isAnyLocked()) {
+        allow_player_pause = true;
+    }
+    return allow_player_pause;
+}
+
+bool World::DisablePlayerPausing() {
+    if (!playerLock.isAnyLocked()) {
+        allow_player_pause = false;
+    }
+    return !allow_player_pause;
+}
+
+void World::Update() {
+    static bool did_once = false;
+    if (!did_once) {
+        did_once = true;
+        INTERPOSE_HOOK(player_pause_hook, feed).apply();
+    }
+    if (announcementLock.isAnyLocked()) {
+        for (size_t i = 0; i < array_size; ++i) {
+            df::global::d_init->announcements.flags[i].bits.PAUSE = locked_states[i];
+        }
+    }
+}
+
+
 uint32_t World::ReadCurrentYear()
 {
     return DF_GLOBAL_VALUE(cur_year, 0);

From 24fe4da6bab74979718daa334248bc5863683cf2 Mon Sep 17 00:00:00 2001
From: Josh Cooper <cooper.s.josh@outlook.com>
Date: Sun, 28 Aug 2022 18:11:50 -0700
Subject: [PATCH 572/854] Replaces spectate:auto-unpause with pausing API in
 World module

---
 plugins/spectate.cpp | 98 ++++++++++++++++++++++++++++++--------------
 1 file changed, 68 insertions(+), 30 deletions(-)

diff --git a/plugins/spectate.cpp b/plugins/spectate.cpp
index 3e745d6cd..b61d2d7fb 100644
--- a/plugins/spectate.cpp
+++ b/plugins/spectate.cpp
@@ -7,6 +7,7 @@
 #include <Console.h>
 #include <Export.h>
 #include <PluginManager.h>
+#include <modules/World.h>
 #include <modules/EventManager.h>
 #include <modules/Job.h>
 #include <modules/Units.h>
@@ -16,8 +17,6 @@
 #include <df/global_objects.h>
 #include <df/world.h>
 #include <df/viewscreen.h>
-#include <df/ui.h>
-#include <df/interface_key.h>
 
 #include <map>
 #include <set>
@@ -47,6 +46,8 @@ REQUIRE_GLOBAL(d_init);
 // todo: implement as user configurable variables
 #define tick_span 50
 #define base 0.99
+Pausing::AnnouncementLock* pause_lock = nullptr;
+bool lock_collision = false;
 
 command_result spectate (color_ostream &out, std::vector <std::string> & parameters);
 
@@ -63,39 +64,28 @@ DFhackCExport command_result plugin_init (color_ostream &out, std::vector <Plugi
                                      " spectate auto-unpause\n"
                                      "    toggle auto-dismissal of game pause events. e.g. a siege event pause\n"
                                      "\n"));
+    pause_lock = World::AcquireAnnouncementPauseLock("spectate");
     return CR_OK;
 }
 
-void refresh_camera(color_ostream &out) {
-    if (our_dorf) {
-        df::global::ui->follow_unit = our_dorf->id;
-        const int16_t &x = our_dorf->pos.x;
-        const int16_t &y = our_dorf->pos.y;
-        const int16_t &z = our_dorf->pos.z;
-        Gui::setViewCoords(x, y, z);
-    }
-}
-
-void unpause(color_ostream &out) {
-    if (!world) return;
-    while (!world->status.popups.empty()) {
-        // dismiss announcement(s)
-        Gui::getCurViewscreen(true)->feed_key(interface_key::CLOSE_MEGA_ANNOUNCEMENT);
-    }
-    if (*pause_state) {
-        // unpause the game
-        Gui::getCurViewscreen(true)->feed_key(interface_key::D_PAUSE);
-    }
-    refresh_camera(out);
-}
-
 DFhackCExport command_result plugin_onstatechange(color_ostream &out, state_change_event event) {
-    if (enabled) {
+    if (enabled && world) {
         switch (event) {
+            case SC_WORLD_LOADED:
+            case SC_MAP_LOADED:
+                if (dismiss_pause_events && World::ReadPauseState()) {
+                    *df::global::debug_nopause = false;
+                }
+                break;
             case SC_PAUSED:
-                if(dismiss_pause_events && !world->status.popups.empty()){
-                    unpause(out);
-                    out.print("spectate: May the deities bless your dwarves.\n");
+                if(dismiss_pause_events){
+                    if (our_dorf) {
+                        df::global::ui->follow_unit = our_dorf->id;
+                        const int16_t &x = our_dorf->pos.x;
+                        const int16_t &y = our_dorf->pos.y;
+                        const int16_t &z = our_dorf->pos.z;
+                        Gui::setViewCoords(x, y, z);
+                    }
                 }
                 break;
             case SC_UNPAUSED:
@@ -112,9 +102,33 @@ DFhackCExport command_result plugin_onstatechange(color_ostream &out, state_chan
 }
 
 DFhackCExport command_result plugin_shutdown (color_ostream &out) {
+    World::ReleasePauseLock(pause_lock);
     return CR_OK;
 }
 
+DFhackCExport command_result plugin_onupdate(color_ostream &out) {
+    if (lock_collision) {
+        if (dismiss_pause_events) {
+            // player asked for auto-unpause enabled
+            World::SaveAnnouncementSettings();
+            if (World::DisableAnnouncementPausing()){
+                // now that we've got what we want, we can lock it down
+                lock_collision = false;
+                pause_lock->lock();
+            }
+        } else {
+            if (World::RestoreAnnouncementSettings()) {
+                lock_collision = false;
+            }
+        }
+    }
+    while (dismiss_pause_events && !world->status.popups.empty()) {
+        // dismiss announcement popup(s)
+        Gui::getCurViewscreen(true)->feed_key(interface_key::CLOSE_MEGA_ANNOUNCEMENT);
+    }
+    return DFHack::CR_OK;
+}
+
 void onTick(color_ostream& out, void* tick);
 void onJobStart(color_ostream &out, void* job);
 void onJobCompletion(color_ostream &out, void* job);
@@ -152,7 +166,31 @@ command_result spectate (color_ostream &out, std::vector <std::string> & paramet
             out.print("todo?\n"); // todo: adventure as deity?
         } else if (parameters[0] == "auto-unpause") {
             dismiss_pause_events = !dismiss_pause_events;
-            out.print(dismiss_pause_events ? "auto-unpause: on\n" : "auto-unpause: off\n");
+
+            // update the announcement settings if we can
+            if (dismiss_pause_events) {
+                if (World::SaveAnnouncementSettings()) {
+                    World::DisableAnnouncementPausing();
+                    pause_lock->lock();
+                } else {
+                    lock_collision = true;
+                }
+            } else {
+                pause_lock->unlock();
+                if (!World::RestoreAnnouncementSettings()) {
+                    // this in theory shouldn't happen, if others use the lock like we do in spectate
+                    lock_collision = true;
+                }
+            }
+
+            // report to the user how things went
+            if (!lock_collision){
+                out.print(dismiss_pause_events ? "auto-unpause: on\n" : "auto-unpause: off\n");
+            } else {
+                out.print("auto-unpause: must wait for another Pausing::AnnouncementLock to be lifted.\n");
+            }
+
+            // probably a typo
             if (parameters.size() == 2) {
                 out.print("If you want additional options open an issue on github, or mention it on discord.\n");
                 return DFHack::CR_WRONG_USAGE;

From 318dd4c7db33229a3517048967b3cee560aeb347 Mon Sep 17 00:00:00 2001
From: Josh Cooper <cooper.s.josh@outlook.com>
Date: Sun, 28 Aug 2022 18:13:20 -0700
Subject: [PATCH 573/854] Revises nopause in reveal with pause API in World
 module

---
 plugins/reveal.cpp | 26 +++++++++++++++++++++-----
 1 file changed, 21 insertions(+), 5 deletions(-)

diff --git a/plugins/reveal.cpp b/plugins/reveal.cpp
index 8d76bd54b..3aba37b95 100644
--- a/plugins/reveal.cpp
+++ b/plugins/reveal.cpp
@@ -62,6 +62,7 @@ struct hideblock
 uint32_t x_max, y_max, z_max;
 vector <hideblock> hidesaved;
 bool nopause_state = false;
+Pausing::PlayerLock* pause_lock = nullptr;
 
 enum revealstate
 {
@@ -106,6 +107,7 @@ DFhackCExport command_result plugin_init ( color_ostream &out, vector <PluginCom
         "nopause",
         "Disable manual and automatic pausing.",
         nopause));
+    pause_lock = World::AcquirePlayerPauseLock("reveal::nopause");
     return CR_OK;
 }
 
@@ -130,6 +132,7 @@ DFhackCExport command_result plugin_onupdate ( color_ostream &out )
 
 DFhackCExport command_result plugin_shutdown ( color_ostream &out )
 {
+    World::ReleasePauseLock(pause_lock);
     return CR_OK;
 }
 
@@ -137,10 +140,23 @@ command_result nopause (color_ostream &out, vector <string> & parameters)
 {
     if (parameters.size() == 1 && (parameters[0] == "0" || parameters[0] == "1"))
     {
-        if (parameters[0] == "0")
+        if (parameters[0] == "0") {
+            if (nopause_state) {
+                pause_lock->unlock();
+                if (!World::EnablePlayerPausing()) {
+                    out.printerr("reveal/nopause: Player pausing is currently locked by another plugin / script. Unable to re-enable.\n");
+                }
+            }
             nopause_state = 0;
-        else
+        } else {
+            if (!nopause_state) {
+                pause_lock->unlock();
+                if (!World::DisablePlayerPausing()) {
+                    out.printerr("reveal/nopause: Player pausing is currently locked by another plugin / script. Unable to disable.\n");
+                }
+            }
             nopause_state = 1;
+        }
         is_active = nopause_state || (revealed == REVEALED);
         out.print("nopause %sactivated.\n", (nopause_state ? "" : "de"));
     }
@@ -474,7 +490,7 @@ command_result revflood(color_ostream &out, vector<string> & params)
             return CR_WRONG_USAGE;
     }
     CoreSuspender suspend;
-    uint32_t x_max,y_max,z_max;
+    uint32_t xmax,ymax,zmax;
     if (!Maps::IsValid())
     {
         out.printerr("Map is not available!\n");
@@ -493,7 +509,7 @@ command_result revflood(color_ostream &out, vector<string> & params)
         return CR_FAILURE;
     }
     int32_t cx, cy, cz;
-    Maps::getSize(x_max,y_max,z_max);
+    Maps::getSize(xmax, ymax, zmax);
 
     Gui::getCursorCoords(cx,cy,cz);
     if(cx == -30000)
@@ -511,7 +527,7 @@ command_result revflood(color_ostream &out, vector<string> & params)
         return CR_FAILURE;
     }
     // hide all tiles, flush cache
-    Maps::getSize(x_max,y_max,z_max);
+    Maps::getSize(xmax, ymax, zmax);
 
     for(size_t i = 0; i < world->map.map_blocks.size(); i++)
     {

From cd34749fec581dff037216adbbef87251662f14c Mon Sep 17 00:00:00 2001
From: Josh Cooper <cooper.s.josh@outlook.com>
Date: Thu, 1 Sep 2022 16:58:12 -0700
Subject: [PATCH 574/854] Re-deletes Plugins.rst

---
 docs/Plugins.rst | 1 -
 1 file changed, 1 deletion(-)
 delete mode 100644 docs/Plugins.rst

diff --git a/docs/Plugins.rst b/docs/Plugins.rst
deleted file mode 100644
index 8b1378917..000000000
--- a/docs/Plugins.rst
+++ /dev/null
@@ -1 +0,0 @@
-

From b3284c9d821c9761eddfd3baccfe3681b2ae853d Mon Sep 17 00:00:00 2001
From: Josh Cooper <cooper.s.josh@outlook.com>
Date: Thu, 1 Sep 2022 17:14:10 -0700
Subject: [PATCH 575/854] Updates spectate.rst

---
 docs/plugins/spectate.rst | 25 ++++++++++++++++++++++++-
 1 file changed, 24 insertions(+), 1 deletion(-)

diff --git a/docs/plugins/spectate.rst b/docs/plugins/spectate.rst
index d9e9d3929..d6ea84581 100644
--- a/docs/plugins/spectate.rst
+++ b/docs/plugins/spectate.rst
@@ -11,7 +11,30 @@ Usage
 
 ::
 
-    enable spectate
+    spectate
+    spectate <option>
+
 
 The plugin will automatically switch which dwarf is being followed periodically,
 preferring dwarves on z-levels with the highest job activity.
+
+Examples
+--------
+
+``spectate``
+    See the status of spectate, what is enabled or disabled.
+
+``spectate enable``
+    Enable spectate plugin to pseudo-randomly follow dwarves around.
+
+``spectate auto-unpause``
+    Enable the spectate plugin to automatically dismiss pause events caused
+    by the game. Siege events are one example of such a game event.
+
+Options
+-------
+
+:no option:     Show plugin status.
+:enable:        Enable plugin.
+:disable:       Disable plugin.
+:auto-unpause:  Toggle auto-dismissal of game pause events.

From bd4d17d2058e5a92a80937caeee7f7f4e12604c7 Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Thu, 1 Sep 2022 22:48:18 -0700
Subject: [PATCH 576/854] update changelog

---
 docs/changelog.txt | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/docs/changelog.txt b/docs/changelog.txt
index d1547d34c..0c30f22f5 100644
--- a/docs/changelog.txt
+++ b/docs/changelog.txt
@@ -44,6 +44,7 @@ changelog.txt uses a syntax similar to RST, with a few special sequences:
 
 ## Fixes
 - ``job.removeJob()``: ensure jobs are removed from the world list when they are canceled
+- `quickfort`: `Dreamfort <quickfort-blueprint-guide>` blueprint set: declare the hospital zone before building the coffer; otherwise DF fails to stock the hospital with materials
 
 ## Misc Improvements
 - Init scripts: ``dfhack.init`` and other init scripts have moved to ``dfhack-config/init/``. If you have customized your ``dfhack.init`` file and want to keep your changes, please move the part that you have customized to the new location at ``dfhack-config/init/dfhack.init``. If you do not have changes that you want to keep, do not copy anything, and the new defaults will be used automatically.
@@ -59,10 +60,10 @@ changelog.txt uses a syntax similar to RST, with a few special sequences:
 - `seedwatch`: ``seedwatch all`` now adds all plants with seeds to the watchlist, not just the "basic" crops.
 - UX: You can now move the cursor around in DFHack text fields in ``gui/`` scripts (e.g. `gui/blueprint`, `gui/quickfort`, or `gui/gm-editor`). You can move the cursor by clicking where you want it to go with the mouse or using the Left/Right arrow keys.  Ctrl+Left/Right will move one word at a time, and Alt+Left/Right will move to the beginning/end of the text.
 - UX: You can now click on the hotkey hint text in many ``gui/`` script windows to activate the hotkey, like a button. Not all scripts have been updated to use the clickable widget yet, but you can try it in `gui/blueprint` or `gui/quickfort`.
-- `quickfort`: `Dreamfort <quickfort-blueprint-guide>` blueprint set improvements: set traffic designations to encourage dwarves to eat in the grand hall instead of the manager's office and to eat cooked food instead of raw ingredients
+- `quickfort`: `Dreamfort <quickfort-blueprint-guide>` blueprint set improvements: set traffic designations to encourage dwarves to eat cooked food instead of raw ingredients
 
 ## Documentation
-- Update all DFHack tool documentation with standard syntax formatting, usage examples, and overall clarified text.
+- Update all DFHack tool documentation (300+ pages) with standard syntax formatting, usage examples, and overall clarified text.
 - Group DFHack tools by `tag <tools>` so similar tools are grouped and easy to find
 
 ## API

From 5441b71957989dbe1fc132305ac8dae3eea70460 Mon Sep 17 00:00:00 2001
From: DFHack-Urist via GitHub Actions
 <63161697+DFHack-Urist@users.noreply.github.com>
Date: Fri, 2 Sep 2022 07:24:33 +0000
Subject: [PATCH 577/854] Auto-update submodules

scripts: master
---
 scripts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts b/scripts
index 7bae77756..da571c36a 160000
--- a/scripts
+++ b/scripts
@@ -1 +1 @@
-Subproject commit 7bae77756f974aad765251096516a89d9d035977
+Subproject commit da571c36ac7e3d4d432a13d1956414f2c20e065e

From 587014b7b937ffc18664829cb64f77a9fae983e3 Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Fri, 2 Sep 2022 11:25:41 -0400
Subject: [PATCH 578/854] Update clsocket

dfhack/clsocket#27
---
 depends/clsocket | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/depends/clsocket b/depends/clsocket
index ae19aebd7..6ed8aa464 160000
--- a/depends/clsocket
+++ b/depends/clsocket
@@ -1 +1 @@
-Subproject commit ae19aebd795d6d91803e60f46de037b604593cb4
+Subproject commit 6ed8aa46462ea01a1122fc49422840a2facc9757

From 22cb7d20c8a0815fd46bd973f4e2b7d60b232e39 Mon Sep 17 00:00:00 2001
From: Josh Cooper <cooper.s.josh@outlook.com>
Date: Fri, 2 Sep 2022 20:32:50 -0700
Subject: [PATCH 579/854] De-duplicates Lock derived state checks

---
 library/modules/World.cpp | 25 +++++++++++++++----------
 1 file changed, 15 insertions(+), 10 deletions(-)

diff --git a/library/modules/World.cpp b/library/modules/World.cpp
index b8e2da272..ae959039c 100644
--- a/library/modules/World.cpp
+++ b/library/modules/World.cpp
@@ -78,30 +78,35 @@ void World::SetPauseState(bool paused)
 std::unordered_set<Lock*> PlayerLock::locks;
 std::unordered_set<Lock*> AnnouncementLock::locks;
 
-bool AnnouncementLock::isAnyLocked() const {
+template<typename Locks>
+inline bool any_lock(Locks locks) {
     return std::any_of(locks.begin(), locks.end(), [](Lock* lock) { return lock->isLocked(); });
 }
 
-bool AnnouncementLock::isOnlyLocked() const {
+template<typename Locks, typename LockT>
+inline bool only_lock(Locks locks, LockT* this_lock) {
     return std::all_of(locks.begin(), locks.end(), [&](Lock* lock) {
-        if (lock == this) {
+        if (lock == this_lock) {
             return lock->isLocked();
         }
         return !lock->isLocked();
     });
 }
 
+bool AnnouncementLock::isAnyLocked() const {
+    return any_lock(locks);
+}
+
+bool AnnouncementLock::isOnlyLocked() const {
+    return only_lock(locks, this);
+}
+
 bool PlayerLock::isAnyLocked() const {
-    return std::any_of(locks.begin(), locks.end(), [](Lock* lock) { return lock->isLocked(); });
+    return any_lock(locks);
 }
 
 bool PlayerLock::isOnlyLocked() const {
-    return std::all_of(locks.begin(), locks.end(), [&](Lock* lock) {
-        if (lock == this) {
-            return lock->isLocked();
-        }
-        return !lock->isLocked();
-    });
+    return only_lock(locks, this);
 }
 
 namespace pausing {

From a4515daed48fb7a6511ecc24e1f97c48fa25803c Mon Sep 17 00:00:00 2001
From: Josh Cooper <cooper.s.josh@outlook.com>
Date: Fri, 2 Sep 2022 20:52:14 -0700
Subject: [PATCH 580/854] Removes useless and redundant code from spectate

---
 plugins/spectate.cpp | 36 +++++++-----------------------------
 1 file changed, 7 insertions(+), 29 deletions(-)

diff --git a/plugins/spectate.cpp b/plugins/spectate.cpp
index b61d2d7fb..d3b40c19b 100644
--- a/plugins/spectate.cpp
+++ b/plugins/spectate.cpp
@@ -71,29 +71,12 @@ DFhackCExport command_result plugin_init (color_ostream &out, std::vector <Plugi
 DFhackCExport command_result plugin_onstatechange(color_ostream &out, state_change_event event) {
     if (enabled && world) {
         switch (event) {
-            case SC_WORLD_LOADED:
-            case SC_MAP_LOADED:
-                if (dismiss_pause_events && World::ReadPauseState()) {
-                    *df::global::debug_nopause = false;
-                }
-                break;
-            case SC_PAUSED:
-                if(dismiss_pause_events){
-                    if (our_dorf) {
-                        df::global::ui->follow_unit = our_dorf->id;
-                        const int16_t &x = our_dorf->pos.x;
-                        const int16_t &y = our_dorf->pos.y;
-                        const int16_t &z = our_dorf->pos.z;
-                        Gui::setViewCoords(x, y, z);
-                    }
-                }
-                break;
-            case SC_UNPAUSED:
-                break;
             case SC_MAP_UNLOADED:
             case SC_BEGIN_UNLOAD:
             case SC_WORLD_UNLOADED:
                 our_dorf = nullptr;
+                job_watched = nullptr;
+                following_dwarf = false;
             default:
                 break;
         }
@@ -158,13 +141,7 @@ DFhackCExport command_result plugin_enable(color_ostream &out, bool enable) {
 command_result spectate (color_ostream &out, std::vector <std::string> & parameters) {
     // todo: parse parameters
     if(!parameters.empty()) {
-        if (parameters[0] == "disable") {
-            return plugin_enable(out, false);
-        } else if (parameters[0] == "enable") {
-            return plugin_enable(out, true);
-        } else if (parameters[0] == "godmode") {
-            out.print("todo?\n"); // todo: adventure as deity?
-        } else if (parameters[0] == "auto-unpause") {
+        if (parameters[0] == "auto-unpause") {
             dismiss_pause_events = !dismiss_pause_events;
 
             // update the announcement settings if we can
@@ -187,14 +164,16 @@ command_result spectate (color_ostream &out, std::vector <std::string> & paramet
             if (!lock_collision){
                 out.print(dismiss_pause_events ? "auto-unpause: on\n" : "auto-unpause: off\n");
             } else {
-                out.print("auto-unpause: must wait for another Pausing::AnnouncementLock to be lifted.\n");
+                out.print("auto-unpause: must wait for another Pausing::AnnouncementLock to be lifted. This setting will complete when the lock lifts.\n");
             }
 
             // probably a typo
             if (parameters.size() == 2) {
-                out.print("If you want additional options open an issue on github, or mention it on discord.\n");
+                out.print("If you want additional options open an issue on github, or mention it on discord.\n\n");
                 return DFHack::CR_WRONG_USAGE;
             }
+        } else {
+            return DFHack::CR_WRONG_USAGE;
         }
     } else {
         out.print(enabled ? "Spectate is enabled.\n" : "Spectate is disabled.\n");
@@ -207,7 +186,6 @@ command_result spectate (color_ostream &out, std::vector <std::string> & paramet
 
 // every tick check whether to decide to follow a dwarf
 void onTick(color_ostream& out, void* ptr) {
-    if (!df::global::ui) return;
     int32_t tick = df::global::world->frame_counter;
     if(our_dorf){
         if(!Units::isAlive(our_dorf)){

From ed73d370fc49eba1d4a95169977928416cc60cd4 Mon Sep 17 00:00:00 2001
From: Josh Cooper <cooper.s.josh@outlook.com>
Date: Fri, 2 Sep 2022 21:12:27 -0700
Subject: [PATCH 581/854] Adds placeholder for feature to disengage the plugin
 on player input

---
 plugins/spectate.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/plugins/spectate.cpp b/plugins/spectate.cpp
index d3b40c19b..d4274abe9 100644
--- a/plugins/spectate.cpp
+++ b/plugins/spectate.cpp
@@ -139,7 +139,6 @@ DFhackCExport command_result plugin_enable(color_ostream &out, bool enable) {
 }
 
 command_result spectate (color_ostream &out, std::vector <std::string> & parameters) {
-    // todo: parse parameters
     if(!parameters.empty()) {
         if (parameters[0] == "auto-unpause") {
             dismiss_pause_events = !dismiss_pause_events;
@@ -172,6 +171,8 @@ command_result spectate (color_ostream &out, std::vector <std::string> & paramet
                 out.print("If you want additional options open an issue on github, or mention it on discord.\n\n");
                 return DFHack::CR_WRONG_USAGE;
             }
+        } else if (parameters[0] == "disengage") {
+            //todo: cannibalize follow
         } else {
             return DFHack::CR_WRONG_USAGE;
         }

From d90d0f86af00d38ec906448ff60d11ae382b8d8e Mon Sep 17 00:00:00 2001
From: Josh Cooper <cooper.s.josh@outlook.com>
Date: Fri, 2 Sep 2022 21:38:48 -0700
Subject: [PATCH 582/854] Removes spectate usage from cpp file

---
 plugins/spectate.cpp | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/plugins/spectate.cpp b/plugins/spectate.cpp
index d4274abe9..e278ec6e3 100644
--- a/plugins/spectate.cpp
+++ b/plugins/spectate.cpp
@@ -55,15 +55,7 @@ DFhackCExport command_result plugin_init (color_ostream &out, std::vector <Plugi
     commands.push_back(PluginCommand("spectate",
                                      "Automated spectator mode.",
                                      spectate,
-                                     false,
-                                     ""
-                                     " spectate\n"
-                                     "    displays plugin status\n"
-                                     " spectate enable\n"
-                                     " spectate disable\n"
-                                     " spectate auto-unpause\n"
-                                     "    toggle auto-dismissal of game pause events. e.g. a siege event pause\n"
-                                     "\n"));
+                                     false));
     pause_lock = World::AcquireAnnouncementPauseLock("spectate");
     return CR_OK;
 }

From b6c97214ca97586728261e8bdcf9b28dd9de6d46 Mon Sep 17 00:00:00 2001
From: Josh Cooper <cooper.s.josh@outlook.com>
Date: Sat, 3 Sep 2022 11:18:46 -0700
Subject: [PATCH 583/854] Adds more features to spectate

---
 docs/plugins/spectate.rst |  36 +++++---
 plugins/spectate.cpp      | 175 ++++++++++++++++++++++++--------------
 2 files changed, 134 insertions(+), 77 deletions(-)

diff --git a/docs/plugins/spectate.rst b/docs/plugins/spectate.rst
index d6ea84581..e49cb81d1 100644
--- a/docs/plugins/spectate.rst
+++ b/docs/plugins/spectate.rst
@@ -2,39 +2,47 @@ spectate
 ========
 
 .. dfhack-tool::
-    :summary: Automatically follow exciting dwarves.
+    :summary: Automatically follow productive dwarves.
     :tags: fort interface
-    :no-command:
 
 Usage
 -----
 
 ::
 
-    spectate
-    spectate <option>
+    enable spectate
+    disable spectate
+    spectate <option> <value>
 
 
-The plugin will automatically switch which dwarf is being followed periodically,
-preferring dwarves on z-levels with the highest job activity.
+When enabled, the plugin will automatically switch which dwarf is being
+followed periodically, preferring dwarves on z-levels with the highest
+job activity.
+
+To set features that toggle between two states, use {0,1} to specify
+which state the feature should be in. Anything else will take any positive
+value.
 
 Examples
 --------
 
 ``spectate``
-    See the status of spectate, what is enabled or disabled.
+    The plugin reports its feature status.
 
-``spectate enable``
-    Enable spectate plugin to pseudo-randomly follow dwarves around.
 
-``spectate auto-unpause``
+``spectate auto-unpause 1``
     Enable the spectate plugin to automatically dismiss pause events caused
     by the game. Siege events are one example of such a game event.
 
+``spectate tick-interval 50``
+    Set the tick interval the followed dwarf can be changed at back to its
+    default value.
+
 Options
 -------
 
-:no option:     Show plugin status.
-:enable:        Enable plugin.
-:disable:       Disable plugin.
-:auto-unpause:  Toggle auto-dismissal of game pause events.
+:no option:      Show plugin status.
+:focus-jobs:     Toggle whether the plugin should always be following a job.
+:auto-unpause:   Toggle auto-dismissal of game pause events.
+:auto-disengage: Toggle auto-disengagement of plugin through player intervention.
+:tick-interval:  Set the plugin's tick interval for changing the followed dwarf.
diff --git a/plugins/spectate.cpp b/plugins/spectate.cpp
index e278ec6e3..cb8ce06b0 100644
--- a/plugins/spectate.cpp
+++ b/plugins/spectate.cpp
@@ -33,21 +33,21 @@ using namespace df::enums;
 
 DFHACK_PLUGIN("spectate");
 DFHACK_PLUGIN_IS_ENABLED(enabled);
-bool dismiss_pause_events = false;
+Pausing::AnnouncementLock* pause_lock = nullptr;
+bool lock_collision = false;
+bool unpause_enabled = false;
+bool disengage_enabled = false;
+bool focus_jobs_enabled = false;
 bool following_dwarf = false;
 df::unit* our_dorf = nullptr;
-void* job_watched = nullptr;
+df::job* job_watched = nullptr;
 int32_t timestamp = -1;
+uint64_t tick_span = 50;
 REQUIRE_GLOBAL(world);
 REQUIRE_GLOBAL(ui);
 REQUIRE_GLOBAL(pause_state);
 REQUIRE_GLOBAL(d_init);
-
-// todo: implement as user configurable variables
-#define tick_span 50
 #define base 0.99
-Pausing::AnnouncementLock* pause_lock = nullptr;
-bool lock_collision = false;
 
 command_result spectate (color_ostream &out, std::vector <std::string> & parameters);
 
@@ -81,33 +81,50 @@ DFhackCExport command_result plugin_shutdown (color_ostream &out) {
     return CR_OK;
 }
 
-DFhackCExport command_result plugin_onupdate(color_ostream &out) {
-    if (lock_collision) {
-        if (dismiss_pause_events) {
-            // player asked for auto-unpause enabled
-            World::SaveAnnouncementSettings();
-            if (World::DisableAnnouncementPausing()){
-                // now that we've got what we want, we can lock it down
-                lock_collision = false;
-                pause_lock->lock();
-            }
+void onTick(color_ostream& out, void* tick);
+void onJobStart(color_ostream &out, void* job);
+void onJobCompletion(color_ostream &out, void* job);
+
+void enable_auto_unpause(color_ostream &out, bool state){
+    if(unpause_enabled != state && lock_collision) {
+        // when enabled, lock collision means announcements haven't been disabled
+        // when disabled, lock collision means announcement are still disabled
+        // the only state left to consider here is what the lock should be set to
+        lock_collision = false;
+        unpause_enabled = state;
+        if (unpause_enabled) {
+            pause_lock->lock();
         } else {
-            if (World::RestoreAnnouncementSettings()) {
-                lock_collision = false;
-            }
+            // this one should be redundant, the lock should already be unlocked right now
+            pause_lock->unlock();
         }
+        out.print(unpause_enabled ? "auto-unpause: on\n" : "auto-unpause: off\n");
+        return;
     }
-    while (dismiss_pause_events && !world->status.popups.empty()) {
-        // dismiss announcement popup(s)
-        Gui::getCurViewscreen(true)->feed_key(interface_key::CLOSE_MEGA_ANNOUNCEMENT);
+    unpause_enabled = state;
+    // update the announcement settings if we can
+    if (unpause_enabled) {
+        if (World::SaveAnnouncementSettings()) {
+            World::DisableAnnouncementPausing();
+            pause_lock->lock();
+        } else {
+            lock_collision = true;
+        }
+    } else {
+        pause_lock->unlock();
+        if (!World::RestoreAnnouncementSettings()) {
+            // this in theory shouldn't happen, if others use the lock like we do in spectate
+            lock_collision = true;
+        }
+    }
+    // report to the user how things went
+    if (!lock_collision){
+        out.print(unpause_enabled ? "auto-unpause: on\n" : "auto-unpause: off\n");
+    } else {
+        out.print("auto-unpause: must wait for another Pausing::AnnouncementLock to be lifted. This setting will complete when the lock lifts.\n");
     }
-    return DFHack::CR_OK;
 }
 
-void onTick(color_ostream& out, void* tick);
-void onJobStart(color_ostream &out, void* job);
-void onJobCompletion(color_ostream &out, void* job);
-
 DFhackCExport command_result plugin_enable(color_ostream &out, bool enable) {
     namespace EM = EventManager;
     if (enable && !enabled) {
@@ -130,48 +147,78 @@ DFhackCExport command_result plugin_enable(color_ostream &out, bool enable) {
     return DFHack::CR_OK;
 }
 
+DFhackCExport command_result plugin_onupdate(color_ostream &out) {
+    if (lock_collision) {
+        if (unpause_enabled) {
+            // player asked for auto-unpause enabled
+            World::SaveAnnouncementSettings();
+            if (World::DisableAnnouncementPausing()){
+                // now that we've got what we want, we can lock it down
+                lock_collision = false;
+                pause_lock->lock();
+            }
+        } else {
+            if (World::RestoreAnnouncementSettings()) {
+                lock_collision = false;
+            }
+        }
+    }
+    while (unpause_enabled && !world->status.popups.empty()) {
+        // dismiss announcement popup(s)
+        Gui::getCurViewscreen(true)->feed_key(interface_key::CLOSE_MEGA_ANNOUNCEMENT);
+    }
+    if (disengage_enabled) {
+        if (our_dorf && our_dorf->id != df::global::ui->follow_unit){
+            plugin_enable(out, false);
+        }
+    }
+    return DFHack::CR_OK;
+}
+
 command_result spectate (color_ostream &out, std::vector <std::string> & parameters) {
     if(!parameters.empty()) {
-        if (parameters[0] == "auto-unpause") {
-            dismiss_pause_events = !dismiss_pause_events;
-
-            // update the announcement settings if we can
-            if (dismiss_pause_events) {
-                if (World::SaveAnnouncementSettings()) {
-                    World::DisableAnnouncementPausing();
-                    pause_lock->lock();
+        if (parameters.size() % 2 != 0) {
+            return DFHack::CR_WRONG_USAGE;
+        }
+        for (int i = 0; i+1 < parameters.size(); i += 2) {
+            if (parameters[i] == "auto-unpause") {
+                if (parameters[i+1] == "0") {
+                    enable_auto_unpause(out, false);
+                } else if (parameters[i+1] == "1") {
+                    enable_auto_unpause(out, true);
                 } else {
-                    lock_collision = true;
+                    return DFHack::CR_WRONG_USAGE;
                 }
-            } else {
-                pause_lock->unlock();
-                if (!World::RestoreAnnouncementSettings()) {
-                    // this in theory shouldn't happen, if others use the lock like we do in spectate
-                    lock_collision = true;
+            } else if (parameters[i] == "auto-disengage") {
+                if (parameters[i+1] == "0") {
+                    disengage_enabled = false;
+                } else if (parameters[i+1] == "1") {
+                    disengage_enabled = true;
+                } else {
+                    return DFHack::CR_WRONG_USAGE;
+                }
+            } else if (parameters[i] == "focus-jobs") {
+                if (parameters[i+1] == "0") {
+                    focus_jobs_enabled = false;
+                } else if (parameters[i+1] == "1") {
+                    focus_jobs_enabled = true;
+                } else {
+                    return DFHack::CR_WRONG_USAGE;
+                }
+            } else if (parameters[i] == "tick-interval") {
+                try {
+                    tick_span = std::stol(parameters[i + 1]);
+                } catch (const std::exception &e) {
+                    out.printerr("%s\n", e.what());
                 }
-            }
-
-            // report to the user how things went
-            if (!lock_collision){
-                out.print(dismiss_pause_events ? "auto-unpause: on\n" : "auto-unpause: off\n");
             } else {
-                out.print("auto-unpause: must wait for another Pausing::AnnouncementLock to be lifted. This setting will complete when the lock lifts.\n");
-            }
-
-            // probably a typo
-            if (parameters.size() == 2) {
-                out.print("If you want additional options open an issue on github, or mention it on discord.\n\n");
                 return DFHack::CR_WRONG_USAGE;
             }
-        } else if (parameters[0] == "disengage") {
-            //todo: cannibalize follow
-        } else {
-            return DFHack::CR_WRONG_USAGE;
         }
     } else {
         out.print(enabled ? "Spectate is enabled.\n" : "Spectate is disabled.\n");
         if(enabled) {
-            out.print(dismiss_pause_events ? "auto-unpause: on.\n" : "auto-unpause: off.\n");
+            out.print(unpause_enabled ? "auto-unpause: on.\n" : "auto-unpause: off.\n");
         }
     }
     return DFHack::CR_OK;
@@ -186,7 +233,7 @@ void onTick(color_ostream& out, void* ptr) {
             df::global::ui->follow_unit = -1;
         }
     }
-    if (!following_dwarf || (tick - timestamp) > tick_span || job_watched == nullptr) {
+    if (!following_dwarf || (focus_jobs_enabled && !job_watched) || (tick - timestamp) > tick_span) {
         std::vector<df::unit*> dwarves;
         for (auto unit: df::global::world->units.active) {
             if (!Units::isCitizen(unit)) {
@@ -196,6 +243,7 @@ void onTick(color_ostream& out, void* ptr) {
         }
         std::uniform_int_distribution<uint64_t> follow_any(0, dwarves.size() - 1);
         if (df::global::ui) {
+            // if you're looking at a warning about a local address escaping, it means the unit* from dwarves (which aren't local)
             our_dorf = dwarves[follow_any(RNG)];
             df::global::ui->follow_unit = our_dorf->id;
             job_watched = our_dorf->job.current_job;
@@ -216,14 +264,14 @@ void onJobStart(color_ostream& out, void* job_ptr) {
     int zcount = ++freq[job->pos.z];
     job_tracker.emplace(job->id);
     // if we're not doing anything~ then let's pick something
-    if (job_watched == nullptr || (tick - timestamp) > tick_span) {
+    if ((focus_jobs_enabled && !job_watched) || (tick - timestamp) > tick_span) {
         following_dwarf = true;
         // todo: allow the user to configure b, and also revise the math
         const double b = base;
         double p = b * ((double) zcount / job_tracker.size());
         std::bernoulli_distribution follow_job(p);
         if (!job->flags.bits.special && follow_job(RNG)) {
-            job_watched = job_ptr;
+            job_watched = job;
             df::unit* unit = Job::getWorker(job);
             if (df::global::ui && unit) {
                 our_dorf = unit;
@@ -252,9 +300,10 @@ void onJobCompletion(color_ostream &out, void* job_ptr) {
     // forget about it
     freq[job->pos.z]--;
     freq[job->pos.z] = freq[job->pos.z] < 0 ? 0 : freq[job->pos.z];
-    job_tracker.erase(job->id);
     // the job doesn't exist, so we definitely need to get rid of that
-    if (job_watched == job_ptr) {
+    job_tracker.erase(job->id);
+    // the event manager clones jobs and returns those clones for completed jobs. So the pointers won't match without a refactor of EM passing clones to both events
+    if (job_watched->id == job->id) {
         job_watched = nullptr;
     }
 }

From a06c1b1d074035693d1ba7ecff7a24e1b66cd5ab Mon Sep 17 00:00:00 2001
From: Josh Cooper <cooper.s.josh@outlook.com>
Date: Sat, 3 Sep 2022 11:34:21 -0700
Subject: [PATCH 584/854] Adds minor improvement to spectate documentation

---
 docs/plugins/spectate.rst | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/plugins/spectate.rst b/docs/plugins/spectate.rst
index e49cb81d1..285d8d863 100644
--- a/docs/plugins/spectate.rst
+++ b/docs/plugins/spectate.rst
@@ -46,3 +46,4 @@ Options
 :auto-unpause:   Toggle auto-dismissal of game pause events.
 :auto-disengage: Toggle auto-disengagement of plugin through player intervention.
 :tick-interval:  Set the plugin's tick interval for changing the followed dwarf.
+                 Acts as a maximum wait time when used with focus-jobs.

From 1edcaf4ca811c4298a7dbb1bf0900aabacafdba8 Mon Sep 17 00:00:00 2001
From: Josh Cooper <cooper.s.josh@outlook.com>
Date: Sat, 3 Sep 2022 11:41:29 -0700
Subject: [PATCH 585/854] Fixes type warning build errors

---
 plugins/spectate.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/plugins/spectate.cpp b/plugins/spectate.cpp
index cb8ce06b0..341af3196 100644
--- a/plugins/spectate.cpp
+++ b/plugins/spectate.cpp
@@ -180,7 +180,7 @@ command_result spectate (color_ostream &out, std::vector <std::string> & paramet
         if (parameters.size() % 2 != 0) {
             return DFHack::CR_WRONG_USAGE;
         }
-        for (int i = 0; i+1 < parameters.size(); i += 2) {
+        for (size_t i = 0; i+1 < parameters.size(); i += 2) {
             if (parameters[i] == "auto-unpause") {
                 if (parameters[i+1] == "0") {
                     enable_auto_unpause(out, false);
@@ -233,7 +233,7 @@ void onTick(color_ostream& out, void* ptr) {
             df::global::ui->follow_unit = -1;
         }
     }
-    if (!following_dwarf || (focus_jobs_enabled && !job_watched) || (tick - timestamp) > tick_span) {
+    if (!following_dwarf || (focus_jobs_enabled && !job_watched) || (tick - timestamp) > (int32_t)tick_span) {
         std::vector<df::unit*> dwarves;
         for (auto unit: df::global::world->units.active) {
             if (!Units::isCitizen(unit)) {
@@ -264,7 +264,7 @@ void onJobStart(color_ostream& out, void* job_ptr) {
     int zcount = ++freq[job->pos.z];
     job_tracker.emplace(job->id);
     // if we're not doing anything~ then let's pick something
-    if ((focus_jobs_enabled && !job_watched) || (tick - timestamp) > tick_span) {
+    if ((focus_jobs_enabled && !job_watched) || (tick - timestamp) > (int32_t)tick_span) {
         following_dwarf = true;
         // todo: allow the user to configure b, and also revise the math
         const double b = base;

From a260e6992e55046905cffc2d7c1c5506afc3f11a Mon Sep 17 00:00:00 2001
From: Josh Cooper <cooper.s.josh@outlook.com>
Date: Sat, 3 Sep 2022 17:02:57 -0700
Subject: [PATCH 586/854] Reorders spectate code blocks, and adds persisting
 configuration

---
 docs/plugins/spectate.rst |   4 +-
 plugins/spectate.cpp      | 197 +++++++++++++++++++++++---------------
 2 files changed, 121 insertions(+), 80 deletions(-)

diff --git a/docs/plugins/spectate.rst b/docs/plugins/spectate.rst
index 285d8d863..31255b0d2 100644
--- a/docs/plugins/spectate.rst
+++ b/docs/plugins/spectate.rst
@@ -42,8 +42,8 @@ Options
 -------
 
 :no option:      Show plugin status.
+:tick-threshold: Set the plugin's tick interval for changing the followed dwarf.
+                 Acts as a maximum wait time when used with focus-jobs.
 :focus-jobs:     Toggle whether the plugin should always be following a job.
 :auto-unpause:   Toggle auto-dismissal of game pause events.
 :auto-disengage: Toggle auto-disengagement of plugin through player intervention.
-:tick-interval:  Set the plugin's tick interval for changing the followed dwarf.
-                 Acts as a maximum wait time when used with focus-jobs.
diff --git a/plugins/spectate.cpp b/plugins/spectate.cpp
index 341af3196..14dd2e833 100644
--- a/plugins/spectate.cpp
+++ b/plugins/spectate.cpp
@@ -22,33 +22,56 @@
 #include <set>
 #include <random>
 
-std::map<uint16_t,uint16_t> freq;
-std::set<int32_t> job_tracker;
-std::default_random_engine RNG;
-
-//#include "df/world.h"
+DFHACK_PLUGIN("spectate");
+DFHACK_PLUGIN_IS_ENABLED(enabled);
+REQUIRE_GLOBAL(world);
+REQUIRE_GLOBAL(ui);
+REQUIRE_GLOBAL(pause_state);
+REQUIRE_GLOBAL(d_init);
 
 using namespace DFHack;
 using namespace df::enums;
 
-DFHACK_PLUGIN("spectate");
-DFHACK_PLUGIN_IS_ENABLED(enabled);
+void onTick(color_ostream& out, void* tick);
+void onJobStart(color_ostream &out, void* job);
+void onJobCompletion(color_ostream &out, void* job);
+
+uint64_t tick_threshold = 50;
+bool focus_jobs_enabled = false;
+bool disengage_enabled = false;
+bool unpause_enabled = false;
 Pausing::AnnouncementLock* pause_lock = nullptr;
 bool lock_collision = false;
-bool unpause_enabled = false;
-bool disengage_enabled = false;
-bool focus_jobs_enabled = false;
+
 bool following_dwarf = false;
 df::unit* our_dorf = nullptr;
 df::job* job_watched = nullptr;
 int32_t timestamp = -1;
-uint64_t tick_span = 50;
-REQUIRE_GLOBAL(world);
-REQUIRE_GLOBAL(ui);
-REQUIRE_GLOBAL(pause_state);
-REQUIRE_GLOBAL(d_init);
+
+std::set<int32_t> job_tracker;
+std::map<uint16_t,uint16_t> freq;
+std::default_random_engine RNG;
+
 #define base 0.99
 
+static const std::string CONFIG_KEY = std::string(plugin_name) + "/config";
+enum ConfigData {
+    UNPAUSE,
+    DISENGAGE,
+    JOB_FOCUS,
+    TICK_THRESHOLD
+};
+
+static PersistentDataItem config;
+inline void saveConfig() {
+    if (config.isValid()) {
+        config.ival(UNPAUSE) = unpause_enabled;
+        config.ival(DISENGAGE) = disengage_enabled;
+        config.ival(JOB_FOCUS) = focus_jobs_enabled;
+        config.ival(TICK_THRESHOLD) = tick_threshold;
+    }
+}
+
 command_result spectate (color_ostream &out, std::vector <std::string> & parameters);
 
 DFhackCExport command_result plugin_init (color_ostream &out, std::vector <PluginCommand> &commands) {
@@ -60,69 +83,24 @@ DFhackCExport command_result plugin_init (color_ostream &out, std::vector <Plugi
     return CR_OK;
 }
 
-DFhackCExport command_result plugin_onstatechange(color_ostream &out, state_change_event event) {
-    if (enabled && world) {
-        switch (event) {
-            case SC_MAP_UNLOADED:
-            case SC_BEGIN_UNLOAD:
-            case SC_WORLD_UNLOADED:
-                our_dorf = nullptr;
-                job_watched = nullptr;
-                following_dwarf = false;
-            default:
-                break;
-        }
-    }
-    return CR_OK;
-}
-
 DFhackCExport command_result plugin_shutdown (color_ostream &out) {
     World::ReleasePauseLock(pause_lock);
     return CR_OK;
 }
 
-void onTick(color_ostream& out, void* tick);
-void onJobStart(color_ostream &out, void* job);
-void onJobCompletion(color_ostream &out, void* job);
+DFhackCExport command_result plugin_load_data (color_ostream &out) {
+    config = World::GetPersistentData(CONFIG_KEY);
 
-void enable_auto_unpause(color_ostream &out, bool state){
-    if(unpause_enabled != state && lock_collision) {
-        // when enabled, lock collision means announcements haven't been disabled
-        // when disabled, lock collision means announcement are still disabled
-        // the only state left to consider here is what the lock should be set to
-        lock_collision = false;
-        unpause_enabled = state;
-        if (unpause_enabled) {
-            pause_lock->lock();
-        } else {
-            // this one should be redundant, the lock should already be unlocked right now
-            pause_lock->unlock();
-        }
-        out.print(unpause_enabled ? "auto-unpause: on\n" : "auto-unpause: off\n");
-        return;
-    }
-    unpause_enabled = state;
-    // update the announcement settings if we can
-    if (unpause_enabled) {
-        if (World::SaveAnnouncementSettings()) {
-            World::DisableAnnouncementPausing();
-            pause_lock->lock();
-        } else {
-            lock_collision = true;
-        }
+    if (!config.isValid()) {
+        config = World::AddPersistentData(CONFIG_KEY);
+        saveConfig();
     } else {
-        pause_lock->unlock();
-        if (!World::RestoreAnnouncementSettings()) {
-            // this in theory shouldn't happen, if others use the lock like we do in spectate
-            lock_collision = true;
-        }
-    }
-    // report to the user how things went
-    if (!lock_collision){
-        out.print(unpause_enabled ? "auto-unpause: on\n" : "auto-unpause: off\n");
-    } else {
-        out.print("auto-unpause: must wait for another Pausing::AnnouncementLock to be lifted. This setting will complete when the lock lifts.\n");
+        unpause_enabled = config.ival(UNPAUSE);
+        disengage_enabled = config.ival(DISENGAGE);
+        focus_jobs_enabled = config.ival(JOB_FOCUS);
+        tick_threshold = config.ival(TICK_THRESHOLD);
     }
+    return DFHack::CR_OK;
 }
 
 DFhackCExport command_result plugin_enable(color_ostream &out, bool enable) {
@@ -147,6 +125,22 @@ DFhackCExport command_result plugin_enable(color_ostream &out, bool enable) {
     return DFHack::CR_OK;
 }
 
+DFhackCExport command_result plugin_onstatechange(color_ostream &out, state_change_event event) {
+    if (enabled && world) {
+        switch (event) {
+            case SC_MAP_UNLOADED:
+            case SC_BEGIN_UNLOAD:
+            case SC_WORLD_UNLOADED:
+                our_dorf = nullptr;
+                job_watched = nullptr;
+                following_dwarf = false;
+            default:
+                break;
+        }
+    }
+    return CR_OK;
+}
+
 DFhackCExport command_result plugin_onupdate(color_ostream &out) {
     if (lock_collision) {
         if (unpause_enabled) {
@@ -168,13 +162,53 @@ DFhackCExport command_result plugin_onupdate(color_ostream &out) {
         Gui::getCurViewscreen(true)->feed_key(interface_key::CLOSE_MEGA_ANNOUNCEMENT);
     }
     if (disengage_enabled) {
+        fprintf(stderr,"A: pre-segfault-potential\n");
+        fflush(stderr);
         if (our_dorf && our_dorf->id != df::global::ui->follow_unit){
             plugin_enable(out, false);
         }
+        fprintf(stderr,"A: post-segfault-potential\n");
+        fflush(stderr);
     }
     return DFHack::CR_OK;
 }
 
+void enable_auto_unpause(color_ostream &out, bool state){
+    if(unpause_enabled != state && lock_collision) {
+        // when enabled, lock collision means announcements haven't been disabled
+        // when disabled, lock collision means announcement are still disabled
+        // the only state left to consider here is what the lock should be set to
+        lock_collision = false;
+        unpause_enabled = state;
+        if (unpause_enabled) {
+            pause_lock->lock();
+        } else {
+            // this one should be redundant, the lock should already be unlocked right now
+            pause_lock->unlock();
+        }
+        return;
+    }
+    unpause_enabled = state;
+    // update the announcement settings if we can
+    if (unpause_enabled) {
+        if (World::SaveAnnouncementSettings()) {
+            World::DisableAnnouncementPausing();
+            pause_lock->lock();
+        } else {
+            lock_collision = true;
+        }
+    } else {
+        pause_lock->unlock();
+        if (!World::RestoreAnnouncementSettings()) {
+            // this in theory shouldn't happen, if others use the lock like we do in spectate
+            lock_collision = true;
+        }
+    }
+    if (lock_collision){
+        out.printerr("auto-unpause: must wait for another Pausing::AnnouncementLock to be lifted. This setting will complete when the lock lifts.\n");
+    }
+}
+
 command_result spectate (color_ostream &out, std::vector <std::string> & parameters) {
     if(!parameters.empty()) {
         if (parameters.size() % 2 != 0) {
@@ -205,9 +239,9 @@ command_result spectate (color_ostream &out, std::vector <std::string> & paramet
                 } else {
                     return DFHack::CR_WRONG_USAGE;
                 }
-            } else if (parameters[i] == "tick-interval") {
+            } else if (parameters[i] == "tick-threshold") {
                 try {
-                    tick_span = std::stol(parameters[i + 1]);
+                    tick_threshold = std::stol(parameters[i + 1]);
                 } catch (const std::exception &e) {
                     out.printerr("%s\n", e.what());
                 }
@@ -216,16 +250,19 @@ command_result spectate (color_ostream &out, std::vector <std::string> & paramet
             }
         }
     } else {
-        out.print(enabled ? "Spectate is enabled.\n" : "Spectate is disabled.\n");
-        if(enabled) {
-            out.print(unpause_enabled ? "auto-unpause: on.\n" : "auto-unpause: off.\n");
-        }
+        out.print("Spectate is %s\n", enabled ? "ENABLED." : "DISABLED.");
+        out.print("tick-threshold: %zu\n", tick_threshold);
+        out.print("focus-jobs: %s\n", focus_jobs_enabled ? "on." : "off.");
+        out.print("auto-unpause: %s\n", unpause_enabled ? "on." : "off.");
+        out.print("auto-disengage: %s\n", disengage_enabled ? "on." : "off.");
     }
+    saveConfig();
     return DFHack::CR_OK;
 }
 
 // every tick check whether to decide to follow a dwarf
 void onTick(color_ostream& out, void* ptr) {
+    if (!df::global::ui) return;
     int32_t tick = df::global::world->frame_counter;
     if(our_dorf){
         if(!Units::isAlive(our_dorf)){
@@ -233,7 +270,9 @@ void onTick(color_ostream& out, void* ptr) {
             df::global::ui->follow_unit = -1;
         }
     }
-    if (!following_dwarf || (focus_jobs_enabled && !job_watched) || (tick - timestamp) > (int32_t)tick_span) {
+    fprintf(stderr,"B: pre-segfault-potential\n");
+    fflush(stderr);
+    if (!following_dwarf || (focus_jobs_enabled && !job_watched) || (tick - timestamp) > (int32_t)tick_threshold) {
         std::vector<df::unit*> dwarves;
         for (auto unit: df::global::world->units.active) {
             if (!Units::isCitizen(unit)) {
@@ -253,6 +292,8 @@ void onTick(color_ostream& out, void* ptr) {
             }
         }
     }
+    fprintf(stderr,"B: post-segfault-potential\n");
+    fflush(stderr);
 }
 
 // every new worked job needs to be considered
@@ -264,7 +305,7 @@ void onJobStart(color_ostream& out, void* job_ptr) {
     int zcount = ++freq[job->pos.z];
     job_tracker.emplace(job->id);
     // if we're not doing anything~ then let's pick something
-    if ((focus_jobs_enabled && !job_watched) || (tick - timestamp) > (int32_t)tick_span) {
+    if ((focus_jobs_enabled && !job_watched) || (tick - timestamp) > (int32_t)tick_threshold) {
         following_dwarf = true;
         // todo: allow the user to configure b, and also revise the math
         const double b = base;

From 1d5ae827df23c0722228abc2da28968f7edaba3c Mon Sep 17 00:00:00 2001
From: Josh Cooper <cooper.s.josh@outlook.com>
Date: Sat, 3 Sep 2022 17:58:40 -0700
Subject: [PATCH 587/854] Fixes segmentation fault

---
 plugins/spectate.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/spectate.cpp b/plugins/spectate.cpp
index 14dd2e833..86ba199f8 100644
--- a/plugins/spectate.cpp
+++ b/plugins/spectate.cpp
@@ -344,7 +344,7 @@ void onJobCompletion(color_ostream &out, void* job_ptr) {
     // the job doesn't exist, so we definitely need to get rid of that
     job_tracker.erase(job->id);
     // the event manager clones jobs and returns those clones for completed jobs. So the pointers won't match without a refactor of EM passing clones to both events
-    if (job_watched->id == job->id) {
+    if (job_watched && job_watched->id == job->id) {
         job_watched = nullptr;
     }
 }

From e24963a44175afe2676004600cfdfe5c8d0be981 Mon Sep 17 00:00:00 2001
From: Josh Cooper <cooper.s.josh@outlook.com>
Date: Sat, 3 Sep 2022 18:28:30 -0700
Subject: [PATCH 588/854] Updates changelog.txt with new Pause API under World
 module

---
 docs/changelog.txt | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/docs/changelog.txt b/docs/changelog.txt
index 1620f136c..af034e5d3 100644
--- a/docs/changelog.txt
+++ b/docs/changelog.txt
@@ -73,6 +73,14 @@ changelog.txt uses a syntax similar to RST, with a few special sequences:
 - Removed ``Windows`` module (C++-only) - unused.
 - ``Constructions`` module (C++-only): removed ``t_construction``, ``isValid()``, ``getCount()``, ``getConstruction()``, and ``copyConstruction()``. Access ``world.constructions`` directly instead.
 - ``Gui::getSelectedItem()``, ``Gui::getAnyItem()``: added support for the artifacts screen
+- Added functions for manipulating pause abilities, to the World module.
+  - Added ``World::AcquireAnnouncementPauseLock()`` acquires a lock object to lock Announcement pause API calls
+  - Added ``World::AcquirePlayerPauseLock()`` acquires a lock object to lock Player pause API calls
+  - Added ``World::ReleasePauseLock()`` to release acquired locks on plugin shutdown
+  - Added ``World::DisableAnnouncementPausing()`` sets all announcement pause settings to off
+  - Added ``World::SaveAnnouncementSettings()`` and ``World::RestoreAnnouncementSettings()`` saves/restores the announcement pause settings
+  - Added ``World::DisablePlayerPausing()`` and ``World::EnablePlayerPausing()`` disables/enables the player's ability to pause the game
+
 
 ## Lua
 - History: added ``dfhack.getCommandHistory(history_id, history_filename)`` and ``dfhack.addCommandToHistory(history_id, history_filename, command)`` so gui scripts can access a commandline history without requiring a terminal.

From 37c4de1ad69d8d46908fb8878efc69dc47e51ccc Mon Sep 17 00:00:00 2001
From: Josh Cooper <cooper.s.josh@outlook.com>
Date: Sat, 3 Sep 2022 18:35:04 -0700
Subject: [PATCH 589/854] Removes stderr prints from spectate

---
 plugins/spectate.cpp | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/plugins/spectate.cpp b/plugins/spectate.cpp
index 86ba199f8..3bd1fc517 100644
--- a/plugins/spectate.cpp
+++ b/plugins/spectate.cpp
@@ -162,13 +162,9 @@ DFhackCExport command_result plugin_onupdate(color_ostream &out) {
         Gui::getCurViewscreen(true)->feed_key(interface_key::CLOSE_MEGA_ANNOUNCEMENT);
     }
     if (disengage_enabled) {
-        fprintf(stderr,"A: pre-segfault-potential\n");
-        fflush(stderr);
         if (our_dorf && our_dorf->id != df::global::ui->follow_unit){
             plugin_enable(out, false);
         }
-        fprintf(stderr,"A: post-segfault-potential\n");
-        fflush(stderr);
     }
     return DFHack::CR_OK;
 }
@@ -270,8 +266,6 @@ void onTick(color_ostream& out, void* ptr) {
             df::global::ui->follow_unit = -1;
         }
     }
-    fprintf(stderr,"B: pre-segfault-potential\n");
-    fflush(stderr);
     if (!following_dwarf || (focus_jobs_enabled && !job_watched) || (tick - timestamp) > (int32_t)tick_threshold) {
         std::vector<df::unit*> dwarves;
         for (auto unit: df::global::world->units.active) {
@@ -292,8 +286,6 @@ void onTick(color_ostream& out, void* ptr) {
             }
         }
     }
-    fprintf(stderr,"B: post-segfault-potential\n");
-    fflush(stderr);
 }
 
 // every new worked job needs to be considered

From ef1e85e6ff7131c3eb19c5dbe603efccdcb1bdd8 Mon Sep 17 00:00:00 2001
From: Myk <myk002@yahoo.com>
Date: Sat, 3 Sep 2022 20:00:38 -0700
Subject: [PATCH 590/854] Make doc docs match the docs

---
 docs/Documentation.rst | 23 +++++++++++++++--------
 1 file changed, 15 insertions(+), 8 deletions(-)

diff --git a/docs/Documentation.rst b/docs/Documentation.rst
index fccf59867..8e4ed229b 100644
--- a/docs/Documentation.rst
+++ b/docs/Documentation.rst
@@ -16,10 +16,10 @@ Python tool named `Sphinx <https://www.sphinx-doc.org>`_.
 
 The DFHack build process will compile and install the documentation so it can be
 displayed in-game by the `help` and `ls` commands (and any other command or GUI that
-displays help text), but this is disabled by default due to the additional Python and
-Sphinx requirements. If you already have a version of the docs installed (say from a
-downloaded release binary), then you only need to build the docs if you're changing them
-and want to see the changes reflected in your game.
+displays help text), but documentation compilation is disabled by default due to the
+additional Python and Sphinx requirements. If you already have a version of the docs
+installed (say from a downloaded release binary), then you only need to build the docs
+if you're changing them and want to see the changes reflected in your game.
 
 You can also build the docs if you just want a local HTML- or text-rendered copy, though
 you can always read the `online version <https://dfhack.readthedocs.org>`_ too.
@@ -39,7 +39,7 @@ The source ``.rst`` files are compiled to HTML for viewing in a browser and to t
 format for viewing in-game. For in-game help, the help text is read from its installed
 location in ``hack/docs`` under the DF directory.
 
-When writing documentation, remember that everything should be documented!  If it's not
+When writing documentation, remember that everything should be documented! If it's not
 clear *where* a particular thing should be documented, ask on Discord or in the DFHack
 thread on Bay12 -- you'll not only be getting help, you'll also be providing valuable
 feedback that makes it easier for future contributers to find documentation on how to
@@ -183,11 +183,14 @@ And documentation for the ``autodump`` plugin might look like::
 Usage help
 ----------
 
-The first section after the header and introductory text should be the usage block. You can
+The first section after the header and introductory text should be the usage section. You can
 choose between two formats, based on whatever is cleaner or clearer for your syntax. The first
 option is to show usage formats together, with an explanation following the block::
 
-    Usage::
+    Usage
+    -----
+    
+    ::
 
         build-now [<options>]
         build-now here [<options>]
@@ -206,7 +209,8 @@ option is to show usage formats together, with an explanation following the bloc
 The second option is to arrange the usage options in a list, with the full command
 and arguments in monospaced font. Then indent the next line and describe the effect::
 
-    Usage:
+    Usage
+    -----
 
     ``build-now [<options>]``
         Scan the entire map and build all unsuspended constructions
@@ -224,6 +228,9 @@ Note that in both options, the entire commandline syntax is written, including t
 Literal text is written as-is (e.g. the word ``here`` in the above example), and text that
 describes the kind of parameter that is being passed (e.g. ``pos`` or ``options``) is enclosed in
 angle brackets (``<`` and ``>``). Optional elements are enclosed in square brackets (``[`` and ``]``).
+If the command takes an arbitrary number of elements, use ``...``, for example::
+
+    prioritize [<options>] <job type> [<job type> ...]
 
 Examples
 --------

From 446c321c62e907a9f219cb93a95d19682fecb087 Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Sun, 4 Sep 2022 12:27:50 -0700
Subject: [PATCH 591/854] fix spacing error

and floorplan error
---
 data/blueprints/library/dreamfort.csv | 8 ++++----
 docs/Documentation.rst                | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/data/blueprints/library/dreamfort.csv b/data/blueprints/library/dreamfort.csv
index 72e2161fe..e26650943 100644
--- a/data/blueprints/library/dreamfort.csv
+++ b/data/blueprints/library/dreamfort.csv
@@ -865,8 +865,8 @@ Feel free to assign an unimportant animal to the pasture in the main entranceway
 ,,,`,,`,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,`,~,,,,,,~,`,,,,,,,Cf,Cf,`,,`
 ,,,`,,`,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,~,~,Cf,Cf,Cf,Cf,Cf,~,~,,,,,,,,Cf,`,,`
 ,,,`,,`,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,~,~,,~,~,~,,~,~,,,,,Cf,Cf,,Cf,`,,`
-,,,`,,`,,Cf,,Cf,Cf,Cf,Cf,Cf,,Cf,,~,~,~,,Cf,,,,,,,,,Cf,`,,`
-,,,`,,`,,Cf,,Cf,Cf,Cf,Cf,Cf,`,,,~,~,~,,,`,,,,,,,Cf,Cf,`,,`
+,,,`,,`,,Cf,,Cf,Cf,Cf,Cf,Cf,,Cf,,~,~,~,,Cf,,,Cf,,,,,,Cf,`,,`
+,,,`,,`,,Cf,,Cf,Cf,Cf,Cf,Cf,`,,,~,~,~,,,`,,Cf,,,,,Cf,Cf,`,,`
 ,,,`,,`,`,`,`,`,`,`,`,`,`,,,,,,,,`,`,`,`,`,`,`,`,`,`,,`
 ,,,`,Cf,,,,,,,,,Cf,,,,,~,,,,,Cf,,,,,,,,,Cf,`
 ,,,`,`,`,`,`,`,`,`,`,`,`,`,,,,,,,,`,`,`,`,`,`,`,`,`,`,`,`
@@ -1143,8 +1143,8 @@ t1(37x33)
 ,,,`,,`,~,~,~,~,~,~,~,~,`,~,~,~,~,~,~,~,`,Cf,Cf,Cf,Cf,Cf,Cf,~,~,`,,`
 ,,,`,,`,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,~,Cf,Cf,Cf,Cf,Cf,Cf,Cf,~,`,,`
 ,,,`,,`,~,~,~,~,~,~,~,~,~,~,Cf,~,~,~,Cf,~,~,Cf,Cf,Cf,Cf,~,~,Cf,~,`,,`
-,,,`,,`,Cf,~,Cf,~,~,~,~,~,~,~,Cf,~,~,~,Cf,~,~,Cf,Cf,Cf,Cf,Cf,Cf,Cf,~,`,,`
-,,,`,,`,Cf,~,Cf,~,~,~,~,~,`,Cf,Cf,~,~,~,Cf,Cf,`,Cf,Cf,Cf,Cf,Cf,Cf,~,~,`,,`
+,,,`,,`,Cf,~,Cf,~,~,~,~,~,~,~,Cf,~,~,~,Cf,~,~,Cf,~,Cf,Cf,Cf,Cf,Cf,~,`,,`
+,,,`,,`,Cf,~,Cf,~,~,~,~,~,`,Cf,Cf,~,~,~,Cf,Cf,`,Cf,~,Cf,Cf,Cf,Cf,~,~,`,,`
 ,,,`,,`,`,`,`,`,`,`,`,`,`,Cf,Cf,Cf,Cf,Cf,Cf,Cf,`,`,`,`,`,`,`,`,`,`,,`
 ,,,`,~,,,,,,,,,,,Cf,Cf,Cf,~,Cf,Cf,Cf,,,,,,,,,,,~,`
 ,,,`,`,`,`,`,`,`,`,`,`,`,`,,,,,,,,`,`,`,`,`,`,`,`,`,`,`,`
diff --git a/docs/Documentation.rst b/docs/Documentation.rst
index 8e4ed229b..1d30e72ff 100644
--- a/docs/Documentation.rst
+++ b/docs/Documentation.rst
@@ -189,7 +189,7 @@ option is to show usage formats together, with an explanation following the bloc
 
     Usage
     -----
-    
+
     ::
 
         build-now [<options>]

From d28e4e31d8bf1769acf60765d86e095ecf509a25 Mon Sep 17 00:00:00 2001
From: Josh Cooper <cooper.s.josh@outlook.com>
Date: Sun, 4 Sep 2022 16:12:09 -0700
Subject: [PATCH 592/854] Fixes print line format specifier

---
 plugins/spectate.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/spectate.cpp b/plugins/spectate.cpp
index 3bd1fc517..15a881dc1 100644
--- a/plugins/spectate.cpp
+++ b/plugins/spectate.cpp
@@ -247,7 +247,7 @@ command_result spectate (color_ostream &out, std::vector <std::string> & paramet
         }
     } else {
         out.print("Spectate is %s\n", enabled ? "ENABLED." : "DISABLED.");
-        out.print("tick-threshold: %zu\n", tick_threshold);
+        out.print("tick-threshold: %lu\n", tick_threshold);
         out.print("focus-jobs: %s\n", focus_jobs_enabled ? "on." : "off.");
         out.print("auto-unpause: %s\n", unpause_enabled ? "on." : "off.");
         out.print("auto-disengage: %s\n", disengage_enabled ? "on." : "off.");

From 15c3e2eae874ae0f317a01c62cc669ecb545e735 Mon Sep 17 00:00:00 2001
From: Josh Cooper <cooper.s.josh@outlook.com>
Date: Sun, 4 Sep 2022 19:32:42 -0700
Subject: [PATCH 593/854] Fixes multi-platform/build support of print line
 format specifier

---
 plugins/spectate.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/plugins/spectate.cpp b/plugins/spectate.cpp
index 15a881dc1..b0bd190d9 100644
--- a/plugins/spectate.cpp
+++ b/plugins/spectate.cpp
@@ -21,6 +21,7 @@
 #include <map>
 #include <set>
 #include <random>
+#include <cinttypes>
 
 DFHACK_PLUGIN("spectate");
 DFHACK_PLUGIN_IS_ENABLED(enabled);
@@ -247,7 +248,7 @@ command_result spectate (color_ostream &out, std::vector <std::string> & paramet
         }
     } else {
         out.print("Spectate is %s\n", enabled ? "ENABLED." : "DISABLED.");
-        out.print("tick-threshold: %lu\n", tick_threshold);
+        out.print("tick-threshold: %" PRIu64 "\n", tick_threshold);
         out.print("focus-jobs: %s\n", focus_jobs_enabled ? "on." : "off.");
         out.print("auto-unpause: %s\n", unpause_enabled ? "on." : "off.");
         out.print("auto-disengage: %s\n", disengage_enabled ? "on." : "off.");

From e399e2205bbb2fbff3b097565da0e25260d46104 Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Sun, 4 Sep 2022 22:28:03 -0700
Subject: [PATCH 594/854] tombstone fix/fat-dwarves

---
 docs/Removed.rst | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/docs/Removed.rst b/docs/Removed.rst
index c39e0c370..442a2695a 100644
--- a/docs/Removed.rst
+++ b/docs/Removed.rst
@@ -62,6 +62,12 @@ fix/build-location
 ==================
 The corresponding DF :bug:`5991` was fixed in DF 0.40.05.
 
+.. _fix/fat-dwarves:
+
+fix/fat-dwarves
+===============
+The corresponding DF :bug:`5971` was fixed in DF 0.40.05.
+
 .. _fortplan:
 
 fortplan

From d07bc349f89a7133b02221789d2144bf6494a157 Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Sun, 4 Sep 2022 23:05:16 -0700
Subject: [PATCH 595/854] tombstone fix/diplomats

---
 docs/Removed.rst | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/docs/Removed.rst b/docs/Removed.rst
index 442a2695a..728a0b6eb 100644
--- a/docs/Removed.rst
+++ b/docs/Removed.rst
@@ -62,6 +62,12 @@ fix/build-location
 ==================
 The corresponding DF :bug:`5991` was fixed in DF 0.40.05.
 
+.. _fix/diplomats:
+
+fix/diplomats
+=============
+The corresponding DF :bug:`3295` was fixed in DF 0.40.05.
+
 .. _fix/fat-dwarves:
 
 fix/fat-dwarves

From df244cd5196eec09119946b3e55bd4e9edc22855 Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Sun, 4 Sep 2022 23:26:18 -0700
Subject: [PATCH 596/854] tombstone fix/feeding-timers

---
 docs/Removed.rst | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/docs/Removed.rst b/docs/Removed.rst
index 728a0b6eb..5144c16f3 100644
--- a/docs/Removed.rst
+++ b/docs/Removed.rst
@@ -74,6 +74,12 @@ fix/fat-dwarves
 ===============
 The corresponding DF :bug:`5971` was fixed in DF 0.40.05.
 
+.. _fix/feeding-timers:
+
+fix/feeding-timers
+==================
+The corresponding DF :bug:`2606` was fixed in DF 0.40.12.
+
 .. _fortplan:
 
 fortplan

From c0682625f960ce57f13100e5835f4ea3bc8b15b8 Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Sun, 4 Sep 2022 23:27:57 -0700
Subject: [PATCH 597/854] tombstone fix/merchants

---
 docs/Removed.rst | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/docs/Removed.rst b/docs/Removed.rst
index 5144c16f3..f5ab01896 100644
--- a/docs/Removed.rst
+++ b/docs/Removed.rst
@@ -80,6 +80,12 @@ fix/feeding-timers
 ==================
 The corresponding DF :bug:`2606` was fixed in DF 0.40.12.
 
+.. _fix/merchants:
+
+fix/merchants
+=============
+Humans can now make trade agreements. This fix is no longer necessary.
+
 .. _fortplan:
 
 fortplan

From 98f273a10eacbe4a85bc1bc83742b79d8519d5ee Mon Sep 17 00:00:00 2001
From: DFHack-Urist via GitHub Actions
 <63161697+DFHack-Urist@users.noreply.github.com>
Date: Mon, 5 Sep 2022 06:45:22 +0000
Subject: [PATCH 598/854] Auto-update submodules

scripts: master
---
 scripts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts b/scripts
index da571c36a..73bfcbc0f 160000
--- a/scripts
+++ b/scripts
@@ -1 +1 @@
-Subproject commit da571c36ac7e3d4d432a13d1956414f2c20e065e
+Subproject commit 73bfcbc0f4e89733ba7b62d134bc0a3b55dc41e8

From 73b7f13ad6d3f284d89c2e76fcfc734a661e867d Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Mon, 5 Sep 2022 14:28:35 -0700
Subject: [PATCH 599/854] tombstone gui/assign-rack

---
 docs/Removed.rst | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/docs/Removed.rst b/docs/Removed.rst
index f5ab01896..f9bf1c62e 100644
--- a/docs/Removed.rst
+++ b/docs/Removed.rst
@@ -96,6 +96,14 @@ script instead. You can use your existing .csv files. Just move them to the
 ``blueprints`` folder in your DF installation, and instead of
 ``fortplan file.csv`` run ``quickfort run file.csv``.
 
+.. _gui/assign-rack:
+
+gui/assign-rack
+===============
+This script is no longer useful in current DF versions. The script required a
+binpatch <binpatches/needs-patch>`, which has not been available since DF
+0.34.11.
+
 .. _gui/hack-wish:
 
 gui/hack-wish

From e37b7650fa3875e29f1987536c08cf88df684336 Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Mon, 5 Sep 2022 20:53:44 -0700
Subject: [PATCH 600/854] update guides

including fixing the ordering of the TOC, which, while in alphabetical
order, was not in a logical order
---
 docs/guides/examples-guide.rst          | 10 +++++-----
 docs/guides/index.rst                   |  6 ++++--
 docs/guides/quickfort-alias-guide.rst   |  7 ++++---
 docs/guides/quickfort-library-guide.rst |  4 ++--
 docs/guides/quickfort-user-guide.rst    |  5 ++---
 5 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/docs/guides/examples-guide.rst b/docs/guides/examples-guide.rst
index f61ada4d7..74f94c20b 100644
--- a/docs/guides/examples-guide.rst
+++ b/docs/guides/examples-guide.rst
@@ -1,8 +1,8 @@
 .. _config-examples-guide:
 .. _dfhack-examples-guide:
 
-DFHack Example Configuration File Index
-=======================================
+DFHack Config File Examples
+===========================
 
 The :source:`hack/examples <data/examples>` folder contains ready-to-use
 examples of various DFHack configuration files. You can use them by copying them
@@ -14,8 +14,8 @@ The ``init/`` subfolder
 -----------------------
 
 The :source:`init/ <data/examples/init>` subfolder contains useful DFHack
-`init-files` that you can copy into your main Dwarf Fortress folder -- the same
-directory as ``dfhack.init``.
+`init-files` that you can copy into your :file:`dfhack-config/init` folder --
+the same directory as ``dfhack.init``.
 
 .. _onMapLoad-dreamfort-init:
 
@@ -35,7 +35,7 @@ it is useful (and customizable) for any fort. It includes the following config:
 - Periodically enqueues orders to shear and milk shearable and milkable pets.
 - Sets up `autofarm` to grow 30 units of every crop, except for pig tails, which
   is set to 150 units to support the textile industry.
-- Sets up `seedwatch` to keep 30 of every type of seed.
+- Sets up `seedwatch` to protect 30 of every type of seed.
 - Configures `prioritize` to automatically boost the priority of important and
   time-sensitive tasks that could otherwise get ignored in busy forts, like
   hauling food, tanning hides, storing items in vehicles, pulling levers, and
diff --git a/docs/guides/index.rst b/docs/guides/index.rst
index 7208b5276..d0125921f 100644
--- a/docs/guides/index.rst
+++ b/docs/guides/index.rst
@@ -6,6 +6,8 @@ These pages are detailed guides covering DFHack tools.
 
 .. toctree::
    :maxdepth: 1
-   :glob:
 
-   *
+   /docs/guides/examples-guide
+   /docs/guides/quickfort-library-guide
+   /docs/guides/quickfort-user-guide
+   /docs/guides/quickfort-alias-guide
diff --git a/docs/guides/quickfort-alias-guide.rst b/docs/guides/quickfort-alias-guide.rst
index 6afad7569..d4be8aecd 100644
--- a/docs/guides/quickfort-alias-guide.rst
+++ b/docs/guides/quickfort-alias-guide.rst
@@ -1,10 +1,11 @@
 .. _quickfort-alias-guide:
 
-Quickfort Keystroke Alias Guide
-===============================
+Quickfort Keystroke Alias Reference
+===================================
 
 Aliases allow you to use simple words to represent complicated key sequences
-when configuring buildings and stockpiles in quickfort ``#query`` blueprints.
+when configuring buildings and stockpiles in quickfort ``#query`` and
+``#config`` blueprints.
 
 For example, say you have the following ``#build`` and ``#place`` blueprints::
 
diff --git a/docs/guides/quickfort-library-guide.rst b/docs/guides/quickfort-library-guide.rst
index be76c7afe..de5409ab3 100644
--- a/docs/guides/quickfort-library-guide.rst
+++ b/docs/guides/quickfort-library-guide.rst
@@ -1,8 +1,8 @@
 .. _blueprint-library-guide:
 .. _quickfort-library-guide:
 
-Blueprint Library Index
-=======================
+Quickfort Blueprint Library
+===========================
 
 This guide contains a high-level overview of the blueprints available in the
 :source:`quickfort blueprint library <data/blueprints/library>`.
diff --git a/docs/guides/quickfort-user-guide.rst b/docs/guides/quickfort-user-guide.rst
index 0af0924b0..9c7d3ed44 100644
--- a/docs/guides/quickfort-user-guide.rst
+++ b/docs/guides/quickfort-user-guide.rst
@@ -29,9 +29,8 @@ For those just looking to apply existing blueprints, check out the `quickfort
 command's documentation <quickfort>` for syntax. There are also many
 ready-to-use blueprints available in the ``blueprints/library`` subfolder in
 your DFHack installation. Browse them on your computer or
-:source:`online <data/blueprints/library>`, or run ``quickfort list`` at the
-``[DFHack]#`` prompt to list them, and then ``quickfort run`` to apply them to
-your fort!
+:source:`online <data/blueprints/library>`, or run `gui/quickfort` to browse
+and apply them to your fort!
 
 Before you become an expert at writing blueprints, though, you should know that
 the easiest way to make a quickfort blueprint is to build your plan "for real"

From 0da9d01916cbe226507a9d87f4a842d41ea8314e Mon Sep 17 00:00:00 2001
From: DFHack-Urist via GitHub Actions
 <63161697+DFHack-Urist@users.noreply.github.com>
Date: Tue, 6 Sep 2022 05:56:18 +0000
Subject: [PATCH 601/854] Auto-update submodules

scripts: master
---
 scripts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts b/scripts
index 73bfcbc0f..c778cb562 160000
--- a/scripts
+++ b/scripts
@@ -1 +1 @@
-Subproject commit 73bfcbc0f4e89733ba7b62d134bc0a3b55dc41e8
+Subproject commit c778cb56253d26527833b6f55de40c39638de366

From 36de6e6e536a97dabdbae2ab47c99530c51326c1 Mon Sep 17 00:00:00 2001
From: DFHack-Urist via GitHub Actions
 <63161697+DFHack-Urist@users.noreply.github.com>
Date: Tue, 6 Sep 2022 06:02:12 +0000
Subject: [PATCH 602/854] Auto-update submodules

scripts: master
---
 scripts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts b/scripts
index c778cb562..1aae17d6f 160000
--- a/scripts
+++ b/scripts
@@ -1 +1 @@
-Subproject commit c778cb56253d26527833b6f55de40c39638de366
+Subproject commit 1aae17d6fa0e4cf1d130c0d94aa8017495563fa6

From 319bfa69195a16893adf7900797263fb67483a9b Mon Sep 17 00:00:00 2001
From: DFHack-Urist via GitHub Actions
 <63161697+DFHack-Urist@users.noreply.github.com>
Date: Wed, 7 Sep 2022 03:20:19 +0000
Subject: [PATCH 603/854] Auto-update submodules

scripts: master
---
 scripts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts b/scripts
index 1aae17d6f..776ed6357 160000
--- a/scripts
+++ b/scripts
@@ -1 +1 @@
-Subproject commit 1aae17d6fa0e4cf1d130c0d94aa8017495563fa6
+Subproject commit 776ed63579f029f9e17b0b96bd301930a15a894e

From 587577ef43fbc73cf6215eb6a7db127fb79fb837 Mon Sep 17 00:00:00 2001
From: DFHack-Urist via GitHub Actions
 <63161697+DFHack-Urist@users.noreply.github.com>
Date: Wed, 7 Sep 2022 03:23:29 +0000
Subject: [PATCH 604/854] Auto-update submodules

scripts: master
---
 scripts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts b/scripts
index 776ed6357..b6f689540 160000
--- a/scripts
+++ b/scripts
@@ -1 +1 @@
-Subproject commit 776ed63579f029f9e17b0b96bd301930a15a894e
+Subproject commit b6f689540eb490973124a29db44546d07c730b6e

From e5656f65bf3c038cb781aa3513b95d288d4bb04a Mon Sep 17 00:00:00 2001
From: DFHack-Urist via GitHub Actions
 <63161697+DFHack-Urist@users.noreply.github.com>
Date: Wed, 7 Sep 2022 07:41:41 +0000
Subject: [PATCH 605/854] Auto-update submodules

scripts: master
---
 scripts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts b/scripts
index b6f689540..e6e25ea37 160000
--- a/scripts
+++ b/scripts
@@ -1 +1 @@
-Subproject commit b6f689540eb490973124a29db44546d07c730b6e
+Subproject commit e6e25ea3720489fbf15e266c3c604980b35d499f

From 4e8bb1cdf49524b0eac416a8ca9601e8650ccfe5 Mon Sep 17 00:00:00 2001
From: "pre-commit-ci[bot]"
 <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Date: Mon, 5 Sep 2022 21:39:15 +0000
Subject: [PATCH 606/854] [pre-commit.ci] pre-commit autoupdate
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

updates:
- [github.com/python-jsonschema/check-jsonschema: 0.17.1 → 0.18.2](https://github.com/python-jsonschema/check-jsonschema/compare/0.17.1...0.18.2)
- [github.com/Lucas-C/pre-commit-hooks: v1.3.0 → v1.3.1](https://github.com/Lucas-C/pre-commit-hooks/compare/v1.3.0...v1.3.1)
---
 .pre-commit-config.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 125b1e931..25f043624 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -20,11 +20,11 @@ repos:
       args: ['--fix=lf']
     - id: trailing-whitespace
 - repo: https://github.com/python-jsonschema/check-jsonschema
-  rev: 0.17.1
+  rev: 0.18.2
   hooks:
     - id: check-github-workflows
 - repo: https://github.com/Lucas-C/pre-commit-hooks
-  rev: v1.3.0
+  rev: v1.3.1
   hooks:
     - id: forbid-tabs
       exclude_types:

From 483652e1930194c66e01bec332971b6a3b7e26bb Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Sun, 4 Sep 2022 23:47:20 -0400
Subject: [PATCH 607/854] Rewrite utils.df_expr_to_ref() for consistency, add
 tests

---
 docs/changelog.txt     |  1 +
 library/lua/utils.lua  | 14 ++++++++------
 test/library/utils.lua | 37 +++++++++++++++++++++++++++++++++++++
 3 files changed, 46 insertions(+), 6 deletions(-)

diff --git a/docs/changelog.txt b/docs/changelog.txt
index 0c30f22f5..f5f3c8b1b 100644
--- a/docs/changelog.txt
+++ b/docs/changelog.txt
@@ -78,6 +78,7 @@ changelog.txt uses a syntax similar to RST, with a few special sequences:
 - History: added ``dfhack.getCommandHistory(history_id, history_filename)`` and ``dfhack.addCommandToHistory(history_id, history_filename, command)`` so gui scripts can access a commandline history without requiring a terminal.
 - ``helpdb``: database and query interface for DFHack tool help text
 - ``tile-material``: fix the order of declarations. The ``GetTileMat`` function now returns the material as intended (always returned nil before). Also changed the license info, with permission of the original author.
+- ``utils.df_expr_to_ref()``: fixed some errors that could occur when navigating tables
 - ``widgets.EditField``: new ``onsubmit2`` callback attribute is called when the user hits Shift-Enter.
 - ``widgets.EditField``: new function: ``setCursor(position)`` sets the input cursor.
 - ``widgets.EditField``: new attribute: ``ignore_keys`` lets you ignore specified characters if you want to use them as hotkeys
diff --git a/library/lua/utils.lua b/library/lua/utils.lua
index 99ca87c6e..1b626f051 100644
--- a/library/lua/utils.lua
+++ b/library/lua/utils.lua
@@ -613,13 +613,15 @@ function df_expr_to_ref(expr)
     local obj = df_env[parts[1]]
     for i = 2, #parts do
         local key = tonumber(parts[i]) or parts[i]
-        local cur = obj[key]
-        if i == #parts and ((type(cur) ~= 'userdata') or
-                type(cur) == 'userdata' and getmetatable(cur) == nil) then
-            obj = obj:_field(key)
-        else
-            obj = obj[key]
+        if i == #parts then
+            local ok, ret = pcall(function()
+                return obj:_field(key)
+            end)
+            if ok then
+                return ret
+            end
         end
+        obj = obj[key]
     end
     return obj
 end
diff --git a/test/library/utils.lua b/test/library/utils.lua
index 5261ac913..2434da321 100644
--- a/test/library/utils.lua
+++ b/test/library/utils.lua
@@ -54,3 +54,40 @@ function test.invert_overwrite()
     expect.eq(i.b, 2)
     expect.eq(i.a, 3)
 end
+
+function test.df_expr_to_ref()
+    -- userdata field
+    expect.eq(utils.df_expr_to_ref('df.global.world.engravings'), df.global.world.engravings)
+    expect.eq(utils.df_expr_to_ref('df.global.world.engravings'), df.global.world:_field('engravings'))
+    -- primitive field
+    expect.eq(utils.df_expr_to_ref('df.global.world.original_save_version'), df.global.world:_field('original_save_version'))
+    -- table field
+    expect.eq(utils.df_expr_to_ref('df.global.world'), df.global.world)
+    expect.eq(utils.df_expr_to_ref('df.global'), df.global)
+    -- table
+    expect.eq(utils.df_expr_to_ref('df'), df)
+
+    -- userdata object
+    expect.eq(utils.df_expr_to_ref('scr'), dfhack.gui.getCurViewscreen())
+
+    local fake_unit
+    mock.patch(dfhack.gui, 'getSelectedUnit', function() return fake_unit end, function()
+        -- lightuserdata field
+        fake_unit = {
+           null_field=df.NULL,
+        }
+        expect.eq(utils.df_expr_to_ref('unit'), fake_unit)
+        expect.eq(utils.df_expr_to_ref('unit.null_field'), fake_unit.null_field)
+
+        dfhack.with_temp_object(df.unit:new(), function(u)
+            fake_unit = u
+
+            -- userdata field
+            expect.eq(utils.df_expr_to_ref('unit.name'), fake_unit.name)
+            expect.eq(utils.df_expr_to_ref('unit.name'), fake_unit:_field('name'))
+
+            -- primitive field
+            expect.eq(utils.df_expr_to_ref('unit.profession'), fake_unit:_field('profession'))
+        end)
+    end)
+end

From 2fdbcaebf5641caaae318b1a7ee29336b486df45 Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Mon, 5 Sep 2022 00:08:23 -0400
Subject: [PATCH 608/854] Accept negative indices, add vector tests

---
 library/lua/utils.lua  |  2 +-
 test/library/utils.lua | 22 ++++++++++++++++++++++
 2 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/library/lua/utils.lua b/library/lua/utils.lua
index 1b626f051..00e31929f 100644
--- a/library/lua/utils.lua
+++ b/library/lua/utils.lua
@@ -608,7 +608,7 @@ df_env = df_shortcut_env()
 function df_expr_to_ref(expr)
     expr = expr:gsub('%["(.-)"%]', function(field) return '.' .. field end)
         :gsub('%[\'(.-)\'%]', function(field) return '.' .. field end)
-        :gsub('%[(%d+)]', function(field) return '.' .. field end)
+        :gsub('%[(%-?%d+)%]', function(field) return '.' .. field end)
     local parts = expr:split('.', true)
     local obj = df_env[parts[1]]
     for i = 2, #parts do
diff --git a/test/library/utils.lua b/test/library/utils.lua
index 2434da321..509fab8bc 100644
--- a/test/library/utils.lua
+++ b/test/library/utils.lua
@@ -89,5 +89,27 @@ function test.df_expr_to_ref()
             -- primitive field
             expect.eq(utils.df_expr_to_ref('unit.profession'), fake_unit:_field('profession'))
         end)
+
+        -- vector items
+        dfhack.with_temp_object(df.new('ptr-vector'), function(vec)
+            fake_unit = vec
+            vec:insert('#', df.global.world)
+            vec:insert('#', df.global.ui)
+
+            expect.eq(utils.df_expr_to_ref('unit'), vec)
+
+            expect.eq(utils.df_expr_to_ref('unit[0]'), utils.df_expr_to_ref('unit.0'))
+            expect.eq(df.reinterpret_cast(df.world, utils.df_expr_to_ref('unit[0]').value), df.global.world)
+
+            expect.eq(utils.df_expr_to_ref('unit[1]'), utils.df_expr_to_ref('unit.1'))
+            expect.eq(df.reinterpret_cast(df.ui, utils.df_expr_to_ref('unit[1]').value), df.global.ui)
+
+            expect.error_match('index out of bounds', function() utils.df_expr_to_ref('unit.2') end)
+            expect.error_match('index out of bounds', function() utils.df_expr_to_ref('unit[2]') end)
+            expect.error_match('index out of bounds', function() utils.df_expr_to_ref('unit.-1') end)
+            expect.error_match('index out of bounds', function() utils.df_expr_to_ref('unit[-1]') end)
+
+            expect.error_match('not found', function() utils.df_expr_to_ref('unit.a') end)
+        end)
     end)
 end

From 86e1a8d59c22afb84be44726835ff67a4484d080 Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Wed, 7 Sep 2022 10:10:44 -0700
Subject: [PATCH 609/854] When smoothing walls, connect to doors and fgates

---
 docs/changelog.txt  |  1 +
 plugins/dig-now.cpp | 26 +++++++++++++++-----------
 2 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/docs/changelog.txt b/docs/changelog.txt
index f5f3c8b1b..8560cd4c5 100644
--- a/docs/changelog.txt
+++ b/docs/changelog.txt
@@ -43,6 +43,7 @@ changelog.txt uses a syntax similar to RST, with a few special sequences:
 - `tags`: new built-in command to list the tool category tags and their definitions. tags associated with each tool are visible in the tool help and in the output of `ls`.
 
 ## Fixes
+- `dig-now`: Fix direction of smoothed walls when adjacent to a door or floodgate
 - ``job.removeJob()``: ensure jobs are removed from the world list when they are canceled
 - `quickfort`: `Dreamfort <quickfort-blueprint-guide>` blueprint set: declare the hospital zone before building the coffer; otherwise DF fails to stock the hospital with materials
 
diff --git a/plugins/dig-now.cpp b/plugins/dig-now.cpp
index bbcabde65..365be3313 100644
--- a/plugins/dig-now.cpp
+++ b/plugins/dig-now.cpp
@@ -424,26 +424,30 @@ static bool is_smooth_wall(MapExtras::MapCache &map, const DFCoord &pos) {
                 && tileShape(tt) == df::tiletype_shape::WALL;
 }
 
-static bool is_smooth_wall_or_door(MapExtras::MapCache &map,
-                                   const DFCoord &pos) {
-    if (is_smooth_wall(map, pos))
-        return true;
-
+static bool is_connector(MapExtras::MapCache &map, const DFCoord &pos) {
     df::building *bld = Buildings::findAtTile(pos);
-    return bld && bld->getType() == df::building_type::Door;
+
+    return bld &&
+        (bld->getType() == df::building_type::Door ||
+         bld->getType() == df::building_type::Floodgate);
+}
+
+static bool is_smooth_wall_or_connector(MapExtras::MapCache &map,
+                                        const DFCoord &pos) {
+    return is_smooth_wall(map, pos) || is_connector(map, pos);
 }
 
 // adds adjacent smooth walls and doors to the given tdir
 static TileDirection get_adjacent_smooth_walls(MapExtras::MapCache &map,
                                                const DFCoord &pos,
                                                TileDirection tdir) {
-    if (is_smooth_wall_or_door(map, DFCoord(pos.x, pos.y-1, pos.z)))
+    if (is_smooth_wall_or_connector(map, DFCoord(pos.x, pos.y-1, pos.z)))
         tdir.north = 1;
-    if (is_smooth_wall_or_door(map, DFCoord(pos.x, pos.y+1, pos.z)))
+    if (is_smooth_wall_or_connector(map, DFCoord(pos.x, pos.y+1, pos.z)))
         tdir.south = 1;
-    if (is_smooth_wall_or_door(map, DFCoord(pos.x-1, pos.y, pos.z)))
+    if (is_smooth_wall_or_connector(map, DFCoord(pos.x-1, pos.y, pos.z)))
         tdir.west = 1;
-    if (is_smooth_wall_or_door(map, DFCoord(pos.x+1, pos.y, pos.z)))
+    if (is_smooth_wall_or_connector(map, DFCoord(pos.x+1, pos.y, pos.z)))
         tdir.east = 1;
     return tdir;
 }
@@ -469,7 +473,7 @@ static bool adjust_smooth_wall_dir(MapExtras::MapCache &map,
                                    const DFCoord &pos,
                                    TileDirection tdir = BLANK_TILE_DIRECTION) {
     if (!is_smooth_wall(map, pos))
-        return false;
+        return is_connector(map, pos);
 
     tdir = ensure_valid_tdir(get_adjacent_smooth_walls(map, pos, tdir));
 

From 040d018b8efbb86bc03c56c6a431175f36824ff0 Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Wed, 7 Sep 2022 10:34:56 -0700
Subject: [PATCH 610/854] fix order of tree designation in autochop

---
 docs/changelog.txt   | 1 +
 plugins/autochop.cpp | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/docs/changelog.txt b/docs/changelog.txt
index 8560cd4c5..4f6de25f9 100644
--- a/docs/changelog.txt
+++ b/docs/changelog.txt
@@ -43,6 +43,7 @@ changelog.txt uses a syntax similar to RST, with a few special sequences:
 - `tags`: new built-in command to list the tool category tags and their definitions. tags associated with each tool are visible in the tool help and in the output of `ls`.
 
 ## Fixes
+- `autochop`: designate largest trees for chopping first, instead of the smallest
 - `dig-now`: Fix direction of smoothed walls when adjacent to a door or floodgate
 - ``job.removeJob()``: ensure jobs are removed from the world list when they are canceled
 - `quickfort`: `Dreamfort <quickfort-blueprint-guide>` blueprint set: declare the hospital zone before building the coffer; otherwise DF fails to stock the hospital with materials
diff --git a/plugins/autochop.cpp b/plugins/autochop.cpp
index d96e7a972..82c40934c 100644
--- a/plugins/autochop.cpp
+++ b/plugins/autochop.cpp
@@ -313,7 +313,7 @@ static int do_chop_designation(bool chop, bool count_only, int *skipped = nullpt
 {
     int count = 0;
     int estimated_yield = get_log_count();
-    multimap<int, df::plant *> trees_by_size;
+    multimap<int, df::plant *, std::greater<int>> trees_by_size;
 
     if (skipped)
     {

From a392a5371d6f568c25373e24d06479bfe807f2fa Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Wed, 7 Sep 2022 22:02:33 -0700
Subject: [PATCH 611/854] add keybinding for gui/workorder-details

---
 data/init/dfhack.keybindings.init | 3 +++
 docs/changelog.txt                | 1 +
 2 files changed, 4 insertions(+)

diff --git a/data/init/dfhack.keybindings.init b/data/init/dfhack.keybindings.init
index 85d010c84..2ee706b09 100644
--- a/data/init/dfhack.keybindings.init
+++ b/data/init/dfhack.keybindings.init
@@ -72,6 +72,9 @@ keybinding add Alt-Q@jobmanagement/Main gui/manager-quantity
 # re-check manager orders
 keybinding add Alt-R@jobmanagement/Main workorder-recheck
 
+# workorder detail configuration
+keybinding add D@workquota_details gui/workorder-details
+
 # view combat reports for the selected unit/corpse/spatter
 keybinding add Ctrl-Shift-R view-unit-reports
 
diff --git a/docs/changelog.txt b/docs/changelog.txt
index 4f6de25f9..d9a740a60 100644
--- a/docs/changelog.txt
+++ b/docs/changelog.txt
@@ -52,6 +52,7 @@ changelog.txt uses a syntax similar to RST, with a few special sequences:
 - Init scripts: ``dfhack.init`` and other init scripts have moved to ``dfhack-config/init/``. If you have customized your ``dfhack.init`` file and want to keep your changes, please move the part that you have customized to the new location at ``dfhack-config/init/dfhack.init``. If you do not have changes that you want to keep, do not copy anything, and the new defaults will be used automatically.
 - History files: ``dfhack.history``, ``tiletypes.history``, ``lua.history``, and ``liquids.history`` have moved to the ``dfhack-config`` directory. If you'd like to keep the contents of your current history files, please move them to ``dfhack-config``.
 - `do-job-now`: new global keybinding for boosting the priority of the jobs associated with the selected building/work order/unit/item etc.: Alt-N
+- `gui/workorder-details`: new keybinding on the workorder details screen: ``D``
 - `keybinding`: support backquote (\`) as a hotkey (and assign the hotkey to the new `gui/launcher` interface)
 - `ls`: can now filter tools by substring or tag. note that dev scripts are hidden by default. pass the ``--dev`` option to show them.
 - `manipulator`: add a library of useful default professions

From 4adcbe174652f3f4d2c94c138db4f1c80711cd00 Mon Sep 17 00:00:00 2001
From: DFHack-Urist via GitHub Actions
 <63161697+DFHack-Urist@users.noreply.github.com>
Date: Fri, 9 Sep 2022 07:25:12 +0000
Subject: [PATCH 612/854] Auto-update submodules

scripts: master
---
 scripts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts b/scripts
index e6e25ea37..ca280f26b 160000
--- a/scripts
+++ b/scripts
@@ -1 +1 @@
-Subproject commit e6e25ea3720489fbf15e266c3c604980b35d499f
+Subproject commit ca280f26b358cbf1ffffd27efe1b67a40fb4db35

From 122374f018e45f01c740afe8ffbf03e6070196e6 Mon Sep 17 00:00:00 2001
From: DFHack-Urist via GitHub Actions
 <63161697+DFHack-Urist@users.noreply.github.com>
Date: Sat, 10 Sep 2022 07:19:20 +0000
Subject: [PATCH 613/854] Auto-update submodules

scripts: master
---
 scripts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts b/scripts
index ca280f26b..a59356e0d 160000
--- a/scripts
+++ b/scripts
@@ -1 +1 @@
-Subproject commit ca280f26b358cbf1ffffd27efe1b67a40fb4db35
+Subproject commit a59356e0d79072e13df7f50e86df1ecd5645a041

From 2733ce7684aa5c897f45a62470c658728edcd264 Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Thu, 8 Sep 2022 21:57:29 -0700
Subject: [PATCH 614/854] update workflow summary to match the gui version

---
 docs/plugins/workflow.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/plugins/workflow.rst b/docs/plugins/workflow.rst
index 6bf89008b..9013ba189 100644
--- a/docs/plugins/workflow.rst
+++ b/docs/plugins/workflow.rst
@@ -2,7 +2,7 @@ workflow
 ========
 
 .. dfhack-tool::
-    :summary: Manage repeat jobs according to stock levels.
+    :summary: Manage automated item production rules.
     :tags: fort auto jobs
 
 .. dfhack-command:: fix-job-postings

From cae2bca0a7487195d0381c9bf4013d0fcaf0773f Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Sat, 10 Sep 2022 09:49:22 -0700
Subject: [PATCH 615/854] add dfhack.screen.hideGuard

---
 docs/Lua API.rst   |  6 ++++++
 library/LuaApi.cpp | 16 ++++++++++++++++
 2 files changed, 22 insertions(+)

diff --git a/docs/Lua API.rst b/docs/Lua API.rst
index 942ccfa8f..71094414f 100644
--- a/docs/Lua API.rst	
+++ b/docs/Lua API.rst	
@@ -1992,6 +1992,12 @@ Functions:
   Returns: *tile, tile_grayscale*, or *nil* if not found.
   The values can then be used for the *tile* field of *pen* structures.
 
+* ``dfhack.screen.hideGuard(screen,callback[,args...])``
+
+  Removes screen from the viewscreen stack, calls the callback (with optional
+  supplied arguments), and then restores the screen on the top of the viewscreen
+  stack.
+
 * ``dfhack.screen.clear()``
 
   Fills the screen with blank background.
diff --git a/library/LuaApi.cpp b/library/LuaApi.cpp
index d04da21ec..70cb01dfc 100644
--- a/library/LuaApi.cpp
+++ b/library/LuaApi.cpp
@@ -2370,6 +2370,21 @@ static int screen_findGraphicsTile(lua_State *L)
     }
 }
 
+static int screen_hideGuard(lua_State *L) {
+    df::viewscreen *screen = dfhack_lua_viewscreen::get_pointer(L, 1, false);
+    luaL_checktype(L, 2, LUA_TFUNCTION);
+
+    // remove screen from the stack so it doesn't get returned as an output
+    lua_remove(L, 1);
+
+    Screen::Hide hideGuard(screen, Screen::Hide::RESTORE_AT_TOP);
+
+    int nargs = lua_gettop(L) - 1;
+    lua_call(L, nargs, LUA_MULTRET);
+
+    return lua_gettop(L);
+}
+
 namespace {
 
 int screen_show(lua_State *L)
@@ -2472,6 +2487,7 @@ static const luaL_Reg dfhack_screen_funcs[] = {
     { "paintString", screen_paintString },
     { "fillRect", screen_fillRect },
     { "findGraphicsTile", screen_findGraphicsTile },
+    CWRAP(hideGuard, screen_hideGuard),
     CWRAP(show, screen_show),
     CWRAP(dismiss, screen_dismiss),
     CWRAP(isDismissed, screen_isDismissed),

From 3c99a7214f2f84ff767604ef805b3451ebb0de64 Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Sat, 10 Sep 2022 10:10:28 -0700
Subject: [PATCH 616/854] ensure params are strings when invoking scripts

---
 library/lua/dfhack.lua | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/library/lua/dfhack.lua b/library/lua/dfhack.lua
index 8af77e2e4..4a46040af 100644
--- a/library/lua/dfhack.lua
+++ b/library/lua/dfhack.lua
@@ -789,7 +789,11 @@ function dfhack.run_script_with_env(envVars, name, flags, ...)
     end
     scripts[file].env = env
     scripts[file].run = script_code
-    return script_code(...), env
+    local args = {...}
+    for i,v in ipairs(args) do
+        args[i] = tostring(v) -- ensure passed parameters are strings
+    end
+    return script_code(table.unpack(args)), env
 end
 
 function dfhack.current_script_name()

From 82e954692e156b3588dd5e930d606900a66b2c63 Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Sat, 10 Sep 2022 10:15:08 -0700
Subject: [PATCH 617/854] update changelog

---
 docs/changelog.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/changelog.txt b/docs/changelog.txt
index d9a740a60..7cf852228 100644
--- a/docs/changelog.txt
+++ b/docs/changelog.txt
@@ -44,6 +44,7 @@ changelog.txt uses a syntax similar to RST, with a few special sequences:
 
 ## Fixes
 - `autochop`: designate largest trees for chopping first, instead of the smallest
+- ``dfhack.run_script``: ensure the arguments passed to scripts are always strings. This allows other scripts to call ``run_script`` with numeric args and it won't break parameter parsing.
 - `dig-now`: Fix direction of smoothed walls when adjacent to a door or floodgate
 - ``job.removeJob()``: ensure jobs are removed from the world list when they are canceled
 - `quickfort`: `Dreamfort <quickfort-blueprint-guide>` blueprint set: declare the hospital zone before building the coffer; otherwise DF fails to stock the hospital with materials

From bd51d9c4551c0c2a581a3bd4d18747c15c31dc11 Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Sat, 10 Sep 2022 15:34:17 -0400
Subject: [PATCH 618/854] Changelog entry for hideGuard

---
 docs/changelog.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/changelog.txt b/docs/changelog.txt
index 7cf852228..3ef25f5dd 100644
--- a/docs/changelog.txt
+++ b/docs/changelog.txt
@@ -80,6 +80,7 @@ changelog.txt uses a syntax similar to RST, with a few special sequences:
 
 ## Lua
 - History: added ``dfhack.getCommandHistory(history_id, history_filename)`` and ``dfhack.addCommandToHistory(history_id, history_filename, command)`` so gui scripts can access a commandline history without requiring a terminal.
+- Added ``dfhack.screen.hideGuard()``: exposes the C++ ``Screen::Hide`` to Lua
 - ``helpdb``: database and query interface for DFHack tool help text
 - ``tile-material``: fix the order of declarations. The ``GetTileMat`` function now returns the material as intended (always returned nil before). Also changed the license info, with permission of the original author.
 - ``utils.df_expr_to_ref()``: fixed some errors that could occur when navigating tables

From 55a8db4efb4e31c991931aabeda4bb8ae330fe07 Mon Sep 17 00:00:00 2001
From: DFHack-Urist via GitHub Actions
 <63161697+DFHack-Urist@users.noreply.github.com>
Date: Sun, 11 Sep 2022 07:18:50 +0000
Subject: [PATCH 619/854] Auto-update submodules

scripts: master
---
 scripts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts b/scripts
index a59356e0d..773a6ec53 160000
--- a/scripts
+++ b/scripts
@@ -1 +1 @@
-Subproject commit a59356e0d79072e13df7f50e86df1ecd5645a041
+Subproject commit 773a6ec53ec0445d5039b68204bfb1ce60b39603

From 23994d4f4c59d32a10b952d1419a4e92152394fe Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Sun, 11 Sep 2022 13:41:20 -0700
Subject: [PATCH 620/854] dynamically wrap helpdb long help text (default 80)

---
 conf.py                |  6 +++++-
 docs/Lua API.rst       |  6 ++++--
 library/lua/helpdb.lua | 38 +++++++++++++++++++++++++++++++++++---
 3 files changed, 44 insertions(+), 6 deletions(-)

diff --git a/conf.py b/conf.py
index 924da1577..68d11f0f9 100644
--- a/conf.py
+++ b/conf.py
@@ -347,6 +347,10 @@ latex_toplevel_sectioning = 'part'
 
 from sphinx.writers import text
 
-text.MAXWIDTH = 52
+# this value is arbitrary. it just needs to be bigger than the number of
+# characters in the longest paragraph in the DFHack docs
+text.MAXWIDTH = 1000000000
 
+# this is the order that section headers will use the characters for underlines
+# they are in the order of (subjective) text-mode readability
 text_sectionchars = '=-~`+"*'
diff --git a/docs/Lua API.rst b/docs/Lua API.rst
index 71094414f..cc80dd92d 100644
--- a/docs/Lua API.rst	
+++ b/docs/Lua API.rst	
@@ -3114,9 +3114,11 @@ Each entry has several properties associated with it:
 
   Returns the short (~54 character) description for the given entry.
 
-* ``helpdb.get_entry_long_help(entry)``
+* ``helpdb.get_entry_long_help(entry[, width])``
 
-  Returns the full help text for the given entry.
+  Returns the full help text for the given entry. If ``width`` is specified, the
+  text will be wrapped at that width, preserving block indents. The wrap width
+  defaults to 80.
 
 * ``helpdb.get_entry_tags(entry)``
 
diff --git a/library/lua/helpdb.lua b/library/lua/helpdb.lua
index 2f41bbb2c..805b56db9 100644
--- a/library/lua/helpdb.lua
+++ b/library/lua/helpdb.lua
@@ -432,6 +432,37 @@ local function ensure_db()
     index_tags()
 end
 
+local function parse_blocks(text)
+    local blocks = {}
+    for line in text:gmatch('[^\n]*') do
+        local _,indent = line:find('^ *')
+        table.insert(blocks, {line=line:trim(), indent=indent})
+    end
+    return blocks
+end
+
+local function format_block(line, indent, width)
+    local wrapped = line:wrap(width - indent)
+    if indent == 0 then return wrapped end
+    local padding = (' '):rep(indent)
+    local indented_lines = {}
+    for line in wrapped:gmatch('[^\n]*') do
+        table.insert(indented_lines, padding .. line)
+    end
+    return table.concat(indented_lines, '\n')
+end
+
+-- wraps the unwrapped source help at the specified width, preserving block
+-- indents
+local function rewrap(text, width)
+    local formatted_blocks = {}
+    for _,block in ipairs(parse_blocks(text)) do
+        table.insert(formatted_blocks,
+                     format_block(block.line, block.indent, width))
+    end
+    return table.concat(formatted_blocks, '\n')
+end
+
 ---------------------------------------------------------------------------
 -- get API
 ---------------------------------------------------------------------------
@@ -482,9 +513,10 @@ function get_entry_short_help(entry)
     return get_db_property(entry, 'short_help')
 end
 
--- returns the full help documentation associated with the entry
-function get_entry_long_help(entry)
-    return get_db_property(entry, 'long_help')
+-- returns the full help documentation associated with the entry, optionally
+-- wrapped to the specified width (80 if not specified).
+function get_entry_long_help(entry, width)
+    return rewrap(get_db_property(entry, 'long_help'), width or 80)
 end
 
 -- returns the set of tags associated with the entry

From 49798f6412e6f3e1181efe7ad5942365ced9aaad Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Sun, 11 Sep 2022 13:51:57 -0700
Subject: [PATCH 621/854] add unit test for wrapping

---
 test/library/helpdb.lua | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/test/library/helpdb.lua b/test/library/helpdb.lua
index 6c2ef2e9b..96dcbbce0 100644
--- a/test/library/helpdb.lua
+++ b/test/library/helpdb.lua
@@ -398,8 +398,25 @@ function test.get_entry_short_help()
 end
 
 function test.get_entry_long_help()
+    local expected = [[
+basic
+*****
+
+**Tags:** map
+
+**Command:**
+"basic"
+
+Documented
+basic.
+
+Documented
+full help.
+    ]]
+    expect.eq(expected, h.get_entry_long_help('basic', 13))
+
     -- long help for plugins/commands that have doc files should match the
-    -- contents of those files exactly
+    -- contents of those files exactly (test data is already wrapped)
     expect.eq(files['hack/docs/docs/tools/hascommands.txt'],
         h.get_entry_long_help('hascommands'))
     expect.eq(files['hack/docs/docs/tools/hascommands.txt'],

From 23111587923cc61fa2de17c8e7be2f2ccaa2e140 Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Sun, 11 Sep 2022 14:06:21 -0700
Subject: [PATCH 622/854] fix reference to old ls param in Lua API docs

also add another example to the ls example commands
---
 docs/Lua API.rst     |  6 +++---
 docs/builtins/ls.rst | 12 +++++++-----
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/docs/Lua API.rst b/docs/Lua API.rst
index 71094414f..3742b0851 100644
--- a/docs/Lua API.rst	
+++ b/docs/Lua API.rst	
@@ -928,9 +928,9 @@ can be omitted.
 
   The following examples are equivalent::
 
-    dfhack.run_command({'ls', '-a'})
-    dfhack.run_command('ls', '-a')
-    dfhack.run_command('ls -a')  -- not recommended
+    dfhack.run_command({'ls', 'quick'})
+    dfhack.run_command('ls', 'quick')
+    dfhack.run_command('ls quick')  -- not recommended
 
 * ``dfhack.run_command_silent(command[, ...])``
 
diff --git a/docs/builtins/ls.rst b/docs/builtins/ls.rst
index 6b21e4b53..7305a0256 100644
--- a/docs/builtins/ls.rst
+++ b/docs/builtins/ls.rst
@@ -25,11 +25,13 @@ Usage
 Examples
 --------
 
-- ``ls adventure``
-    Lists all commands with the ``adventure`` tag.
-- ``ls --dev trigger``
-    Lists all commands, including developer and modding commands, that match the
-    substring "trigger"
+``ls quick``
+    List all commands that match the substring "quick".
+``ls adventure``
+    List all commands with the ``adventure`` tag.
+``ls --dev trigger``
+    List all commands, including developer and modding commands, that match the
+    substring "trigger".
 
 Options
 -------

From f71f034d1d4bcd6be27d106d2c7365117e0029ba Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Sun, 11 Sep 2022 17:58:10 -0700
Subject: [PATCH 623/854] show full scrollbars instead of just scroll icons

---
 docs/Lua API.rst            |  7 ++--
 docs/changelog.txt          |  1 +
 library/lua/gui/widgets.lua | 78 +++++++++++++++++++++++++++----------
 3 files changed, 62 insertions(+), 24 deletions(-)

diff --git a/docs/Lua API.rst b/docs/Lua API.rst
index a84458ee8..fee502b80 100644
--- a/docs/Lua API.rst	
+++ b/docs/Lua API.rst	
@@ -4039,13 +4039,12 @@ It has the following attributes:
     keys to the number of lines to scroll as positive or negative integers or one of the keywords
     supported by the ``scroll`` method. The default is up/down arrows scrolling by one line and page
     up/down scrolling by one page.
-:show_scroll_icons: Controls scroll icons' behaviour: ``false`` for no icons, ``'right'`` or ``'left'`` for
+:show_scrollbar: Controls scrollbar display: ``false`` for no scrollbar, ``'right'`` or ``'left'`` for
     icons next to the text in an additional column (``frame_inset`` is adjusted to have ``.r`` or ``.l`` greater than ``0``),
     ``nil`` same as ``'right'`` but changes ``frame_inset`` only if a scroll icon is actually necessary
     (if ``getTextHeight()`` is greater than ``frame_body.height``). Default is ``nil``.
-:up_arrow_icon: The symbol for scroll up arrow. Default is ``string.char(24)`` (``↑``).
-:down_arrow_icon: The symbol for scroll down arrow. Default is ``string.char(25)`` (``↓``).
-:scroll_icon_pen: Specifies the pen for scroll icons. Default is ``COLOR_LIGHTCYAN``.
+:scrollbar_fg: Specifies the pen for the scroll icons and the active part of the bar. Default is ``COLOR_LIGHTGREEN`` (the same as the native DF help screens).
+:scrollbar_bg: Specifies the pen for the background part of the scrollbar. Default is ``COLOR_CYAN`` (the same as the native DF help screens).
 
 The text itself is represented as a complex structure, and passed
 to the object via the ``text`` argument of the constructor, or via
diff --git a/docs/changelog.txt b/docs/changelog.txt
index 3ef25f5dd..5abae3dec 100644
--- a/docs/changelog.txt
+++ b/docs/changelog.txt
@@ -64,6 +64,7 @@ changelog.txt uses a syntax similar to RST, with a few special sequences:
 - `seedwatch`: ``seedwatch all`` now adds all plants with seeds to the watchlist, not just the "basic" crops.
 - UX: You can now move the cursor around in DFHack text fields in ``gui/`` scripts (e.g. `gui/blueprint`, `gui/quickfort`, or `gui/gm-editor`). You can move the cursor by clicking where you want it to go with the mouse or using the Left/Right arrow keys.  Ctrl+Left/Right will move one word at a time, and Alt+Left/Right will move to the beginning/end of the text.
 - UX: You can now click on the hotkey hint text in many ``gui/`` script windows to activate the hotkey, like a button. Not all scripts have been updated to use the clickable widget yet, but you can try it in `gui/blueprint` or `gui/quickfort`.
+- UX: Label widget scroll icons are replaced with scrollbars that represent the percentage of text on the screen and move with the position of the visible text, just like web browser scrollbars.
 - `quickfort`: `Dreamfort <quickfort-blueprint-guide>` blueprint set improvements: set traffic designations to encourage dwarves to eat cooked food instead of raw ingredients
 
 ## Documentation
diff --git a/library/lua/gui/widgets.lua b/library/lua/gui/widgets.lua
index d05749417..76683b45a 100644
--- a/library/lua/gui/widgets.lua
+++ b/library/lua/gui/widgets.lua
@@ -544,12 +544,10 @@ Label.ATTRS{
     auto_width = false,
     on_click = DEFAULT_NIL,
     on_rclick = DEFAULT_NIL,
-    --
     scroll_keys = STANDARDSCROLL,
-    show_scroll_icons = DEFAULT_NIL, -- DEFAULT_NIL, 'right', 'left', false
-    up_arrow_icon = string.char(24),
-    down_arrow_icon = string.char(25),
-    scroll_icon_pen = COLOR_LIGHTCYAN,
+    show_scrollbar = DEFAULT_NIL, -- DEFAULT_NIL, 'right', 'left', false
+    scrollbar_fg = COLOR_LIGHTGREEN,
+    scrollbar_bg = COLOR_CYAN
 }
 
 function Label:init(args)
@@ -573,16 +571,16 @@ function Label:setText(text)
 end
 
 function Label:update_scroll_inset()
-    if self.show_scroll_icons == nil then
-        self._show_scroll_icons = self:getTextHeight() > self.frame_body.height and 'right' or false
+    if self.show_scrollbar == nil then
+        self._show_scrollbar = self:getTextHeight() > self.frame_body.height and 'right' or false
     else
-        self._show_scroll_icons = self.show_scroll_icons
+        self._show_scrollbar = self.show_scrollbar
     end
-    if self._show_scroll_icons then
-        -- here self._show_scroll_icons can only be either
+    if self._show_scrollbar then
+        -- here self._show_scrollbar can only be either
         -- 'left' or any true value which we interpret as right
         local l,t,r,b = gui.parse_inset(self.frame_inset)
-        if self._show_scroll_icons == 'left' and l <= 0 then
+        if self._show_scrollbar == 'left' and l <= 0 then
             l = 1
         elseif r <= 0 then
             r = 1
@@ -591,14 +589,54 @@ function Label:update_scroll_inset()
     end
 end
 
-function Label:render_scroll_icons(dc, x, y1, y2)
-    if self.start_line_num ~= 1 then
-        dc:seek(x, y1):char(self.up_arrow_icon, self.scroll_icon_pen)
+-- the position is the number of tiles of empty space above the top of the
+-- scrollbar, and the height is the number of tiles the scrollbar should occupy
+-- to represent the percentage of text that is on the screen.
+local function get_scrollbar_pos_and_height(label)
+    local first_visible_line = label.start_line_num
+    local text_height = label:getTextHeight()
+    local last_visible_line = first_visible_line + label.frame_body.height - 1
+    local scrollbar_body_height = label.frame_body.height - 2
+    local displayed_lines = last_visible_line - first_visible_line
+
+    local height = math.min(scrollbar_body_height - 1,
+        math.ceil((displayed_lines-1) * scrollbar_body_height / text_height))
+
+    local max_pos = scrollbar_body_height - height
+    local pos = math.ceil(((first_visible_line-1) * max_pos) /
+                          (text_height - label.frame_body.height))
+
+    return pos, height
+end
+
+local UP_ARROW_CHAR = string.char(24)
+local DOWN_ARROW_CHAR = string.char(25)
+local NO_ARROW_CHAR = string.char(32)
+local BAR_CHAR = string.char(7)
+local BAR_BG_CHAR = string.char(179)
+
+function Label:render_scrollbar(dc, x, y1, y2)
+    -- render up arrow if we're not at the top
+    dc:seek(x, y1):char(
+        self.start_line_num == 1 and NO_ARROW_CHAR or UP_ARROW_CHAR,
+        self.scrollbar_fg, self.scrollbar_bg)
+    -- render scrollbar body
+    local pos, height = get_scrollbar_pos_and_height(self)
+    local starty = y1 + pos + 1
+    local endy = y1 + pos + height
+    for y=y1+1,y2-1 do
+        if y >= starty and y <= endy then
+            dc:seek(x, y):char(BAR_CHAR, self.scrollbar_fg)
+        else
+            dc:seek(x, y):char(BAR_BG_CHAR, self.scrollbar_bg)
+        end
     end
+    -- render down arrow if we're not at the bottom
     local last_visible_line = self.start_line_num + self.frame_body.height - 1
-    if last_visible_line < self:getTextHeight() then
-        dc:seek(x, y2):char(self.down_arrow_icon, self.scroll_icon_pen)
-    end
+    dc:seek(x, y2):char(
+        last_visible_line >= self:getTextHeight() and
+            NO_ARROW_CHAR or DOWN_ARROW_CHAR,
+        self.scrollbar_fg, self.scrollbar_bg)
 end
 
 function Label:computeFrame(parent_rect)
@@ -644,13 +682,13 @@ function Label:onRenderBody(dc)
 end
 
 function Label:onRenderFrame(dc, rect)
-    if self._show_scroll_icons
+    if self._show_scrollbar
     and self:getTextHeight() > self.frame_body.height
     then
-        local x = self._show_scroll_icons == 'left'
+        local x = self._show_scrollbar == 'left'
                 and self.frame_body.x1-dc.x1-1
                 or  self.frame_body.x2-dc.x1+1
-        self:render_scroll_icons(dc,
+        self:render_scrollbar(dc,
             x,
             self.frame_body.y1-dc.y1,
             self.frame_body.y2-dc.y1

From bcf1b5ddace46da290665c9a8d15ce280474b14e Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Sun, 11 Sep 2022 18:08:00 -0700
Subject: [PATCH 624/854] update tests

---
 test/library/gui/widgets.Label.lua | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/test/library/gui/widgets.Label.lua b/test/library/gui/widgets.Label.lua
index 6b0097d1e..c43b5e886 100644
--- a/test/library/gui/widgets.Label.lua
+++ b/test/library/gui/widgets.Label.lua
@@ -29,7 +29,7 @@ function test.correct_frame_body_with_scroll_icons()
     end
 
     local o = fs{}
-    expect.eq(o.subviews.text.frame_body.width, 9, "Label's frame_body.x2 and .width should be one smaller because of show_scroll_icons.")
+    expect.eq(o.subviews.text.frame_body.width, 9, "Label's frame_body.x2 and .width should be one smaller because of show_scrollbar.")
 end
 
 function test.correct_frame_body_with_few_text_lines()
@@ -50,10 +50,10 @@ function test.correct_frame_body_with_few_text_lines()
     end
 
     local o = fs{}
-    expect.eq(o.subviews.text.frame_body.width, 10, "Label's frame_body.x2 and .width should not change with show_scroll_icons = false.")
+    expect.eq(o.subviews.text.frame_body.width, 10, "Label's frame_body.x2 and .width should not change with show_scrollbar = false.")
 end
 
-function test.correct_frame_body_without_show_scroll_icons()
+function test.correct_frame_body_without_show_scrollbar()
     local t = {}
     for i = 1, 12 do
         t[#t+1] = tostring(i)
@@ -66,13 +66,13 @@ function test.correct_frame_body_without_show_scroll_icons()
                 view_id = 'text',
                 frame_inset = 0,
                 text = t,
-                show_scroll_icons = false,
+                show_scrollbar = false,
             },
         }
     end
 
     local o = fs{}
-    expect.eq(o.subviews.text.frame_body.width, 10, "Label's frame_body.x2 and .width should not change with show_scroll_icons = false.")
+    expect.eq(o.subviews.text.frame_body.width, 10, "Label's frame_body.x2 and .width should not change with show_scrollbar = false.")
 end
 
 function test.scroll()

From e2fbade2195a94e350610e254a2ca4d051cc35e0 Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Sun, 11 Sep 2022 18:56:43 -0700
Subject: [PATCH 625/854] fix scrollbar display when all text is visible

also align behavior with documentation when 'left' or 'right' is
explicitly specified (i.e. always show the scrollbar)
---
 library/lua/gui/widgets.lua | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/library/lua/gui/widgets.lua b/library/lua/gui/widgets.lua
index 76683b45a..e85ac2d3c 100644
--- a/library/lua/gui/widgets.lua
+++ b/library/lua/gui/widgets.lua
@@ -599,8 +599,8 @@ local function get_scrollbar_pos_and_height(label)
     local scrollbar_body_height = label.frame_body.height - 2
     local displayed_lines = last_visible_line - first_visible_line
 
-    local height = math.min(scrollbar_body_height - 1,
-        math.ceil((displayed_lines-1) * scrollbar_body_height / text_height))
+    local height = math.floor(((displayed_lines-1) * scrollbar_body_height) /
+                              text_height)
 
     local max_pos = scrollbar_body_height - height
     local pos = math.ceil(((first_visible_line-1) * max_pos) /
@@ -683,7 +683,6 @@ end
 
 function Label:onRenderFrame(dc, rect)
     if self._show_scrollbar
-    and self:getTextHeight() > self.frame_body.height
     then
         local x = self._show_scrollbar == 'left'
                 and self.frame_body.x1-dc.x1-1

From d4914e7511a8cc48e09d55515aec1ab8af84991a Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Sun, 11 Sep 2022 19:33:01 -0700
Subject: [PATCH 626/854] implement mouse click reactions for scrollbar

---
 docs/Lua API.rst            |  5 +++++
 library/lua/gui/widgets.lua | 39 +++++++++++++++++++++++++++++++++----
 2 files changed, 40 insertions(+), 4 deletions(-)

diff --git a/docs/Lua API.rst b/docs/Lua API.rst
index fee502b80..b97c1b314 100644
--- a/docs/Lua API.rst	
+++ b/docs/Lua API.rst	
@@ -4046,6 +4046,11 @@ It has the following attributes:
 :scrollbar_fg: Specifies the pen for the scroll icons and the active part of the bar. Default is ``COLOR_LIGHTGREEN`` (the same as the native DF help screens).
 :scrollbar_bg: Specifies the pen for the background part of the scrollbar. Default is ``COLOR_CYAN`` (the same as the native DF help screens).
 
+If the scrollbar is shown, it will react to mouse clicks on the scrollbar itself.
+Clicking on the arrows at the top or the bottom will scroll by one line, and
+clicking on the unfilled portion of the scrollbar will scroll by a half page in
+that direction.
+
 The text itself is represented as a complex structure, and passed
 to the object via the ``text`` argument of the constructor, or via
 the ``setText`` method, as one of:
diff --git a/library/lua/gui/widgets.lua b/library/lua/gui/widgets.lua
index e85ac2d3c..d81fbf6b9 100644
--- a/library/lua/gui/widgets.lua
+++ b/library/lua/gui/widgets.lua
@@ -682,8 +682,7 @@ function Label:onRenderBody(dc)
 end
 
 function Label:onRenderFrame(dc, rect)
-    if self._show_scrollbar
-    then
+    if self._show_scrollbar then
         local x = self._show_scrollbar == 'left'
                 and self.frame_body.x1-dc.x1-1
                 or  self.frame_body.x2-dc.x1+1
@@ -695,7 +694,35 @@ function Label:onRenderFrame(dc, rect)
     end
 end
 
+function Label:click_scrollbar()
+    if not self._show_scrollbar then return end
+    local rect = self.frame_body
+    local x, y = dscreen.getMousePos()
+
+    if self._show_scrollbar == 'left' and x ~= rect.x1-1 or x ~= rect.x2+1 then
+        return
+    end
+    if y < rect.y1 or y > rect.y2 then
+        return
+    end
+
+    if y == rect.y1 then
+        return -1
+    elseif y == rect.y2 then
+        return 1
+    else
+        local pos, height = get_scrollbar_pos_and_height(self)
+        if y < rect.y1 + pos then
+            return '-halfpage'
+        elseif y > rect.y1 + pos + height then
+            return '+halfpage'
+        end
+    end
+    return nil
+end
+
 function Label:scroll(nlines)
+    if not nlines then return end
     if type(nlines) == 'string' then
         if nlines == '+page' then
             nlines = self.frame_body.height
@@ -713,12 +740,16 @@ function Label:scroll(nlines)
     n = math.min(n, self:getTextHeight() - self.frame_body.height + 1)
     n = math.max(n, 1)
     self.start_line_num = n
+    return nlines
 end
 
 function Label:onInput(keys)
     if is_disabled(self) then return false end
-    if keys._MOUSE_L_DOWN and self:getMousePos() and self.on_click then
-        self:on_click()
+    if keys._MOUSE_L_DOWN then
+        if not self:scroll(self:click_scrollbar()) and
+                self:getMousePos() and self.on_click then
+            self:on_click()
+        end
     end
     if keys._MOUSE_R_DOWN and self:getMousePos() and self.on_rclick then
         self:on_rclick()

From 7b63377cd82013132437742c7286821bf8605efa Mon Sep 17 00:00:00 2001
From: DFHack-Urist via GitHub Actions
 <63161697+DFHack-Urist@users.noreply.github.com>
Date: Mon, 12 Sep 2022 02:38:01 +0000
Subject: [PATCH 627/854] Auto-update submodules

scripts: master
---
 scripts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts b/scripts
index 773a6ec53..8c89b0891 160000
--- a/scripts
+++ b/scripts
@@ -1 +1 @@
-Subproject commit 773a6ec53ec0445d5039b68204bfb1ce60b39603
+Subproject commit 8c89b08916a00b85d9bb476bf1855dcd8642a0f7

From 253a1a80ada0928d0ac660ec38b545c3f4f2bc91 Mon Sep 17 00:00:00 2001
From: Myk <myk.taylor@gmail.com>
Date: Sun, 11 Sep 2022 23:02:04 -0700
Subject: [PATCH 628/854] add modding guide to guides index

---
 docs/guides/index.rst | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/guides/index.rst b/docs/guides/index.rst
index d0125921f..161b1bb68 100644
--- a/docs/guides/index.rst
+++ b/docs/guides/index.rst
@@ -8,6 +8,7 @@ These pages are detailed guides covering DFHack tools.
    :maxdepth: 1
 
    /docs/guides/examples-guide
+   /docs/guides/modding-guide
    /docs/guides/quickfort-library-guide
    /docs/guides/quickfort-user-guide
    /docs/guides/quickfort-alias-guide

From 540a2a9fa75218b1f931f192277777b891d0ac74 Mon Sep 17 00:00:00 2001
From: Myk <myk.taylor@gmail.com>
Date: Mon, 12 Sep 2022 00:14:03 -0700
Subject: [PATCH 629/854] editing pass up through The structure of the game

---
 docs/guides/modding-guide.rst | 79 ++++++++++++++++++++---------------
 1 file changed, 45 insertions(+), 34 deletions(-)

diff --git a/docs/guides/modding-guide.rst b/docs/guides/modding-guide.rst
index e35422aef..45f922b10 100644
--- a/docs/guides/modding-guide.rst
+++ b/docs/guides/modding-guide.rst
@@ -3,51 +3,61 @@
 DFHack modding guide
 ====================
 
-What is a mod/script?
----------------------
+What is the difference between a script and a mod?
+--------------------------------------------------
 
 A script is a single file that can be run as a command in DFHack, like something
 that modifies or displays game data on request. A mod is something you install
-to get persistent behavioural changes in the game and/or add new content. DFHack
-mods contain and use scripts as well as often having a raw mod component.
+to get persistent behavioural changes in the game and/or add new content. Mods
+can contain and use scripts in addition to (or instead of) modifications to the
+DF game raws.
 
 DFHack scripts are written in Lua. If you don't already know Lua, there's a
-great primer at https://www.lua.org/pil/1.html.
+great primer at `lua.org <https://www.lua.org/pil/contents.html>`__.
 
-Why not just use raw modding?
------------------------------
+Why not just mod the raws?
+--------------------------
 
-For many things it's either completely and only (sensibly) doable in raws or
-completely and only doable with DFHack. For mods where DFHack is an alternative
-and not the only option, it's much less hacky, easier to maintain, and easier to
-extend, and is not prone to side-effects. A great example is adding a syndrome
-when a reaction is performed requiring an exploding boulder in raws but having
-dedicated tools for it if you use DFHack. Many things will require a mix of raw
-modding and DFHack.
+It depends on what you want to do. Some mods *are* better to do in just the raws.
+You don't need DFHack to add a new race or modify attributes, for example. However,
+DFHack scripts can do many things that you just can't do in the raws, like make a
+creature that trails smoke. Some things *could* be done in the raws, but writing a
+script is less hacky, easier to maintain, easier to extend, and is not prone to
+side-effects. A great example is adding a syndrome when a reaction is performed.
+If done in the raws, you have to create an exploding boulder to effect the syndrome.
+DFHack scripts can add the syndrome directly and with much more flexibility. In the
+end, complex mods will likely require a mix of raw modding and DFHack scripting.
 
 A mod-maker's development environment
 -------------------------------------
 
-Scripts can be run from a world's ``raw/scripts/`` directory, and (configurably)
-are run by default from ``hack/scripts/``. Scripts in ``raw/init.d/`` are
-automatically run on world load. Scripts within the raws are a component for
-more advanced mods.
+While you're writing your mod, you need a place to store your in-development scripts
+that will:
 
-A script is run by writing its path and name from a script path folder without
-the file extension into a DFHack command prompt (in-game or the external one).
-E.g. ``gui/gm-editor`` for ``hack/scripts/gui/gm-editor.lua``.
+- be directly runnable by DFHack
+- not get lost when you upgrade DFHack
 
-You can make all your scripts in ``hack/scripts/``, but this is not recommended
-as it makes things much harder to maintain each update. It's recommended to make
-a folder with a name like ``own-scripts`` and add it to
-``dfhack-config/script-paths.txt``. You could also make a folder for external
-installed scripts from the internet that are not in ``hack/scripts/``. You can
-prepend your script paths entries with a ``+`` so that they take precedence over
-other folders.
+The recommended approach is to create a directory somewhere outside of your DF
+installation (let's call it "/path/to/own-scripts") and do all your script
+development in there.
 
-If your mod is installed into ``raw/scripts/`` be aware that the copies of the
-scripts in ``data/save/*/raw/`` are checked first and will run instead of any
-changes you make to an in-development copy outside of a raw folder.
+Inside your DF installation folder, there is a file named
+:file:`dfhack-config/script-paths.txt`. If you add a line like this to that file::
+
+    +/path/to/own-scripts
+
+Then that directory will be searched when you run DFHack commands from inside the
+game. The ``+`` at the front of the path means to search that directory first,
+before any other script directory (like :file:`hack/scripts` or
+:file:`raw/scripts`). That way, your latest changes will always be used instead of
+older copies that you may have installed in a DF directory.
+
+For scripts with the same name, the `order of precedence <script-paths>` will be:
+
+1. ``own-scripts/``
+2. ``data/save/*/raw/scripts/``
+3. ``raw/scripts/``
+4. ``hack/scripts/``
 
 The structure of the game
 -------------------------
@@ -55,7 +65,8 @@ The structure of the game
 "The game" is in the global variable `df <lua-df>`. The game's memory can be
 found in ``df.global``, containing things like the list of all items, whether to
 reindex pathfinding, et cetera. Also relevant to us in ``df`` are the various
-types found in the game, e.g. ``df.pronoun_type`` which we will be using.
+types found in the game, e.g. ``df.pronoun_type`` which we will be using in this
+guide. We'll explore more of the game structures `below <Exploring DF structures>`_.
 
 Your first script
 -----------------
@@ -88,8 +99,8 @@ with one of the strings, will yield its corresponding number. So: ::
 Simple. Save this as a Lua file in your own scripts directory and run it as
 shown before when focused on a unit one way or another.
 
-Getting used to gm-editor and df-structures exploration
--------------------------------------------------------
+Exploring DF structures
+-----------------------
 
 So how could you have known about the field and type we just used? Well, there
 are two main tools for discovering the various fields in the game's data

From dde56040c3142ed561d37a620e1b46149f38c8f1 Mon Sep 17 00:00:00 2001
From: DFHack-Urist via GitHub Actions
 <63161697+DFHack-Urist@users.noreply.github.com>
Date: Mon, 12 Sep 2022 07:39:33 +0000
Subject: [PATCH 630/854] Auto-update submodules

library/xml: master
scripts: master
---
 library/xml | 2 +-
 scripts     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/library/xml b/library/xml
index dc118c5e9..f5fab13fb 160000
--- a/library/xml
+++ b/library/xml
@@ -1 +1 @@
-Subproject commit dc118c5e90aea6181a290e4bbf40e7f2974fb053
+Subproject commit f5fab13fb652dd953e9d59e8deca032b26131208
diff --git a/scripts b/scripts
index 8c89b0891..d0b484021 160000
--- a/scripts
+++ b/scripts
@@ -1 +1 @@
-Subproject commit 8c89b08916a00b85d9bb476bf1855dcd8642a0f7
+Subproject commit d0b484021553574c0eadfb49b30b3007856683b7

From 0e30160c3ce50e76711efbf77f53870804d48d49 Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Mon, 12 Sep 2022 14:15:46 -0700
Subject: [PATCH 631/854] update documentation documentation

---
 docs/Documentation.rst | 107 ++++++++++++++++++++---------------------
 docs/Lua API.rst       |  38 ++++++---------
 2 files changed, 68 insertions(+), 77 deletions(-)

diff --git a/docs/Documentation.rst b/docs/Documentation.rst
index 1d30e72ff..4109a81c7 100644
--- a/docs/Documentation.rst
+++ b/docs/Documentation.rst
@@ -8,7 +8,7 @@ DFHack Documentation System
 DFHack documentation, like the file you are reading now, is created as a set of
 ``.rst`` files in `reStructuredText (reST) <https://www.sphinx-doc.org/rest.html>`_
 format. This is a documentation format common in the Python community. It is very
-similar in concept - and in syntax - to Markdown, as found on GitHub and many other
+similar in concept -- and in syntax -- to Markdown, as found on GitHub and many other
 places. However it is more advanced than Markdown, with more features available when
 compiled to HTML, such as automatic tables of contents, cross-linking, special
 external links (forum, wiki, etc) and more. The documentation is compiled by a
@@ -23,11 +23,13 @@ if you're changing them and want to see the changes reflected in your game.
 
 You can also build the docs if you just want a local HTML- or text-rendered copy, though
 you can always read the `online version <https://dfhack.readthedocs.org>`_ too.
+The active development version of the documentation is tagged with ``latest`` and
+is available `here <https://docs.dfhack.org/en/latest/index.html>`_
 
-(Note that even if you do want a local copy, it is certainly not necessary to
+Note that even if you do want a local copy, it is certainly not necessary to
 compile the documentation in order to read it. Like Markdown, reST documents are
 designed to be just as readable in a plain-text editor as they are in HTML format.
-The main thing you lose in plain text format is hyperlinking.)
+The main thing you lose in plain text format is hyperlinking.
 
 .. contents:: Contents
   :local:
@@ -42,19 +44,17 @@ location in ``hack/docs`` under the DF directory.
 When writing documentation, remember that everything should be documented! If it's not
 clear *where* a particular thing should be documented, ask on Discord or in the DFHack
 thread on Bay12 -- you'll not only be getting help, you'll also be providing valuable
-feedback that makes it easier for future contributers to find documentation on how to
+feedback that makes it easier for future contributors to find documentation on how to
 write the documentation!
 
-Try to keep lines within 80-100 characters, so it's readable in plain text
-in the terminal - Sphinx (our documentation system) will make sure
-paragraphs flow.
+Try to keep lines within 80-100 characters so it's readable in plain text in the
+terminal - Sphinx (our documentation system) will make sure paragraphs flow.
 
 Short descriptions
 ------------------
 
-Each command that a user can run, as well as every plugin that can be enabled for some
-lasting effect, needs to have a short (~54 character) descriptive string associated with
-it. This description text is:
+Each command that a user can run -- as well as every plugin -- needs to have a
+short (~54 character) descriptive string associated with it. This description text is:
 
 - used in-game by the `ls` command and DFHack UI screens that list commands
 - used in the generated index entries in the HTML docs
@@ -114,10 +114,9 @@ in a file named ``docs/gui/foobar.rst`` in the scripts repo. Similarly, a plugin
 ``foobaz`` should be documented in a file named ``docs/plugins/foobaz.rst`` in the dfhack repo.
 For plugins, all commands provided by that plugin should be documented in that same file.
 
-Short descriptions (the ~54 character short help) are taken from the first "sentence" of
-the help text for scripts and plugins that can be enabled. This means that the help should
-begin with a sentence fragment that begins with a capital letter and ends in a full stop
-(``.``). Please make this brief but descriptive!
+Short descriptions (the ~54 character short help) for scripts and plugins are taken from
+the ``summary`` attribute of the ``dfhack-tool`` directive that each tool help document must
+have (see the `Header format`_ section below). Please make this brief but descriptive!
 
 Short descriptions for commands provided by plugins are taken from the ``description``
 parameter passed to the ``PluginCommand`` constructor used when the command is registered
@@ -127,11 +126,11 @@ Header format
 -------------
 
 The docs **must** begin with a heading which exactly matches the script or plugin name, underlined
-with ``=====`` to the same length. This should be followed by a ``.. dfhack-tool:`` directive with
+with ``=====`` to the same length. This must be followed by a ``.. dfhack-tool:`` directive with
 at least the following parameters:
 
 * ``:summary:`` - a short, single-sentence description of the tool
-* ``:tags:`` - a space-separated list of tags that apply to the tool
+* ``:tags:`` - a space-separated list of `tags <tag-list>` that apply to the tool
 
 By default, ``dfhack-tool`` generates both a description of a tool and a command
 with the same name. For tools (specifically plugins) that do not provide exactly
@@ -231,6 +230,7 @@ angle brackets (``<`` and ``>``). Optional elements are enclosed in square brack
 If the command takes an arbitrary number of elements, use ``...``, for example::
 
     prioritize [<options>] <job type> [<job type> ...]
+    quickfort <command>[,<command>...] <list_id>[,<list_id>...] [<options>]
 
 Examples
 --------
@@ -240,11 +240,11 @@ Otherwise, please consider adding a section that shows some real, practical usag
 many users, this will be the **only** section they will read. It is so important that it is a good
 idea to include the ``Examples`` section **before** you describe any extended options your command
 might take. Write examples for what you expect the popular use cases will be. Also be sure to write
-examples showing specific, practical values being used for any parameter that takes a value.
+examples showing specific, practical values being used for any parameter that takes a value or has
+tricky formatting.
 
-Examples should go in their own subheading with a single dash underline (``--------``). The examples
-themselves should be organized in a list, the same as in option 2 for Usage above. Here is an
-example Examples section::
+Examples should go in their own subheading. The examples themselves should be organized as in
+option 2 for Usage above. Here is an example ``Examples`` section::
 
     Examples
     --------
@@ -258,7 +258,7 @@ example Examples section::
 Options
 -------
 
-The options header should follow the examples, with each option in the same list format as the
+The options header should follow the examples, with each option in the same format as the
 examples::
 
     Options
@@ -285,7 +285,8 @@ scripts and plugins can use a different mechanism to at least make their help te
 in-game.
 
 Note that since help text for external scripts and plugins is not rendered by Sphinx,
-it should be written in plain text. Any reStructuredText markup will not be processed.
+it should be written in plain text. Any reStructuredText markup will not be processed and,
+if present, will be shown verbatim to the player (which is probably not what you want).
 
 For external scripts, the short description comes from a comment on the first line
 (the comment marker and extra whitespace is stripped). For Lua, this would look like:
@@ -310,27 +311,33 @@ entire script header::
     -- [====[
     gui/adv-inventory
     =================
-    Tags: adventure, items
+
+    Tags: adventure | items
 
     Allows you to quickly move items between containers. This
     includes yourself and any followers you have.
 
-    Usage:
+    Usage
+    -----
 
         gui/adv-inventory [<options>]
 
-    Examples:
+    Examples
+    --------
 
     gui/adv-inventory
         Opens the GUI with nothing preselected
+
     gui/adv-inventory take-all
         Opens the GUI with all container items already selected and
         ready to move into the adventurer's inventory.
 
-    Options:
+    Options
+    -------
 
     take-all
         Starts the GUI with container items pre-selected
+
     give-all
         Starts the GUI with your own items pre-selected
     ]====]
@@ -347,10 +354,10 @@ Required dependencies
 .. highlight:: shell
 
 In order to build the documentation, you must have Python with Sphinx
-version |sphinx_min_version| or later. Python 3 is recommended.
+version |sphinx_min_version| or later and Python 3.
 
 When installing Sphinx from OS package managers, be aware that there is
-another program called Sphinx, completely unrelated to documentation management.
+another program called "Sphinx", completely unrelated to documentation management.
 Be sure you are installing the right Sphinx; it may be called ``python-sphinx``,
 for example. To avoid doubt, ``pip`` can be used instead as detailed below.
 
@@ -364,13 +371,12 @@ For more detailed platform-specific instructions, see the sections below:
   :local:
   :backlinks: none
 
-
 Linux
 -----
 Most Linux distributions will include Python by default. If not, start by
-installing Python (preferably Python 3). On Debian-based distros::
+installing Python 3. On Debian-based distros::
 
-  sudo apt install python3
+    sudo apt install python3
 
 Check your package manager to see if Sphinx |sphinx_min_version| or later is
 available. On Debian-based distros, this package is named ``python3-sphinx``.
@@ -379,11 +385,11 @@ want to use a newer Sphinx version (which may result in faster builds), you
 can install Sphinx through the ``pip`` package manager instead. On Debian-based
 distros, you can install pip with::
 
-  sudo apt install python3-pip
+    sudo apt install python3-pip
 
 Once pip is available, you can then install Sphinx with::
 
-  pip3 install sphinx
+    pip3 install sphinx
 
 If you run this as an unprivileged user, it may install a local copy of Sphinx
 for your user only. The ``sphinx-build`` executable will typically end up in
@@ -398,34 +404,23 @@ macOS has Python 2.7 installed by default, but it does not have the pip package
 You can install Homebrew's Python 3, which includes pip, and then install the
 latest Sphinx using pip::
 
-  brew install python3
-  pip3 install sphinx
-
-Alternatively, you can simply install Sphinx directly from Homebrew::
-
-  brew install sphinx-doc
-
-This will install Sphinx for macOS's system Python 2.7, without needing pip.
-
-Either method works; if you plan to use Python for other purposes, it might best
-to install Homebrew's Python 3 so that you have the latest Python as well as pip.
-If not, just installing sphinx-doc for macOS's system Python 2.7 is fine.
-
+    brew install python3
+    pip3 install sphinx
 
 Windows
 -------
 Python for Windows can be downloaded `from python.org <https://www.python.org/downloads/>`_.
-The latest version of Python 3 is recommended, as it includes pip already.
+The latest version of Python 3 includes pip already.
 
 You can also install Python and pip through the Chocolatey package manager.
 After installing Chocolatey as outlined in the `Windows compilation instructions <compile-windows>`,
 run the following command from an elevated (admin) command prompt (e.g. ``cmd.exe``)::
 
-  choco install python pip -y
+    choco install python pip -y
 
 Once you have pip available, you can install Sphinx with the following command::
 
-  pip install sphinx
+    pip install sphinx
 
 Note that this may require opening a new (admin) command prompt if you just
 installed pip from the same command prompt.
@@ -465,8 +460,9 @@ ways to do this:
 
 By default, both HTML and text docs are built by CMake. The generated
 documentation is stored in ``docs/html`` and ``docs/text`` (respectively) in the
-root DFHack folder, and will be installed to ``hack/docs`` when you install
-DFHack.
+root DFHack folder, and they will both be installed to ``hack/docs`` when you
+install DFHack. The html and txt files will intermingle, but will not interfere
+with one another.
 
 Running Sphinx manually
 -----------------------
@@ -474,8 +470,8 @@ Running Sphinx manually
 You can also build the documentation without running CMake - this is faster if
 you only want to rebuild the documentation regardless of any code changes. The
 ``docs/build.py`` script will build the documentation in any specified formats
-(HTML only by default) using essentially the same command that CMake runs when
-building the docs. Run the script with ``--help`` to see additional options.
+(HTML only by default) using the same command that CMake runs when building the
+docs. Run the script with ``--help`` to see additional options.
 
 Examples:
 
@@ -501,7 +497,9 @@ or, to build plain-text output::
 Sphinx has many options to enable clean builds, parallel builds, logging, and
 more - run ``sphinx-build --help`` for details. If you specify a different
 output path, be warned that Sphinx may overwrite existing files in the output
-folder.
+folder. Also be aware that when running ``sphinx-build`` directly, the
+``docs/html`` folder may be polluted with intermediate build files that normally
+get written in the cmake ``build`` directory.
 
 Building a PDF version
 ----------------------
@@ -546,7 +544,6 @@ closest stable release after 0.44.05-alpha1). An entry listed under a stable
 release like "0.44.05-r1" in changelog.txt will be listed under that release in
 both the stable changelog and the development changelog.
 
-
 Changelog syntax
 ----------------
 
diff --git a/docs/Lua API.rst b/docs/Lua API.rst
index b97c1b314..286fe97e1 100644
--- a/docs/Lua API.rst	
+++ b/docs/Lua API.rst	
@@ -5096,9 +5096,8 @@ the extension omitted. For example:
 * :file:`hack/scripts/gui/teleport.lua` is invoked as ``gui/teleport``
 
 .. note::
-    Scripts placed in subdirectories can be run as described above, but are not
-    listed by the `ls` command unless ``-a`` is specified. In general, scripts
-    should be placed in subfolders in the following situations:
+    In general, scripts should be placed in subfolders in the following
+    situations:
 
     * ``devel``: scripts that are intended exclusively for DFHack development,
       including examples, or scripts that are experimental and unstable
@@ -5116,16 +5115,12 @@ folders can be added (for example, a copy of the
 :source-scripts:`scripts repository <>` for local development). See
 `script-paths` for more information on how to configure this behavior.
 
-If the first line of the script is a one-line comment (starting with ``--``),
-the content of the comment is used by the built-in ``ls`` and ``help`` commands.
-Such a comment is required for every script in the official DFHack repository.
-
 Scripts are read from disk when run for the first time, or if they have changed
 since the last time they were run.
 
 Each script has an isolated environment where global variables set by the script
 are stored. Values of globals persist across script runs in the same DF session.
-See `devel/lua-example` for an example of this behavior. Note that local
+See `devel/lua-example` for an example of this behavior. Note that ``local``
 variables do *not* persist.
 
 Arguments are passed in to the scripts via the ``...`` built-in quasi-variable;
@@ -5147,9 +5142,9 @@ General script API
 
 * ``dfhack.run_script(name[,args...])``
 
-  Run a Lua script in hack/scripts/, as if it were started from the DFHack
-  command-line. The ``name`` argument should be the name of the script without
-  its extension, as it would be used on the command line.
+  Run a Lua script in :file:`hack/scripts/`, as if it were started from the
+  DFHack command-line. The ``name`` argument should be the name of the script
+  without its extension, as it would be used on the command line.
 
   Example:
 
@@ -5169,10 +5164,10 @@ General script API
 
 * ``dfhack.script_help([name, [extension]])``
 
-  Returns the contents of the embedded documentation of the specified script.
-  ``extension`` defaults to "lua", and ``name`` defaults to the name of the
-  script where this function was called. For example, the following can be used
-  to print the current script's help text::
+  Returns the contents of the rendered (or embedded) `documentation` for the
+  specified script. ``extension`` defaults to "lua", and ``name`` defaults to
+  the name of the script where this function was called. For example, the
+  following can be used to print the current script's help text::
 
     local args = {...}
     if args[1] == 'help' then
@@ -5180,7 +5175,6 @@ General script API
         return
     end
 
-
 Importing scripts
 =================
 
@@ -5234,12 +5228,12 @@ Importing scripts
   .. warning::
 
     Avoid caching the table returned by ``reqscript()`` beyond storing it in
-    a local or global variable as in the example above. ``reqscript()`` is fast
-    for scripts that have previously been loaded and haven't changed. If you
-    retain a reference to a table returned by an old ``reqscript()`` call, this
-    may lead to unintended behavior if the location of the script changes
-    (e.g. if a save is loaded or unloaded, or if a `script path <script-paths>`
-    is added in some other way).
+    a local variable as in the example above. ``reqscript()`` is fast for
+    scripts that have previously been loaded and haven't changed. If you retain
+    a reference to a table returned by an old ``reqscript()`` call, this may
+    lead to unintended behavior if the location of the script changes (e.g. if a
+    save is loaded or unloaded, or if a `script path <script-paths>` is added in
+    some other way).
 
   .. admonition:: Tip
 

From 4a7faeef553da99c51c230595a47ccb733769ca3 Mon Sep 17 00:00:00 2001
From: Myk <myk.taylor@gmail.com>
Date: Mon, 12 Sep 2022 14:51:26 -0700
Subject: [PATCH 632/854] editing pass up through Custom raw tokens

---
 docs/guides/modding-guide.rst | 134 +++++++++++++++++-----------------
 1 file changed, 69 insertions(+), 65 deletions(-)

diff --git a/docs/guides/modding-guide.rst b/docs/guides/modding-guide.rst
index 45f922b10..2eb8c7424 100644
--- a/docs/guides/modding-guide.rst
+++ b/docs/guides/modding-guide.rst
@@ -71,100 +71,103 @@ guide. We'll explore more of the game structures `below <Exploring DF structures
 Your first script
 -----------------
 
-So! It's time to write your first script. We are going to make a script that
-will get the pronoun type of the currently selected unit (there are many
-contexts where the function that gets the currently selected unit works).
+So! It's time to write your first script. This section will walk you through how
+to make a script that will get the pronoun type of the currently selected unit.
 
-First line, we get the unit. ::
+First line, we get the unit::
 
     local unit = dfhack.gui.getSelectedUnit()
 
 If no unit is selected, an error message will be printed (which can be silenced
 by passing ``true`` to ``getSelectedUnit``) and ``unit`` will be ``nil``.
 
-If ``unit`` is ``nil``, we don't want the script to run anymore. ::
+If ``unit`` is ``nil``, we don't want the script to run anymore::
 
     if not unit then
         return
     end
 
 Now, the field ``sex`` in a unit is an integer, but each integer corresponds to
-a string value (it, she, or he). We get this value by indexing the bidirectional
-map ``df.pronoun_type`` with an integer from the unit. Indexing the other way,
-with one of the strings, will yield its corresponding number. So: ::
+a string value ("it", "she", or "he"). We get this value by indexing the bidirectional
+map ``df.pronoun_type``. Indexing the other way, incidentally, with one of the strings,
+will yield its corresponding number. So::
 
     local pronounTypeString = df.pronoun_type[unit.sex]
     print(pronounTypeString)
 
 Simple. Save this as a Lua file in your own scripts directory and run it as
-shown before when focused on a unit one way or another.
+shown before when a unit is selected in the Dwarf Fortress UI.
 
 Exploring DF structures
 -----------------------
 
 So how could you have known about the field and type we just used? Well, there
 are two main tools for discovering the various fields in the game's data
-structures. The first is the ``df-structures`` repository
-(at https://github.com/DFHack/df-structures) that contains XML files denoting
-the contents of the game's structures. The second is the script
-``gui/gm-editor`` which is an interactive data explorer. You can run the script
-while objects like units are selected to view the data within them. You can also
-pass ``scr`` as an argument to the script to view the data for the current
-screen. Press ? while the script is active to view help.
+structures. The first is the ``df-structures``
+`repository <https://github.com/DFHack/df-structures>`__ that contains XML files
+describing the contents of the game's structures. These are complete, but difficult
+to read (for a human). The second option is the `gui/gm-editor` script, an
+interactive data explorer. You can run the script while entities like units are
+selected to view the data within them. You can also run ``gui/gm-editor scr`` to
+view the data for the current screen. Press :kbd:`?` while the script is active to
+view help.
 
 Familiarising yourself with the many structs of the game will help with ideas
-immensely, and you can always ask for help in the right places (e.g. DFHack's
-Discord).
+immensely, and you can always ask for help in the `right places <support>`.
 
 Detecting triggers
 ------------------
 
-One main method for getting new behaviour into the game is callback functions.
-There are two main libraries for this, ``repeat-util`` and ``eventful``.
-``repeat-util`` is used to run a function once per configurable number of frames
-(paused or unpaused), ticks (unpaused), in-game days, months, or years. For
-adding behaviour you will most often want something to run once a tick.
-``eventful`` is used to get code to run (with special parameters!) when
-something happens in the game, like a reaction or job being completed or a
-projectile moving.
+The common method for injecting new behaviour into the game is to define a
+callback function and get it called when something interesting happens. DFHack
+provides two libraries for this, ``repeat-util`` and `eventful <eventful-api>`.
+``repeat-util`` is used to run a function once per a configurable number of frames
+(paused or unpaused), ticks (unpaused), in-game days, months, or years. If you
+need to be aware the instant something happens, you'll need to run a check once a
+tick. Be careful not to do this gratuitiously, though, since running that often can
+slow down the game!
 
-To get something to run once per tick, we would want to call ``repeat-util``'s
-``scheduleEvery`` function.
+``eventful``, on the other hand, is much more performance-friendly since it will
+only call your callback when a relevant event happens, like a reaction or job being
+completed or a projectile moving.
 
-First, we load the module: ::
+To get something to run once per tick, we can call ``repeat-util.scheduleEvery()``.
+First, we load the module::
 
-    local repeatUtil = require("repeat-util")
+    local repeatUtil = require('repeat-util')
 
 Both ``repeat-util`` and ``eventful`` require keys for registered callbacks.
-It's recommended to use something like a mod id. ::
+You should use something unique, like your mod name, perhaps with a suffix if you
+are registering multiple keys::
 
     local modId = "callback-example-mod"
 
 Then, we pass the key, amount of time units between function calls, what the
-time units are, and finally the callback function itself: ::
+time units are, and finally the callback function itself::
 
     repeatUtil.scheduleEvery(modId, 1, "ticks", function()
-        -- Do something like iterating over all active units
+        -- Do something like iterating over all active units and check
+        -- for something interesting
         for _, unit in ipairs(df.global.world.units.active) do
-            print(unit.id)
+            ...
         end
     end)
 
-``eventful`` is slightly more involved. First get the module: ::
+``eventful`` is slightly more involved. First get the module::
 
-    local eventful = require("plugins.eventful")
+    local eventful = require('plugins.eventful')
 
 ``eventful`` contains a table for each event which you populate with functions.
 Each function in the table is then called with the appropriate arguments when
 the event occurs. So, for example, to print the position of a moving (item)
-projectile: ::
+projectile::
 
     eventful.onProjItemCheckMovement[modId] = function(projectile)
         print(projectile.cur_pos.x, projectile.cur_pos.y, projectile.cur_pos.z)
     end
 
-Check the full list of events at
-https://docs.dfhack.org/en/stable/docs/Lua%20API.html#list-of-events.
+Check out the `full list of supported events <eventful-api>` to see what else
+you can react to with ``eventful``.
 
 Custom raw tokens
 -----------------
@@ -172,11 +175,10 @@ Custom raw tokens
 In this section, we are going to use `custom raw tokens <custom-raw-tokens>`
 applied to a reaction to transfer the material of a reagent to a product as a
 handle improvement (like on artifact buckets), and then we are going to see how
-you could make boots that make units go faster when worn. Both of these involve
-custom raw tokens.
+you could make boots that make units go faster when worn.
 
 First, let's define a custom crossbow with its own custom reaction. The
-crossbow: ::
+crossbow::
 
     [ITEM_WEAPON:ITEM_WEAPON_CROSSBOW_SIEGE]
         [NAME:crossbow:crossbows]
@@ -193,7 +195,7 @@ crossbow: ::
         [SIEGE_CROSSBOW_MOD_FIRE_RATE_MULTIPLIER:2] custom token (you'll see)
 
 The reaction to make it (you would add the reaction and not the weapon to an
-entity raw): ::
+entity raw)::
 
     [REACTION:MAKE_SIEGE_CROSSBOW]
         [NAME:make siege crossbow]
@@ -214,19 +216,19 @@ So, we are going to use the ``eventful`` module to make it so that (after the
 script is run) when this crossbow is crafted, it will have two handles, each
 with the material given by the block reagents.
 
-First, require the modules we are going to use. ::
+First, require the modules we are going to use::
 
     local eventful = require("plugins.eventful")
     local customRawTokens = require("custom-raw-tokens")
 
-Now, let's make a callback: ::
+Now, let's make a callback (we'll be defining the body of this function soon)::
 
     local modId = "siege-crossbow-mod"
     eventful.onReactionComplete[modId] = function(reaction, reactionProduct,
     unit, inputItems, inputReagents, outputItems)
 
 First, we check to see if it the reaction that just happened is relevant to this
-callback: ::
+callback::
 
     if not customRawTokens.getToken(reaction,
         "SIEGE_CROSSBOW_MOD_TRANSFER_HANDLE_MATERIAL_TO_PRODUCT_IMPROVEMENT")
@@ -235,28 +237,30 @@ callback: ::
     end
 
 Then, we get the product number listed. Next, for every reagent, if the reagent
-name starts with "handle" then we get the corresponding item, and... ::
+name starts with "handle" then we get the corresponding item, and...
+
+::
 
     for i, reagent in ipairs(inputReagents) do
-        if reagent.code:sub(1, #"handle") == "handle" then
+        if reagent.code:startswith('handle') then
             -- Found handle reagent
-            local item = inputItems[i] -- hopefully found handle item
+            local item = inputItems[i]
 
-...We then add a handle improvement to the listed product within our loop. ::
+...We then add a handle improvement to the listed product within our loop::
 
     local new = df.itemimprovement_itemspecificst:new()
     new.mat_type, new.mat_index = item.mat_type, item.mat_index
-    -- new.maker = outputItems[0].maker -- not a typical improvement
     new.type = df.itemimprovement_specific_type.HANDLE
-    outputItems[productNumber - 1].improvements:insert("#", new)
+    outputItems[productNumber - 1].improvements:insert('#', new)
 
-It's all a bit loose and hacky but it works, at least if you don't have multiple
-stacks filling up one reagent.
+This works well as long as you don't have multiple stacks filling up one
+reagent.
 
-Let's also make some code to modify the fire rate of the siege crossbow. ::
+Let's also make some code to modify the fire rate of our siege crossbow::
 
     eventful.onProjItemCheckMovement[modId] = function(projectile)
-        if projectile.distance_flown > 0 then -- don't repeat this
+        if projectile.distance_flown > 0 then
+            -- don't make this adjustment more than once
             return
         end
 
@@ -276,7 +280,7 @@ Let's also make some code to modify the fire rate of the siege crossbow. ::
     end
 
 Now, let's see how we could make some "pegasus boots". First, let's define the
-item in the raws: ::
+item in the raws::
 
     [ITEM_SHOES:ITEM_SHOES_BOOTS_PEGASUS]
         [NAME:pegasus boot:pegasus boots]
@@ -292,9 +296,9 @@ item in the raws: ::
         [LEATHER]
         [HARD]
         [PEGASUS_BOOTS_MOD_MOVEMENT_TIMER_REDUCTION_PER_TICK:5] custom raw token
-            (you don't have to comment this every time)
+            (you don't have to comment the custom token every time, but it does clarify what it is)
 
-Then, let's make a ``repeat-util`` callback for once a tick: ::
+Then, let's make a ``repeat-util`` callback for once a tick::
 
     repeatUtil.scheduleEvery(modId, 1, "ticks", function()
 
@@ -306,24 +310,24 @@ their worn items: ::
         local amount = 0
         for _, entry in ipairs(unit.inventory) do
 
-Now, we will add up the effect of all speed-increasing gear and apply it: ::
+Now, we will add up the effect of all speed-increasing gear and apply it::
 
         if entry.mode == df.unit_inventory_item.T_mode.Worn then
             amount = amount + tonumber((customRawTokens.getToken(entry.item, "PEGASUS_BOOTS_MOD_MOVEMENT_TIMER_REDUCTION_PER_TICK")) or 0)
         end
     end
-    dfhack.units.addMoveTimer(-amount) -- Subtract amount from movement timer if
-    currently moving
+    -- Subtract amount from movement timer if currently moving
+    dfhack.units.addMoveTimer(-amount)
 
 The structure of a full mod
 ---------------------------
 
 Now, you may have noticed that you won't be able to run multiple functions on
-tick/as event callbacks with that ``modId`` idea alone. To solve that we can
+tick/as event callbacks with that ``modId`` key alone. To solve that we can
 just define all the functions we want and call them from a single function.
 Alternatively you can create multiple callbacks with your mod ID being a prefix,
-though this way there is no guarantee about the order if that is important. You
-will have to use your mod ID as a prefix if you register multiple
+though this way there is no guarantee about the call order (if that is important
+to you). You will have to use your mod ID as a prefix if you register multiple
 ``repeat-util`` callbacks, though.
 
 Create a folder for mod projects somewhere (e.g. ``hack/my-scripts/mods/``, or

From cd83f3fcf13e1b6208b5266b0bc36cded20294a3 Mon Sep 17 00:00:00 2001
From: Myk <myk.taylor@gmail.com>
Date: Mon, 12 Sep 2022 15:04:16 -0700
Subject: [PATCH 633/854] Remove bad link

---
 docs/guides/modding-guide.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/guides/modding-guide.rst b/docs/guides/modding-guide.rst
index 2eb8c7424..549b93e3b 100644
--- a/docs/guides/modding-guide.rst
+++ b/docs/guides/modding-guide.rst
@@ -66,7 +66,7 @@ The structure of the game
 found in ``df.global``, containing things like the list of all items, whether to
 reindex pathfinding, et cetera. Also relevant to us in ``df`` are the various
 types found in the game, e.g. ``df.pronoun_type`` which we will be using in this
-guide. We'll explore more of the game structures `below <Exploring DF structures>`_.
+guide. We'll explore more of the game structures below.
 
 Your first script
 -----------------

From 04d7f0471f9a4c0d2ae696519340ca485020a974 Mon Sep 17 00:00:00 2001
From: DFHack-Urist via GitHub Actions
 <63161697+DFHack-Urist@users.noreply.github.com>
Date: Tue, 13 Sep 2022 07:37:22 +0000
Subject: [PATCH 634/854] Auto-update submodules

scripts: master
---
 scripts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts b/scripts
index d0b484021..fedceb458 160000
--- a/scripts
+++ b/scripts
@@ -1 +1 @@
-Subproject commit d0b484021553574c0eadfb49b30b3007856683b7
+Subproject commit fedceb458a0653f1d3f80c597888d4872b13bc46

From b89a30a3091720b64e5ea066b9f65c5cc7b6c48f Mon Sep 17 00:00:00 2001
From: Tachytaenius <henryfthomson@gmail.com>
Date: Tue, 13 Sep 2022 10:51:38 +0100
Subject: [PATCH 635/854] Update modding-guide.rst

Change use of word entities to objects because entitiy is a taken word in DF, and remove incorrect slash from a command.
---
 docs/guides/modding-guide.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/guides/modding-guide.rst b/docs/guides/modding-guide.rst
index 549b93e3b..6687ca6d0 100644
--- a/docs/guides/modding-guide.rst
+++ b/docs/guides/modding-guide.rst
@@ -107,7 +107,7 @@ structures. The first is the ``df-structures``
 `repository <https://github.com/DFHack/df-structures>`__ that contains XML files
 describing the contents of the game's structures. These are complete, but difficult
 to read (for a human). The second option is the `gui/gm-editor` script, an
-interactive data explorer. You can run the script while entities like units are
+interactive data explorer. You can run the script while obects like units are
 selected to view the data within them. You can also run ``gui/gm-editor scr`` to
 view the data for the current screen. Press :kbd:`?` while the script is active to
 view help.
@@ -338,7 +338,7 @@ environment for fully-functioning modular mods are as follows:
 * The main content of the mod would be in the ``raw`` folder:
 
   * A Lua file in ``raw/init.d/`` to initialise the mod by calling
-    ``your-mod-id/main/ enable``.
+    ``your-mod-id/main enable``.
   * Raw content (potentially with custom raw tokens) in ``raw/objects/``.
   * A subfolder for your mod in ``raw/scripts/`` containing a ``main.lua`` file
     (an example of which we will see) and all the modules containing the functions

From 92b047fda1e1b84c7b454c7fa125db9d7ed67317 Mon Sep 17 00:00:00 2001
From: Tachytaenius <henryfthomson@gmail.com>
Date: Tue, 13 Sep 2022 10:52:56 +0100
Subject: [PATCH 636/854] Update modding-guide.rst

Obects to objects typo fix
---
 docs/guides/modding-guide.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/guides/modding-guide.rst b/docs/guides/modding-guide.rst
index 6687ca6d0..64087fd94 100644
--- a/docs/guides/modding-guide.rst
+++ b/docs/guides/modding-guide.rst
@@ -107,7 +107,7 @@ structures. The first is the ``df-structures``
 `repository <https://github.com/DFHack/df-structures>`__ that contains XML files
 describing the contents of the game's structures. These are complete, but difficult
 to read (for a human). The second option is the `gui/gm-editor` script, an
-interactive data explorer. You can run the script while obects like units are
+interactive data explorer. You can run the script while objects like units are
 selected to view the data within them. You can also run ``gui/gm-editor scr`` to
 view the data for the current screen. Press :kbd:`?` while the script is active to
 view help.

From 7ccacd7875a2af3dfcff559c798c30413ef4ba87 Mon Sep 17 00:00:00 2001
From: Myk <myk.taylor@gmail.com>
Date: Tue, 13 Sep 2022 23:16:54 -0700
Subject: [PATCH 637/854] editing pass for the structure of a full mod

the sample code itself needs some adjustment to exemplify best pratices.
---
 docs/guides/modding-guide.rst | 86 +++++++++++++++++++----------------
 1 file changed, 46 insertions(+), 40 deletions(-)

diff --git a/docs/guides/modding-guide.rst b/docs/guides/modding-guide.rst
index 64087fd94..d6e05ea41 100644
--- a/docs/guides/modding-guide.rst
+++ b/docs/guides/modding-guide.rst
@@ -137,8 +137,7 @@ First, we load the module::
     local repeatUtil = require('repeat-util')
 
 Both ``repeat-util`` and ``eventful`` require keys for registered callbacks.
-You should use something unique, like your mod name, perhaps with a suffix if you
-are registering multiple keys::
+You should use something unique, like your mod name::
 
     local modId = "callback-example-mod"
 
@@ -169,6 +168,12 @@ projectile::
 Check out the `full list of supported events <eventful-api>` to see what else
 you can react to with ``eventful``.
 
+Now, you may have noticed that you won't be able to register multiple callbacks
+with a single key named after your mod. You can, of course, call all the functions
+you want from a single registed callback. Alternately, you can create multiple
+callbacks using different keys, using your mod ID as a key name prefix. If you do
+register multiple callbacks, though, there are no guarantees about the call order.
+
 Custom raw tokens
 -----------------
 
@@ -322,45 +327,46 @@ Now, we will add up the effect of all speed-increasing gear and apply it::
 The structure of a full mod
 ---------------------------
 
-Now, you may have noticed that you won't be able to run multiple functions on
-tick/as event callbacks with that ``modId`` key alone. To solve that we can
-just define all the functions we want and call them from a single function.
-Alternatively you can create multiple callbacks with your mod ID being a prefix,
-though this way there is no guarantee about the call order (if that is important
-to you). You will have to use your mod ID as a prefix if you register multiple
-``repeat-util`` callbacks, though.
-
-Create a folder for mod projects somewhere (e.g. ``hack/my-scripts/mods/``, or
-maybe somewhere outside your Dwarf Fortress installation) and use your mod ID
-(in hyphen-case) as the name for the mod folders within it. The structure of and
-environment for fully-functioning modular mods are as follows:
-
-* The main content of the mod would be in the ``raw`` folder:
-
-  * A Lua file in ``raw/init.d/`` to initialise the mod by calling
-    ``your-mod-id/main enable``.
-  * Raw content (potentially with custom raw tokens) in ``raw/objects/``.
-  * A subfolder for your mod in ``raw/scripts/`` containing a ``main.lua`` file
-    (an example of which we will see) and all the modules containing the functions
-    used in callbacks to ``repeat-util`` and ``eventful``. Potentially a file
-    containing constant definitions used by your mod (perhaps defined by the
-    game, like the acceleration of parabolic projectiles due to gravity
-    (``4900``)) too.
-
-* Using git within each mod folder is recommended, but not required.
-* A ``readme.md`` markdown file is also recommended.
-* An ``addToEntity.txt`` file containing lines to add to entity definitions for
-  access to mod content would be needed if applicable.
-* Unless you want to merge your ``raw`` folder with your worlds every time you
-  make a change to your scripts, you should add
-  ``path/to/your-mod/raw/scripts/`` to your script paths.
-
-Now, let's take a look at an example ``raw/scripts/main.lua`` file. ::
-
-    local repeatUtil = require("repeat-util")
-    local eventful = require("plugins.eventful")
+Create a folder for mod projects somewhere outside your Dwarf Fortress
+installation directory (e.g. ``/path/to/mymods``) and use your mod IDs as the names
+for the mod folders within it. In the example below, we'll use a mod ID of
+``example-mod``. I'm sure your mods will have more creative names! The ``example-mod``
+mod will be developed in the ``/path/to/mymods/example-mod`` directory and has a basic
+structure that looks like this::
+
+    raw/init.d/example-mod.lua
+    raw/objects/...
+    raw/scripts/example-mod/main.lua
+    raw/scripts/example-mod/...
+    README.md
+
+Let's go through that line by line.
+
+* You'll need a short script in ``raw/init.d/`` to initialise your mod when a save is
+  loaded.
+* Modifications to the game raws (potentially with custom raw tokens) go in
+  ``raw/objects/``.
+* A subfolder for your mod under ``raw/scripts/`` will contain all the scripts used by
+  your mod, including the main initialization code in ``main.lua`` which registers all
+  your timer and event callbacks.
+
+It is a good idea to use a version control system to organize changes to your mod code.
+You can create a separate Git repository for each of your mods. The ``README.md`` file
+will be your mod help text when people browse to your online repository.
+
+Unless you want to install your ``raw`` folder into your DF game folder every time you
+make a change to your scripts, you should add your development scripts directory to your
+script paths in ``dfhack-config/script-paths.txt``::
+
+    +/path/to/mymods/example-mod/raw/scripts
+
+Ok, you're all set up! Now, let's take a look at an example
+``raw/scripts/example-mod/main.lua`` file::
+
+    local repeatUtil = require('repeat-util')
+    local eventful = require('plugins.eventful')
 
-    local modId = "example-mod"
+    local modId = 'example-mod'
     local args = {...}
 
     if args[1] == "enable" then

From bb52e7bac8e560a156d21c5f7396a4fb199ac3ef Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Tue, 13 Sep 2022 22:23:04 -0700
Subject: [PATCH 638/854] list tools in categories with tags builtin

---
 docs/builtins/tags.rst  | 20 +++++++++++++++-----
 library/Core.cpp        |  8 +++++---
 library/lua/helpdb.lua  | 31 +++++++++++++++++++++++--------
 test/library/helpdb.lua | 14 ++++++++++++++
 4 files changed, 57 insertions(+), 16 deletions(-)

diff --git a/docs/builtins/tags.rst b/docs/builtins/tags.rst
index 985943647..698323ffe 100644
--- a/docs/builtins/tags.rst
+++ b/docs/builtins/tags.rst
@@ -2,15 +2,25 @@ tags
 ====
 
 .. dfhack-tool::
-    :summary: List the strings that DFHack tools can be tagged with.
+    :summary: List the categories of DFHack tools or the tools with those tags.
     :tags: dfhack
 
-You can find groups of related tools by passing the tag name to the `ls`
-command.
+DFHack tools are labeled with tags so you can find groups of related commands.
+This builtin command lists the tags that you can explore, or, if called with the
+name of a tag, lists the tools that have that tag.
 
 Usage
 -----
 
-::
+``tags``
+    List the categories of DFHack tools and a description of those categories.
+``tags <tag>``
+    List the tools that are tagged with the given tag.
 
-    tags
+Examples
+--------
+
+``tags``
+    List the defined tags.
+``tags design``
+    List all the tools that have the ``design`` tag.
diff --git a/library/Core.cpp b/library/Core.cpp
index 1b3f1409f..87f78f56c 100644
--- a/library/Core.cpp
+++ b/library/Core.cpp
@@ -600,7 +600,7 @@ void help_helper(color_ostream &con, const string &entry_name) {
     }
 }
 
-void tags_helper(color_ostream &con) {
+void tags_helper(color_ostream &con, const string &tag) {
     CoreSuspender suspend;
     auto L = Lua::Core::State;
     Lua::StackUnwinder top(L);
@@ -611,7 +611,9 @@ void tags_helper(color_ostream &con) {
         return;
     }
 
-    if (!Lua::SafeCall(con, L, 0, 0)) {
+    Lua::Push(L, tag);
+
+    if (!Lua::SafeCall(con, L, 1, 0)) {
         con.printerr("Failed Lua call to helpdb.tags.\n");
     }
 }
@@ -712,7 +714,7 @@ command_result Core::runCommand(color_ostream &con, const std::string &first_, v
     }
     else if (first == "tags")
     {
-        tags_helper(con);
+        tags_helper(con, parts.size() ? parts[0] : "");
     }
     else if (first == "load" || first == "unload" || first == "reload")
     {
diff --git a/library/lua/helpdb.lua b/library/lua/helpdb.lua
index 805b56db9..e5359b323 100644
--- a/library/lua/helpdb.lua
+++ b/library/lua/helpdb.lua
@@ -719,14 +719,6 @@ local function print_columns(col1text, col2text)
     end
 end
 
--- implements the 'tags' builtin command
-function tags()
-    local tags = get_tags()
-    for _,tag in ipairs(tags) do
-        print_columns(tag, get_tag_data(tag).description)
-    end
-end
-
 -- prints the requested entries to the console. include and exclude filters are
 -- defined as in search_entries() above.
 local function list_entries(skip_tags, include, exclude)
@@ -764,4 +756,27 @@ function ls(filter_str, skip_tags, show_dev_commands)
                  show_dev_commands and {} or {tag='dev'})
 end
 
+local function list_tags()
+    local tags = get_tags()
+    for _,tag in ipairs(tags) do
+        print_columns(tag, get_tag_data(tag).description)
+    end
+end
+
+-- implements the 'tags' builtin command
+function tags(tag)
+    if tag and #tag > 0 and not is_tag(tag) then
+        dfhack.printerr(('unrecognized tag: "%s"'):format(tag))
+    end
+
+    if not is_tag(tag) then
+        list_tags()
+        return
+    end
+
+    local skip_tags = true
+    local include = {entry_type={ENTRY_TYPES.COMMAND}, tag=tag}
+    list_entries(skip_tags, include)
+end
+
 return _ENV
diff --git a/test/library/helpdb.lua b/test/library/helpdb.lua
index 96dcbbce0..7a223bcaa 100644
--- a/test/library/helpdb.lua
+++ b/test/library/helpdb.lua
@@ -622,6 +622,20 @@ function test.tags()
     end)
 end
 
+function test.tags_tag()
+    local mock_print = mock.func()
+    mock.patch(h, 'print', mock_print, function()
+        h.tags('armok')
+        expect.eq(3, mock_print.call_count)
+        expect.eq('bindboxers           Bind your boxers.',
+            mock_print.call_args[1][1])
+        expect.eq('boxbinders           Box your binders.',
+            mock_print.call_args[2][1])
+        expect.eq('samename             Samename.',
+            mock_print.call_args[3][1])
+    end)
+end
+
 function test.ls()
     local mock_print = mock.func()
     mock.patch(h, 'print', mock_print, function()

From 759f46dbd9f92b261b7a9531f62804c07efd0756 Mon Sep 17 00:00:00 2001
From: DFHack-Urist via GitHub Actions
 <63161697+DFHack-Urist@users.noreply.github.com>
Date: Wed, 14 Sep 2022 07:34:29 +0000
Subject: [PATCH 639/854] Auto-update submodules

scripts: master
---
 scripts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts b/scripts
index fedceb458..aadbe0486 160000
--- a/scripts
+++ b/scripts
@@ -1 +1 @@
-Subproject commit fedceb458a0653f1d3f80c597888d4872b13bc46
+Subproject commit aadbe04860483ffbfcb4ce7e14fbb1c81bfb757a

From b88d343ddd192c25107c85d3734ae3d1b84d29ce Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Wed, 14 Sep 2022 09:25:43 -0700
Subject: [PATCH 640/854] fix off-by-one error on scrollbar click detection

---
 library/lua/gui/widgets.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/library/lua/gui/widgets.lua b/library/lua/gui/widgets.lua
index d81fbf6b9..0069a1769 100644
--- a/library/lua/gui/widgets.lua
+++ b/library/lua/gui/widgets.lua
@@ -712,7 +712,7 @@ function Label:click_scrollbar()
         return 1
     else
         local pos, height = get_scrollbar_pos_and_height(self)
-        if y < rect.y1 + pos then
+        if y <= rect.y1 + pos then
             return '-halfpage'
         elseif y > rect.y1 + pos + height then
             return '+halfpage'

From d68c17d0708bfd79c9be223559ff53ce55e3d713 Mon Sep 17 00:00:00 2001
From: Myk <myk.taylor@gmail.com>
Date: Wed, 14 Sep 2022 10:33:27 -0700
Subject: [PATCH 641/854] fix paths/clean up code/use best practices

---
 docs/guides/modding-guide.rst | 138 ++++++++++++++++------------------
 1 file changed, 65 insertions(+), 73 deletions(-)

diff --git a/docs/guides/modding-guide.rst b/docs/guides/modding-guide.rst
index d6e05ea41..57504143a 100644
--- a/docs/guides/modding-guide.rst
+++ b/docs/guides/modding-guide.rst
@@ -336,7 +336,7 @@ structure that looks like this::
 
     raw/init.d/example-mod.lua
     raw/objects/...
-    raw/scripts/example-mod/main.lua
+    raw/scripts/example-mod.lua
     raw/scripts/example-mod/...
     README.md
 
@@ -346,9 +346,9 @@ Let's go through that line by line.
   loaded.
 * Modifications to the game raws (potentially with custom raw tokens) go in
   ``raw/objects/``.
-* A subfolder for your mod under ``raw/scripts/`` will contain all the scripts used by
-  your mod, including the main initialization code in ``main.lua`` which registers all
-  your timer and event callbacks.
+* A control script in ``raw/scripts/`` that handles enabling and disabling your mod.
+* A subfolder for your mod under ``raw/scripts/`` will contain all the internal scripts
+  used by your mod.
 
 It is a good idea to use a version control system to organize changes to your mod code.
 You can create a separate Git repository for each of your mods. The ``README.md`` file
@@ -361,107 +361,99 @@ script paths in ``dfhack-config/script-paths.txt``::
     +/path/to/mymods/example-mod/raw/scripts
 
 Ok, you're all set up! Now, let's take a look at an example
-``raw/scripts/example-mod/main.lua`` file::
-
+``raw/scripts/example-mod.lua`` file::
+
+    -- main setup and teardown for example-mod
+    -- this next line indicates that the script supports the "enable" API so you can start
+    -- it by running "enable example-mod" and stop it by running "disable example-mod"
+    --@ enable = true
+    
+    local usage = [[
+    Usage
+    -----
+    
+        enable example-mod
+        disable example-mod
+    ]]
     local repeatUtil = require('repeat-util')
     local eventful = require('plugins.eventful')
 
+    -- you can reference global values or functions declared in any of your internal scripts
+    local moduleA = reqscript('example-mod/module-a')
+    local moduleB = reqscript('example-mod/module-b')
+    local moduleC = reqscript('example-mod/module-c')
+    local moduleD = reqscript('example-mod/module-d')
+    
+    enabled = enabled or false
     local modId = 'example-mod'
-    local args = {...}
-
-    if args[1] == "enable" then
-        -- The modules and what they link into the environment with
-        -- Each module exports functions named the way they are to be used
-        local moduleA = dfhack.reqscript("example-mod/module-a") -- on load,
-            -- every tick
-        local moduleB = dfhack.reqscript("example-mod/module-b") -- on load,
-            -- on unload, onReactionComplete
-        local moduleC = dfhack.reqscript("example-mod/module-c")
-            -- onReactionComplete
-        local moduleD = dfhack.reqscript("example-mod/module-d") -- every 100
-            -- frames, onProjItemCheckMovement, onProjUnitCheckMovement
-
-        -- Set up the modules
-        -- Order: on load, repeat-util ticks (from smallest interval to
-        -- largest), days, months, years, and frames, then eventful callbacks in
-        -- the same order as the first modules to use them
 
+    if not dfhack_flags.enable then
+        print(usage)
+        print()
+        print(('Example mod is currently '):format(enabled and 'enabled' or 'disabled'))
+        return
+    end
+
+    if dfhack_flags.enable_state then
+        -- do any initialization your internal scripts might require
         moduleA.onLoad()
         moduleB.onLoad()
 
-        repeatUtil.scheduleEvery(modId .. " 1 ticks", 1, "ticks", function()
-            moduleA.every1Tick()
-        end)
+        -- register your callbacks
+        repeatUtil.scheduleEvery(modId .. ' every tick', 1, 'ticks', moduleA.every1Tick)
+        repeatUtil.scheduleEvery(modId .. ' 100 frames', 1, 'frames', moduleD.every100Frames)
 
-        repeatUtil.scheduleEvery(modID .. " 100 frames", 1, "frames", function()
-            moduleD.every100Frames()
+        eventful.onReactionComplete[modId] = function(reaction, reaction_product, unit, input_items, input_reagents, output_items)
+            -- pass the event's parameters to the listeners
+            moduleB.onReactionComplete(reaction, reaction_product, unit, input_items, input_reagents, output_items)
+            moduleC.onReactionComplete(reaction, reaction_product, unit, input_items, input_reagents, output_items)
         end
 
-        eventful.onReactionComplete[modId] = function(...)
-            -- Pass the event's parameters to the listeners, whatever they are
-            moduleB.onReactionComplete(...)
-            moduleC.onReactionComplete(...)
-        end
-
-        eventful.onProjItemCheckMovement[modId] = function(...)
-            moduleD.onProjItemCheckMovement(...)
-        end
-
-        eventful.onProjUnitCheckMovement[modId] = function(...)
-            moduleD.onProjUnitCheckMovement(...)
-        end
-
-        print("Example mod enabled")
-    elseif args[1] == "disable" then
-        -- Order: on unload, then cancel the callbacks in the same order as
-        -- above
+        eventful.onProjItemCheckMovement[modId] = moduleD.onProjItemCheckMovement
+        eventful.onProjUnitCheckMovement[modId] = moduleD.onProjUnitCheckMovement
 
+        print('Example mod enabled')
+        enabled = true
+    else
+        -- call any shutdown functions your internal scripts might require
         moduleA.onUnload()
 
-        repeatUtil.cancel(modId .. " 1 ticks")
-        repeatUtil.cancel(modId .. " 100 frames")
+        repeatUtil.cancel(modId .. ' every ticks')
+        repeatUtil.cancel(modId .. ' 100 frames')
 
         eventful.onReactionComplete[modId] = nil
         eventful.onProjItemCheckMovement[modId] = nil
         eventful.onProjUnitCheckMovement[modId] = nil
 
-        print("Example mod disabled")
-    elseif not args[1] then
-        dfhack.printerr("No argument given to example-mod/main")
-    else
-        dfhack.printerr("Unknown argument \"" .. args[1] ..
-            "\" to example-mod/main")
+        print('Example mod disabled')
+        enabled = false
     end
 
-You can see there are four cases depending on arguments. Set up the callbacks
-and call on load functions if enabled, dismantle the callbacks and call on
-unload functions if disabled, no arguments given, and invalid argument(s) given.
-
-Here is an example of an ``raw/init.d/`` file: ::
+You can call ``enable example-mod`` and ``disable example-mod`` yourself while
+developing, but for end users you can start your mod automatically from
+``raw/init.d/example-mod.lua``::
 
-    dfhack.run_command("example-mod/main enable") -- Very simple. Could be
-        -- called "init-example-mod.lua"
+    dfhack.run_command('enable example-mod')
 
-Here is what ``raw/scripts/module-a.lua`` would look like: ::
+Inside ``raw/scripts/example-mod/module-a.lua`` you could have code like this::
 
     --@ module = true
-    -- The above line is required for dfhack.reqscript to work
+    -- The above line is required for reqscript to work
 
     function onLoad() -- global variables are exported
-        -- blah
+        -- do initialization here
     end
 
-    local function usedByOnTick() -- local variables are not exported
-        -- blah
+    local function usedByOnTick(unit) -- local variables are not exported
+        -- this is an internal function: local functions/variables are not exported
     end
 
     function onTick() -- exported
-        for blah in ipairs(blah) do
-            usedByOnTick()
+        for _,unit in ipairs(df.global.world.units.all) do
+            usedByOnTick(unit)
         end
     end
 
-It is recommended to check `reqscript <reqscript>`'s documentation.
-``reqscript`` caches scripts but will reload scripts that have changed (it
-checks the file's last modification date) so you can do live editing *and* have
-common tables et cetera between scripts that require the same module.
+The `reqscript` function reloads scripts that have changed, so you can modify your
+scripts while DF is running and just disable/enable your mod to load the changes into
+your ongoing game!

From 51f5349bafab12d916b15a25e18bd0d363f79b04 Mon Sep 17 00:00:00 2001
From: Myk <myk.taylor@gmail.com>
Date: Wed, 14 Sep 2022 10:43:51 -0700
Subject: [PATCH 642/854] labels must go above a section header

---
 docs/Lua API.rst | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/docs/Lua API.rst b/docs/Lua API.rst
index b0891da57..e8be88626 100644
--- a/docs/Lua API.rst	
+++ b/docs/Lua API.rst	
@@ -5181,12 +5181,11 @@ General script API
         return
     end
 
+.. _reqscript:
 
 Importing scripts
 =================
 
-.. _reqscript:
-
 * ``dfhack.reqscript(name)`` or ``reqscript(name)``
 
   Loads a Lua script and returns its environment (i.e. a table of all global

From 7079fe7ea0e42381bddaa72d631d7e415bc1aa04 Mon Sep 17 00:00:00 2001
From: Myk <myk.taylor@gmail.com>
Date: Wed, 14 Sep 2022 10:56:58 -0700
Subject: [PATCH 643/854] rewrap, fix a code syntax error

---
 docs/guides/modding-guide.rst | 204 +++++++++++++++++++---------------
 1 file changed, 114 insertions(+), 90 deletions(-)

diff --git a/docs/guides/modding-guide.rst b/docs/guides/modding-guide.rst
index 57504143a..706f2cd28 100644
--- a/docs/guides/modding-guide.rst
+++ b/docs/guides/modding-guide.rst
@@ -18,21 +18,22 @@ great primer at `lua.org <https://www.lua.org/pil/contents.html>`__.
 Why not just mod the raws?
 --------------------------
 
-It depends on what you want to do. Some mods *are* better to do in just the raws.
-You don't need DFHack to add a new race or modify attributes, for example. However,
-DFHack scripts can do many things that you just can't do in the raws, like make a
-creature that trails smoke. Some things *could* be done in the raws, but writing a
-script is less hacky, easier to maintain, easier to extend, and is not prone to
-side-effects. A great example is adding a syndrome when a reaction is performed.
-If done in the raws, you have to create an exploding boulder to effect the syndrome.
-DFHack scripts can add the syndrome directly and with much more flexibility. In the
-end, complex mods will likely require a mix of raw modding and DFHack scripting.
+It depends on what you want to do. Some mods *are* better to do in just the
+raws. You don't need DFHack to add a new race or modify attributes, for example.
+However, DFHack scripts can do many things that you just can't do in the raws,
+like make a creature that trails smoke. Some things *could* be done in the raws,
+but writing a script is less hacky, easier to maintain, easier to extend, and is
+not prone to side-effects. A great example is adding a syndrome when a reaction
+is performed. If done in the raws, you have to create an exploding boulder to
+apply the syndrome. DFHack scripts can add the syndrome directly and with much
+more flexibility. In the end, complex mods will likely require a mix of raw
+modding and DFHack scripting.
 
 A mod-maker's development environment
 -------------------------------------
 
-While you're writing your mod, you need a place to store your in-development scripts
-that will:
+While you're writing your mod, you need a place to store your in-development
+scripts that will:
 
 - be directly runnable by DFHack
 - not get lost when you upgrade DFHack
@@ -42,17 +43,19 @@ installation (let's call it "/path/to/own-scripts") and do all your script
 development in there.
 
 Inside your DF installation folder, there is a file named
-:file:`dfhack-config/script-paths.txt`. If you add a line like this to that file::
+:file:`dfhack-config/script-paths.txt`. If you add a line like this to that
+file::
 
     +/path/to/own-scripts
 
-Then that directory will be searched when you run DFHack commands from inside the
-game. The ``+`` at the front of the path means to search that directory first,
-before any other script directory (like :file:`hack/scripts` or
-:file:`raw/scripts`). That way, your latest changes will always be used instead of
-older copies that you may have installed in a DF directory.
+Then that directory will be searched when you run DFHack commands from inside
+the game. The ``+`` at the front of the path means to search that directory
+first, before any other script directory (like :file:`hack/scripts` or
+:file:`raw/scripts`). That way, your latest changes will always be used instead
+of older copies that you may have installed in a DF directory.
 
-For scripts with the same name, the `order of precedence <script-paths>` will be:
+For scripts with the same name, the `order of precedence <script-paths>` will
+be:
 
 1. ``own-scripts/``
 2. ``data/save/*/raw/scripts/``
@@ -88,9 +91,9 @@ If ``unit`` is ``nil``, we don't want the script to run anymore::
     end
 
 Now, the field ``sex`` in a unit is an integer, but each integer corresponds to
-a string value ("it", "she", or "he"). We get this value by indexing the bidirectional
-map ``df.pronoun_type``. Indexing the other way, incidentally, with one of the strings,
-will yield its corresponding number. So::
+a string value ("it", "she", or "he"). We get this value by indexing the
+bidirectional map ``df.pronoun_type``. Indexing the other way, incidentally,
+with one of the strings, will yield its corresponding number. So::
 
     local pronounTypeString = df.pronoun_type[unit.sex]
     print(pronounTypeString)
@@ -105,12 +108,12 @@ So how could you have known about the field and type we just used? Well, there
 are two main tools for discovering the various fields in the game's data
 structures. The first is the ``df-structures``
 `repository <https://github.com/DFHack/df-structures>`__ that contains XML files
-describing the contents of the game's structures. These are complete, but difficult
-to read (for a human). The second option is the `gui/gm-editor` script, an
-interactive data explorer. You can run the script while objects like units are
-selected to view the data within them. You can also run ``gui/gm-editor scr`` to
-view the data for the current screen. Press :kbd:`?` while the script is active to
-view help.
+describing the contents of the game's structures. These are complete, but
+difficult to read (for a human). The second option is the `gui/gm-editor`
+script, an interactive data explorer. You can run the script while objects like
+units are selected to view the data within them. You can also run
+``gui/gm-editor scr`` to view the data for the current screen. Press :kbd:`?`
+while the script is active to view help.
 
 Familiarising yourself with the many structs of the game will help with ideas
 immensely, and you can always ask for help in the `right places <support>`.
@@ -121,23 +124,23 @@ Detecting triggers
 The common method for injecting new behaviour into the game is to define a
 callback function and get it called when something interesting happens. DFHack
 provides two libraries for this, ``repeat-util`` and `eventful <eventful-api>`.
-``repeat-util`` is used to run a function once per a configurable number of frames
-(paused or unpaused), ticks (unpaused), in-game days, months, or years. If you
-need to be aware the instant something happens, you'll need to run a check once a
-tick. Be careful not to do this gratuitiously, though, since running that often can
-slow down the game!
+``repeat-util`` is used to run a function once per a configurable number of
+frames (paused or unpaused), ticks (unpaused), in-game days, months, or years.
+If you need to be aware the instant something happens, you'll need to run a
+check once a tick. Be careful not to do this gratuitiously, though, since
+running that often can slow down the game!
 
 ``eventful``, on the other hand, is much more performance-friendly since it will
-only call your callback when a relevant event happens, like a reaction or job being
-completed or a projectile moving.
+only call your callback when a relevant event happens, like a reaction or job
+being completed or a projectile moving.
 
-To get something to run once per tick, we can call ``repeat-util.scheduleEvery()``.
-First, we load the module::
+To get something to run once per tick, we can call
+``repeat-util.scheduleEvery()``. First, we load the module::
 
     local repeatUtil = require('repeat-util')
 
-Both ``repeat-util`` and ``eventful`` require keys for registered callbacks.
-You should use something unique, like your mod name::
+Both ``repeat-util`` and ``eventful`` require keys for registered callbacks. You
+should use something unique, like your mod name::
 
     local modId = "callback-example-mod"
 
@@ -145,8 +148,8 @@ Then, we pass the key, amount of time units between function calls, what the
 time units are, and finally the callback function itself::
 
     repeatUtil.scheduleEvery(modId, 1, "ticks", function()
-        -- Do something like iterating over all active units and check
-        -- for something interesting
+        -- Do something like iterating over all active units and
+        -- check for something interesting
         for _, unit in ipairs(df.global.world.units.active) do
             ...
         end
@@ -162,17 +165,19 @@ the event occurs. So, for example, to print the position of a moving (item)
 projectile::
 
     eventful.onProjItemCheckMovement[modId] = function(projectile)
-        print(projectile.cur_pos.x, projectile.cur_pos.y, projectile.cur_pos.z)
+        print(projectile.cur_pos.x, projectile.cur_pos.y,
+              projectile.cur_pos.z)
     end
 
 Check out the `full list of supported events <eventful-api>` to see what else
 you can react to with ``eventful``.
 
 Now, you may have noticed that you won't be able to register multiple callbacks
-with a single key named after your mod. You can, of course, call all the functions
-you want from a single registed callback. Alternately, you can create multiple
-callbacks using different keys, using your mod ID as a key name prefix. If you do
-register multiple callbacks, though, there are no guarantees about the call order.
+with a single key named after your mod. You can, of course, call all the
+functions you want from a single registed callback. Alternately, you can create
+multiple callbacks using different keys, using your mod ID as a key name prefix.
+If you do register multiple callbacks, though, there are no guarantees about the
+call order.
 
 Custom raw tokens
 -----------------
@@ -229,8 +234,9 @@ First, require the modules we are going to use::
 Now, let's make a callback (we'll be defining the body of this function soon)::
 
     local modId = "siege-crossbow-mod"
-    eventful.onReactionComplete[modId] = function(reaction, reactionProduct,
-    unit, inputItems, inputReagents, outputItems)
+    eventful.onReactionComplete[modId] = function(reaction,
+            reactionProduct, unit, inputItems, inputReagents,
+            outputItems)
 
 First, we check to see if it the reaction that just happened is relevant to this
 callback::
@@ -279,9 +285,11 @@ Let's also make some code to modify the fire rate of our siege crossbow::
             return
         end
 
-        local multiplier = tonumber(customRawTokens.getToken(weapon.subtype, "SIEGE_CROSSBOW_MOD_FIRE_RATE_MULTIPLIER")) or 1
-        firer.counters.think_counter = math.floor(firer.counters.think_counter *
-            multiplier)
+        local multiplier = tonumber(customRawTokens.getToken(
+                weapon.subtype,
+                "SIEGE_CROSSBOW_MOD_FIRE_RATE_MULTIPLIER")) or 1
+        firer.counters.think_counter = math.floor(
+                firer.counters.think_counter * multiplier)
     end
 
 Now, let's see how we could make some "pegasus boots". First, let's define the
@@ -301,26 +309,29 @@ item in the raws::
         [LEATHER]
         [HARD]
         [PEGASUS_BOOTS_MOD_MOVEMENT_TIMER_REDUCTION_PER_TICK:5] custom raw token
-            (you don't have to comment the custom token every time, but it does clarify what it is)
+            (you don't have to comment the custom token every time,
+            but it does clarify what it is)
 
 Then, let's make a ``repeat-util`` callback for once a tick::
 
     repeatUtil.scheduleEvery(modId, 1, "ticks", function()
 
-Let's iterate over every active unit, and for every unit, initialise a variable
-for how much we are going to take from their movement timer and iterate over all
-their worn items: ::
+Let's iterate over every active unit, and for every unit, iterate over their
+worn items to calculate how much we are going to take from their movement
+timer::
 
     for _, unit in ipairs(df.global.world.units.active) do
         local amount = 0
         for _, entry in ipairs(unit.inventory) do
-
-Now, we will add up the effect of all speed-increasing gear and apply it::
-
-        if entry.mode == df.unit_inventory_item.T_mode.Worn then
-            amount = amount + tonumber((customRawTokens.getToken(entry.item, "PEGASUS_BOOTS_MOD_MOVEMENT_TIMER_REDUCTION_PER_TICK")) or 0)
+            if entry.mode == df.unit_inventory_item.T_mode.Worn then
+                local reduction = customRawTokens.getToken(
+                        entry.item,
+                        'PEGASUS_BOOTS_MOD_MOVEMENT_TIMER_REDUCTION_PER_TICK')
+                amount = amount + (tonumber(reduction) or 0)
+            end
         end
     end
+
     -- Subtract amount from movement timer if currently moving
     dfhack.units.addMoveTimer(-amount)
 
@@ -328,11 +339,11 @@ The structure of a full mod
 ---------------------------
 
 Create a folder for mod projects somewhere outside your Dwarf Fortress
-installation directory (e.g. ``/path/to/mymods``) and use your mod IDs as the names
-for the mod folders within it. In the example below, we'll use a mod ID of
-``example-mod``. I'm sure your mods will have more creative names! The ``example-mod``
-mod will be developed in the ``/path/to/mymods/example-mod`` directory and has a basic
-structure that looks like this::
+installation directory (e.g. ``/path/to/mymods``) and use your mod IDs as the
+names for the mod folders within it. In the example below, we'll use a mod ID of
+``example-mod``. I'm sure your mods will have more creative names! The
+``example-mod`` mod will be developed in the ``/path/to/mymods/example-mod``
+directory and has a basic structure that looks like this::
 
     raw/init.d/example-mod.lua
     raw/objects/...
@@ -342,21 +353,23 @@ structure that looks like this::
 
 Let's go through that line by line.
 
-* You'll need a short script in ``raw/init.d/`` to initialise your mod when a save is
-  loaded.
+* You'll need a short (one-line) script in ``raw/init.d/`` to initialise your
+  mod when a save is loaded.
 * Modifications to the game raws (potentially with custom raw tokens) go in
   ``raw/objects/``.
-* A control script in ``raw/scripts/`` that handles enabling and disabling your mod.
-* A subfolder for your mod under ``raw/scripts/`` will contain all the internal scripts
-  used by your mod.
+* A control script in ``raw/scripts/`` that handles enabling and disabling your
+  mod.
+* A subfolder for your mod under ``raw/scripts/`` will contain all the internal
+  scripts and/or modules used by your mod.
 
-It is a good idea to use a version control system to organize changes to your mod code.
-You can create a separate Git repository for each of your mods. The ``README.md`` file
-will be your mod help text when people browse to your online repository.
+It is a good idea to use a version control system to organize changes to your
+mod code. You can create a separate Git repository for each of your mods. The
+``README.md`` file will be your mod help text when people browse to your online
+repository.
 
-Unless you want to install your ``raw`` folder into your DF game folder every time you
-make a change to your scripts, you should add your development scripts directory to your
-script paths in ``dfhack-config/script-paths.txt``::
+Unless you want to install your ``raw`` folder into your DF game folder every
+time you make a change to your scripts, you should add your development scripts
+directory to your script paths in ``dfhack-config/script-paths.txt``::
 
     +/path/to/mymods/example-mod/raw/scripts
 
@@ -364,8 +377,9 @@ Ok, you're all set up! Now, let's take a look at an example
 ``raw/scripts/example-mod.lua`` file::
 
     -- main setup and teardown for example-mod
-    -- this next line indicates that the script supports the "enable" API so you can start
-    -- it by running "enable example-mod" and stop it by running "disable example-mod"
+    -- this next line indicates that the script supports the "enable"
+    -- API so you can start it by running "enable example-mod" and stop
+    -- it by running "disable example-mod"
     --@ enable = true
     
     local usage = [[
@@ -378,7 +392,8 @@ Ok, you're all set up! Now, let's take a look at an example
     local repeatUtil = require('repeat-util')
     local eventful = require('plugins.eventful')
 
-    -- you can reference global values or functions declared in any of your internal scripts
+    -- you can reference global values or functions declared in any of
+    -- your internal scripts
     local moduleA = reqscript('example-mod/module-a')
     local moduleB = reqscript('example-mod/module-b')
     local moduleC = reqscript('example-mod/module-c')
@@ -390,7 +405,8 @@ Ok, you're all set up! Now, let's take a look at an example
     if not dfhack_flags.enable then
         print(usage)
         print()
-        print(('Example mod is currently '):format(enabled and 'enabled' or 'disabled'))
+        print(('Example mod is currently '):format(
+                enabled and 'enabled' or 'disabled'))
         return
     end
 
@@ -400,13 +416,19 @@ Ok, you're all set up! Now, let's take a look at an example
         moduleB.onLoad()
 
         -- register your callbacks
-        repeatUtil.scheduleEvery(modId .. ' every tick', 1, 'ticks', moduleA.every1Tick)
-        repeatUtil.scheduleEvery(modId .. ' 100 frames', 1, 'frames', moduleD.every100Frames)
-
-        eventful.onReactionComplete[modId] = function(reaction, reaction_product, unit, input_items, input_reagents, output_items)
+        repeatUtil.scheduleEvery(modId .. ' every tick', 1, 'ticks',
+                                 moduleA.every1Tick)
+        repeatUtil.scheduleEvery(modId .. ' 100 frames', 1, 'frames',
+                                 moduleD.every100Frames)
+
+        eventful.onReactionComplete[modId] = function(reaction,
+                reaction_product, unit, input_items, input_reagents,
+                output_items)
             -- pass the event's parameters to the listeners
-            moduleB.onReactionComplete(reaction, reaction_product, unit, input_items, input_reagents, output_items)
-            moduleC.onReactionComplete(reaction, reaction_product, unit, input_items, input_reagents, output_items)
+            moduleB.onReactionComplete(reaction, reaction_product,
+                    unit, input_items, input_reagents, output_items)
+            moduleC.onReactionComplete(reaction, reaction_product,
+                    unit, input_items, input_reagents, output_items)
         end
 
         eventful.onProjItemCheckMovement[modId] = moduleD.onProjItemCheckMovement
@@ -444,8 +466,10 @@ Inside ``raw/scripts/example-mod/module-a.lua`` you could have code like this::
         -- do initialization here
     end
 
-    local function usedByOnTick(unit) -- local variables are not exported
-        -- this is an internal function: local functions/variables are not exported
+    -- this is an internal function: local functions/variables
+    -- are not exported
+    local function usedByOnTick(unit)
+        -- ...
     end
 
     function onTick() -- exported
@@ -454,6 +478,6 @@ Inside ``raw/scripts/example-mod/module-a.lua`` you could have code like this::
         end
     end
 
-The `reqscript` function reloads scripts that have changed, so you can modify your
-scripts while DF is running and just disable/enable your mod to load the changes into
-your ongoing game!
+The `reqscript` function reloads scripts that have changed, so you can modify
+your scripts while DF is running and just disable/enable your mod to load the
+changes into your ongoing game!

From b90126600f19c075284b69ef25e2794de8200d76 Mon Sep 17 00:00:00 2001
From: Myk <myk.taylor@gmail.com>
Date: Wed, 14 Sep 2022 11:00:26 -0700
Subject: [PATCH 644/854] whiiittespaaaace!!!

---
 docs/guides/modding-guide.rst | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/guides/modding-guide.rst b/docs/guides/modding-guide.rst
index 706f2cd28..de07136b3 100644
--- a/docs/guides/modding-guide.rst
+++ b/docs/guides/modding-guide.rst
@@ -381,11 +381,11 @@ Ok, you're all set up! Now, let's take a look at an example
     -- API so you can start it by running "enable example-mod" and stop
     -- it by running "disable example-mod"
     --@ enable = true
-    
+
     local usage = [[
     Usage
     -----
-    
+
         enable example-mod
         disable example-mod
     ]]
@@ -398,7 +398,7 @@ Ok, you're all set up! Now, let's take a look at an example
     local moduleB = reqscript('example-mod/module-b')
     local moduleC = reqscript('example-mod/module-c')
     local moduleD = reqscript('example-mod/module-d')
-    
+
     enabled = enabled or false
     local modId = 'example-mod'
 

From d7142749218a6c14d0b7d0aac37bc7883ae63bd1 Mon Sep 17 00:00:00 2001
From: Myk <myk.taylor@gmail.com>
Date: Wed, 14 Sep 2022 11:24:27 -0700
Subject: [PATCH 645/854] fix reqscript link name

---
 docs/guides/modding-guide.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/guides/modding-guide.rst b/docs/guides/modding-guide.rst
index de07136b3..3c087c80a 100644
--- a/docs/guides/modding-guide.rst
+++ b/docs/guides/modding-guide.rst
@@ -478,6 +478,6 @@ Inside ``raw/scripts/example-mod/module-a.lua`` you could have code like this::
         end
     end
 
-The `reqscript` function reloads scripts that have changed, so you can modify
+The `reqscript <reqscript>` function reloads scripts that have changed, so you can modify
 your scripts while DF is running and just disable/enable your mod to load the
 changes into your ongoing game!

From ee123a24615cff76918033ad2f082a39efa95132 Mon Sep 17 00:00:00 2001
From: Tachytaenius <henryfthomson@gmail.com>
Date: Wed, 14 Sep 2022 19:41:45 +0100
Subject: [PATCH 646/854] Update modding-guide.rst

Add missing slashes and change the wording to be more consistent in one part
---
 docs/guides/modding-guide.rst | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/docs/guides/modding-guide.rst b/docs/guides/modding-guide.rst
index 3c087c80a..5b043c02c 100644
--- a/docs/guides/modding-guide.rst
+++ b/docs/guides/modding-guide.rst
@@ -339,10 +339,10 @@ The structure of a full mod
 ---------------------------
 
 Create a folder for mod projects somewhere outside your Dwarf Fortress
-installation directory (e.g. ``/path/to/mymods``) and use your mod IDs as the
+installation directory (e.g. ``/path/to/mymods/``) and use your mod IDs as the
 names for the mod folders within it. In the example below, we'll use a mod ID of
 ``example-mod``. I'm sure your mods will have more creative names! The
-``example-mod`` mod will be developed in the ``/path/to/mymods/example-mod``
+``example-mod`` mod will be developed in the ``/path/to/mymods/example-mod/``
 directory and has a basic structure that looks like this::
 
     raw/init.d/example-mod.lua
@@ -353,7 +353,7 @@ directory and has a basic structure that looks like this::
 
 Let's go through that line by line.
 
-* You'll need a short (one-line) script in ``raw/init.d/`` to initialise your
+* A short (one-line) script in ``raw/init.d/`` to initialise your
   mod when a save is loaded.
 * Modifications to the game raws (potentially with custom raw tokens) go in
   ``raw/objects/``.
@@ -367,11 +367,11 @@ mod code. You can create a separate Git repository for each of your mods. The
 ``README.md`` file will be your mod help text when people browse to your online
 repository.
 
-Unless you want to install your ``raw`` folder into your DF game folder every
+Unless you want to install your ``raw/`` folder into your DF game folder every
 time you make a change to your scripts, you should add your development scripts
 directory to your script paths in ``dfhack-config/script-paths.txt``::
 
-    +/path/to/mymods/example-mod/raw/scripts
+    +/path/to/mymods/example-mod/raw/scripts/
 
 Ok, you're all set up! Now, let's take a look at an example
 ``raw/scripts/example-mod.lua`` file::

From 20a55299dd92681aed24cc8f3afc9da509524e58 Mon Sep 17 00:00:00 2001
From: Tachytaenius <henryfthomson@gmail.com>
Date: Wed, 14 Sep 2022 20:04:50 +0100
Subject: [PATCH 647/854] Update modding-guide.rst

Add some potentially helpful comments to explain an inconsistenecy
---
 docs/guides/modding-guide.rst | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/docs/guides/modding-guide.rst b/docs/guides/modding-guide.rst
index 5b043c02c..6ec80eed1 100644
--- a/docs/guides/modding-guide.rst
+++ b/docs/guides/modding-guide.rst
@@ -421,6 +421,7 @@ Ok, you're all set up! Now, let's take a look at an example
         repeatUtil.scheduleEvery(modId .. ' 100 frames', 1, 'frames',
                                  moduleD.every100Frames)
 
+        -- multiple functions in the same callback
         eventful.onReactionComplete[modId] = function(reaction,
                 reaction_product, unit, input_items, input_reagents,
                 output_items)
@@ -431,6 +432,8 @@ Ok, you're all set up! Now, let's take a look at an example
                     unit, input_items, input_reagents, output_items)
         end
 
+        -- one function per callback (you can put them in the
+        -- above format if you prefer)
         eventful.onProjItemCheckMovement[modId] = moduleD.onProjItemCheckMovement
         eventful.onProjUnitCheckMovement[modId] = moduleD.onProjUnitCheckMovement
 

From d1acd45372e4d31516a1fe4767a034c49a62f3b5 Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Wed, 14 Sep 2022 13:19:10 -0700
Subject: [PATCH 648/854] add syntax highlighting to code blocks

---
 docs/guides/modding-guide.rst | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/docs/guides/modding-guide.rst b/docs/guides/modding-guide.rst
index 6ec80eed1..fa0510290 100644
--- a/docs/guides/modding-guide.rst
+++ b/docs/guides/modding-guide.rst
@@ -3,6 +3,8 @@
 DFHack modding guide
 ====================
 
+.. highlight:: lua
+
 What is the difference between a script and a mod?
 --------------------------------------------------
 
@@ -182,6 +184,8 @@ call order.
 Custom raw tokens
 -----------------
 
+.. highlight:: none
+
 In this section, we are going to use `custom raw tokens <custom-raw-tokens>`
 applied to a reaction to transfer the material of a reagent to a product as a
 handle improvement (like on artifact buckets), and then we are going to see how
@@ -226,6 +230,8 @@ So, we are going to use the ``eventful`` module to make it so that (after the
 script is run) when this crossbow is crafted, it will have two handles, each
 with the material given by the block reagents.
 
+.. highlight:: lua
+
 First, require the modules we are going to use::
 
     local eventful = require("plugins.eventful")
@@ -292,6 +298,8 @@ Let's also make some code to modify the fire rate of our siege crossbow::
                 firer.counters.think_counter * multiplier)
     end
 
+.. highlight:: none
+
 Now, let's see how we could make some "pegasus boots". First, let's define the
 item in the raws::
 
@@ -312,6 +320,8 @@ item in the raws::
             (you don't have to comment the custom token every time,
             but it does clarify what it is)
 
+.. highlight:: lua
+
 Then, let's make a ``repeat-util`` callback for once a tick::
 
     repeatUtil.scheduleEvery(modId, 1, "ticks", function()

From 8a36d5607b29823630279866c3c34925131e3870 Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Wed, 14 Sep 2022 13:19:26 -0700
Subject: [PATCH 649/854] lcase section headers

---
 docs/Authors.rst                        |  2 +-
 docs/Compile.rst                        |  4 ++--
 docs/Core.rst                           | 14 +++++++-------
 docs/Documentation.rst                  |  2 +-
 docs/Introduction.rst                   |  2 +-
 docs/Remote.rst                         |  4 +---
 docs/api/index.rst                      |  2 +-
 docs/guides/examples-guide.rst          |  2 +-
 docs/guides/quickfort-alias-guide.rst   |  2 +-
 docs/guides/quickfort-library-guide.rst |  6 +++---
 docs/guides/quickfort-user-guide.rst    |  4 ++--
 docs/index-dev.rst                      |  2 +-
 12 files changed, 22 insertions(+), 24 deletions(-)

diff --git a/docs/Authors.rst b/docs/Authors.rst
index 2369d393d..280594674 100644
--- a/docs/Authors.rst
+++ b/docs/Authors.rst
@@ -1,4 +1,4 @@
-List of Authors
+List of authors
 ===============
 The following is a list of people who have contributed to DFHack, in
 alphabetical order.
diff --git a/docs/Compile.rst b/docs/Compile.rst
index 85ec50344..0f3880816 100644
--- a/docs/Compile.rst
+++ b/docs/Compile.rst
@@ -40,8 +40,8 @@ This will check out the code on the default branch of the GitHub repo, currently
 ``develop``, which may be unstable. If you want code for the latest stable
 release, you can check out the ``master`` branch instead::
 
-  git checkout master
-  git submodule update
+    git checkout master
+    git submodule update
 
 In general, a single DFHack clone is suitable for development - most Git
 operations such as switching branches can be done on an existing clone. If you
diff --git a/docs/Core.rst b/docs/Core.rst
index 09ae2577d..e03a7fcba 100644
--- a/docs/Core.rst
+++ b/docs/Core.rst
@@ -9,7 +9,7 @@ DFHack Core
   :depth: 2
 
 
-Command Implementation
+Command implementation
 ======================
 DFHack commands can be implemented in any of three ways:
 
@@ -28,7 +28,7 @@ DFHack commands can be implemented in any of three ways:
 
 All tools distributed with DFHack are documented `here <genindex>`.
 
-Using DFHack Commands
+Using DFHack commands
 =====================
 DFHack commands can be executed in a number of ways:
 
@@ -38,7 +38,7 @@ DFHack commands can be executed in a number of ways:
 #. From one of several `init-files`, automatically
 #. Using `script` to run a batch of commands from a file
 
-The DFHack Console
+The DFHack console
 ------------------
 The command line has some nice line editing capabilities, including history
 that's preserved between different runs of DF - use :kbd:`↑` and :kbd:`↓`
@@ -115,7 +115,7 @@ second (Windows) example uses `kill-lua` to stop a Lua script.
 
 .. _dfhack-config:
 
-Configuration Files
+Configuration files
 ===================
 
 Most DFHack settings can be changed by modifying files in the ``dfhack-config``
@@ -125,7 +125,7 @@ necessary.
 
 .. _init-files:
 
-Init Files
+Init files
 ----------
 
 .. contents::
@@ -260,7 +260,7 @@ modified programmatically at any time through the `Lua API <lua-api-internal>`.
 
 .. _env-vars:
 
-Environment Variables
+Environment variables
 =====================
 
 DFHack's behavior can be adjusted with some environment variables. For example,
@@ -306,7 +306,7 @@ Other (non-DFHack-specific) variables that affect DFHack:
   sensitive), ``DF2CONSOLE()`` will produce UTF-8-encoded text. Note that this
   should be the case in most UTF-8-capable \*nix terminal emulators already.
 
-Miscellaneous Notes
+Miscellaneous notes
 ===================
 This section is for odd but important notes that don't fit anywhere else.
 
diff --git a/docs/Documentation.rst b/docs/Documentation.rst
index 4109a81c7..13ae58dca 100644
--- a/docs/Documentation.rst
+++ b/docs/Documentation.rst
@@ -1,7 +1,7 @@
 .. _documentation:
 
 ###########################
-DFHack Documentation System
+DFHack documentation system
 ###########################
 
 
diff --git a/docs/Introduction.rst b/docs/Introduction.rst
index ad24f8f43..d90983d8c 100644
--- a/docs/Introduction.rst
+++ b/docs/Introduction.rst
@@ -1,7 +1,7 @@
 .. _introduction:
 
 #########################
-Introduction and Overview
+Introduction and overview
 #########################
 
 DFHack is a Dwarf Fortress memory access library, distributed with
diff --git a/docs/Remote.rst b/docs/Remote.rst
index de741f66a..6f276cdb6 100644
--- a/docs/Remote.rst
+++ b/docs/Remote.rst
@@ -1,7 +1,7 @@
 .. _remote:
 
 =======================
-DFHack Remote Interface
+DFHack remote interface
 =======================
 
 DFHack provides a remote access interface that external tools can connect to and
@@ -103,8 +103,6 @@ ID   Method       Input                           Output
  1   RunCommand   dfproto.CoreRunCommandRequest   dfproto.EmptyMessage
 ===  ============ =============================== =======================
 
-
-
 Conversation flow
 -----------------
 
diff --git a/docs/api/index.rst b/docs/api/index.rst
index 1fe03e9a8..6afa9d6d4 100644
--- a/docs/api/index.rst
+++ b/docs/api/index.rst
@@ -1,5 +1,5 @@
 ====================
-DFHack API Reference
+DFHack API reference
 ====================
 
 .. toctree::
diff --git a/docs/guides/examples-guide.rst b/docs/guides/examples-guide.rst
index 74f94c20b..bcb7c77ec 100644
--- a/docs/guides/examples-guide.rst
+++ b/docs/guides/examples-guide.rst
@@ -1,7 +1,7 @@
 .. _config-examples-guide:
 .. _dfhack-examples-guide:
 
-DFHack Config File Examples
+DFHack config file examples
 ===========================
 
 The :source:`hack/examples <data/examples>` folder contains ready-to-use
diff --git a/docs/guides/quickfort-alias-guide.rst b/docs/guides/quickfort-alias-guide.rst
index d4be8aecd..50e5d7650 100644
--- a/docs/guides/quickfort-alias-guide.rst
+++ b/docs/guides/quickfort-alias-guide.rst
@@ -1,6 +1,6 @@
 .. _quickfort-alias-guide:
 
-Quickfort Keystroke Alias Reference
+Quickfort keystroke alias reference
 ===================================
 
 Aliases allow you to use simple words to represent complicated key sequences
diff --git a/docs/guides/quickfort-library-guide.rst b/docs/guides/quickfort-library-guide.rst
index de5409ab3..86c82ac60 100644
--- a/docs/guides/quickfort-library-guide.rst
+++ b/docs/guides/quickfort-library-guide.rst
@@ -1,7 +1,7 @@
 .. _blueprint-library-guide:
 .. _quickfort-library-guide:
 
-Quickfort Blueprint Library
+Quickfort blueprint library
 ===========================
 
 This guide contains a high-level overview of the blueprints available in the
@@ -194,7 +194,7 @@ Extra blueprints that are useful in specific situations.
 - :source:`library/embark.csv <data/blueprints/library/embark.csv>`
 - :source:`library/pump_stack.csv <data/blueprints/library/pump_stack.csv>`
 
-Light Aquifer Tap
+Light aquifer tap
 ~~~~~~~~~~~~~~~~~
 
 The aquifer tap helps you create a safe, everlasting source of fresh water from
@@ -216,7 +216,7 @@ blueprint that builds important starting workshops (mason, carpenter, mechanic,
 and craftsdwarf) and a ``#place`` blueprint that lays down a pattern of useful
 starting stockpiles.
 
-Pump Stack
+Pump stack
 ~~~~~~~~~~
 
 The pump stack blueprints help you move water and magma up to more convenient
diff --git a/docs/guides/quickfort-user-guide.rst b/docs/guides/quickfort-user-guide.rst
index 9c7d3ed44..693ab033c 100644
--- a/docs/guides/quickfort-user-guide.rst
+++ b/docs/guides/quickfort-user-guide.rst
@@ -1,8 +1,8 @@
 .. _quickfort-blueprint-guide:
 .. _quickfort-user-guide:
 
-Quickfort Blueprint Editing Guide
-=================================
+Quickfort blueprint creation guide
+==================================
 
 `Quickfort <quickfort>` is a DFHack script that helps you build fortresses from
 "blueprint" .csv and .xlsx files. Many applications exist to edit these files,
diff --git a/docs/index-dev.rst b/docs/index-dev.rst
index 5a03cbedf..0e3e673d3 100644
--- a/docs/index-dev.rst
+++ b/docs/index-dev.rst
@@ -1,4 +1,4 @@
-========================
+   ========================
 DFHack Development Guide
 ========================
 

From 9117d1bef661d5d3df01e1ed45205bd8bf19adb7 Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Wed, 14 Sep 2022 13:21:16 -0700
Subject: [PATCH 650/854] fix casing and spacing in dev guide header

---
 docs/index-dev.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/index-dev.rst b/docs/index-dev.rst
index 0e3e673d3..38c458bfe 100644
--- a/docs/index-dev.rst
+++ b/docs/index-dev.rst
@@ -1,5 +1,5 @@
-   ========================
-DFHack Development Guide
+========================
+DFHack development guide
 ========================
 
 These are pages relevant to people developing for DFHack.

From 20919a8bb192c561ed7a6d2e98d64cc88c517034 Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Wed, 14 Sep 2022 13:33:24 -0700
Subject: [PATCH 651/854] missed two upcased headers

---
 docs/NEWS-dev.rst     | 2 +-
 docs/guides/index.rst | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/NEWS-dev.rst b/docs/NEWS-dev.rst
index f77737176..f77b1b4f5 100644
--- a/docs/NEWS-dev.rst
+++ b/docs/NEWS-dev.rst
@@ -5,7 +5,7 @@
 .. _dev-changelog:
 
 #####################
-Development Changelog
+Development changelog
 #####################
 
 This file contains changes grouped by the release (stable or development) in
diff --git a/docs/guides/index.rst b/docs/guides/index.rst
index 161b1bb68..96c5688d2 100644
--- a/docs/guides/index.rst
+++ b/docs/guides/index.rst
@@ -1,5 +1,5 @@
 ===========
-User Guides
+User guides
 ===========
 
 These pages are detailed guides covering DFHack tools.

From 50772b31384f590c8607d3c116268c416a4a93d2 Mon Sep 17 00:00:00 2001
From: DFHack-Urist via GitHub Actions
 <63161697+DFHack-Urist@users.noreply.github.com>
Date: Thu, 15 Sep 2022 07:31:16 +0000
Subject: [PATCH 652/854] Auto-update submodules

scripts: master
---
 scripts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts b/scripts
index aadbe0486..d7b64afc9 160000
--- a/scripts
+++ b/scripts
@@ -1 +1 @@
-Subproject commit aadbe04860483ffbfcb4ce7e14fbb1c81bfb757a
+Subproject commit d7b64afc9fdc80b7c1075d5f87dc4512def457a6

From c1154085cf6795d3cd7f72e4566c6356659a82d0 Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Thu, 15 Sep 2022 23:03:34 -0400
Subject: [PATCH 653/854] Fix tool name auto-detection for scripts in
 subfolders

---
 docs/sphinx_extensions/dfhack/tool_docs.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/docs/sphinx_extensions/dfhack/tool_docs.py b/docs/sphinx_extensions/dfhack/tool_docs.py
index 178303744..c7883e14c 100644
--- a/docs/sphinx_extensions/dfhack/tool_docs.py
+++ b/docs/sphinx_extensions/dfhack/tool_docs.py
@@ -114,7 +114,11 @@ class DFHackToolDirectiveBase(sphinx.directives.ObjectDescription):
         if self.arguments:
             return self.arguments[0]
         else:
-            return self.env.docname.split('/')[-1]
+            parts = self.env.docname.split('/')
+            if 'tools' in parts:
+                return '/'.join(parts[parts.index('tools') + 1:])
+            else:
+                return parts[-1]
 
     @staticmethod
     def wrap_box(*children: List[nodes.Node]) -> nodes.Admonition:

From 170d7b9b519136c601528d09925912d47f9f7115 Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Fri, 16 Sep 2022 15:24:18 -0700
Subject: [PATCH 654/854] typo fix in infiniteSky docs

---
 docs/plugins/infiniteSky.rst | 2 +-
 plugins/infiniteSky.cpp      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/plugins/infiniteSky.rst b/docs/plugins/infiniteSky.rst
index f9a68a05a..c15f87e26 100644
--- a/docs/plugins/infiniteSky.rst
+++ b/docs/plugins/infiniteSky.rst
@@ -2,7 +2,7 @@ infiniteSky
 ===========
 
 .. dfhack-tool::
-    :summary: Automatically allocates new z-levels of sky
+    :summary: Automatically allocate new z-levels of sky
     :tags: fort design map
 
 If enabled, this plugin will automatically allocate new z-levels of sky at the
diff --git a/plugins/infiniteSky.cpp b/plugins/infiniteSky.cpp
index bc51f06f1..b477700f4 100644
--- a/plugins/infiniteSky.cpp
+++ b/plugins/infiniteSky.cpp
@@ -32,7 +32,7 @@ DFhackCExport command_result plugin_init ( color_ostream &out, std::vector <Plug
 {
     commands.push_back(PluginCommand(
         "infiniteSky",
-        "Creates new sky levels on request, or as needed.",
+        "Create new sky levels on request, or as needed.",
         infiniteSky));
     return CR_OK;
 }

From 6fff83de5af3b8f233f19f5e49717ae73227e3f3 Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Fri, 16 Sep 2022 15:24:33 -0700
Subject: [PATCH 655/854] fix EditField rendering with TWBT

---
 library/lua/gui/widgets.lua | 1 +
 1 file changed, 1 insertion(+)

diff --git a/library/lua/gui/widgets.lua b/library/lua/gui/widgets.lua
index 0069a1769..7076570b9 100644
--- a/library/lua/gui/widgets.lua
+++ b/library/lua/gui/widgets.lua
@@ -263,6 +263,7 @@ function EditField:onRenderBody(dc)
                                 end_pos == #txt and '' or string.char(26))
     end
     dc:advance(self.text_offset):string(txt)
+    dc:string((' '):rep(dc.clip_x2 - dc.x))
 end
 
 function EditField:onInput(keys)

From b7357204e654bc13befd1c09c0f7fb577dd3ad08 Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Fri, 16 Sep 2022 21:55:49 -0700
Subject: [PATCH 656/854] ensure artifacts dir exists for docs build

---
 docs/build.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/build.py b/docs/build.py
index 6a63ed59e..bfb6780b2 100755
--- a/docs/build.py
+++ b/docs/build.py
@@ -16,6 +16,7 @@ class SphinxOutputFormat:
     def args(self):
         output_dir = os.path.join('docs', self.name)
         artifacts_dir = os.path.join('build', 'docs', self.name)  # for artifacts not part of the final documentation
+        os.makedirs(artifacts_dir, mode=0o755, exist_ok=True)
         return [
             *self.pre_args,
             '.',  # source dir

From ad7de34d3f1247e87ad46c2e373099c948ce7145 Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Fri, 16 Sep 2022 12:15:01 -0700
Subject: [PATCH 657/854] add clickable overlay to title screen

---
 plugins/CMakeLists.txt |  1 +
 plugins/overlay.cpp    | 80 ++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 81 insertions(+)
 create mode 100644 plugins/overlay.cpp

diff --git a/plugins/CMakeLists.txt b/plugins/CMakeLists.txt
index 49e704b75..dc341b39d 100644
--- a/plugins/CMakeLists.txt
+++ b/plugins/CMakeLists.txt
@@ -144,6 +144,7 @@ if(BUILD_SUPPORTED)
     dfhack_plugin(mousequery mousequery.cpp)
     dfhack_plugin(nestboxes nestboxes.cpp)
     dfhack_plugin(orders orders.cpp LINK_LIBRARIES jsoncpp_static)
+    dfhack_plugin(overlay overlay.cpp)
     dfhack_plugin(pathable pathable.cpp LINK_LIBRARIES lua)
     dfhack_plugin(petcapRemover petcapRemover.cpp)
     dfhack_plugin(plants plants.cpp)
diff --git a/plugins/overlay.cpp b/plugins/overlay.cpp
new file mode 100644
index 000000000..42241aec6
--- /dev/null
+++ b/plugins/overlay.cpp
@@ -0,0 +1,80 @@
+#include "df/viewscreen_titlest.h"
+
+#include "modules/Gui.h"
+
+#include "PluginManager.h"
+#include "VTableInterpose.h"
+#include "uicommon.h"
+
+using namespace DFHack;
+
+DFHACK_PLUGIN("overlay");
+DFHACK_PLUGIN_IS_ENABLED(is_enabled);
+REQUIRE_GLOBAL(enabler);
+REQUIRE_GLOBAL(gps);
+
+static const std::string button_text = "[ DFHack Launcher ]";
+static bool clicked = false;
+
+static bool handle_click() {
+    int32_t x, y;
+    if (!enabler->tracking_on || !enabler->mouse_lbut || clicked ||
+            !Gui::getMousePos(x, y))
+        return false;
+    if (y == gps->dimy - 1 && x >= 1 && (size_t)x <= button_text.size()) {
+        clicked = true;
+        Core::getInstance().setHotkeyCmd("gui/launcher");
+        return true;
+    }
+    return false;
+}
+
+static void draw_widgets() {
+    int x = 1;
+    int y = gps->dimy - 1;
+    OutputString(COLOR_GREEN, x, y, button_text);
+}
+
+struct title_hook : df::viewscreen_titlest {
+    typedef df::viewscreen_titlest interpose_base;
+
+    DEFINE_VMETHOD_INTERPOSE(void, feed, (set<df::interface_key> *input)) {
+        if (!handle_click())
+            INTERPOSE_NEXT(feed)(input);
+    }
+    DEFINE_VMETHOD_INTERPOSE(void, render, ()) {
+        INTERPOSE_NEXT(render)();
+        draw_widgets();
+    }
+};
+IMPLEMENT_VMETHOD_INTERPOSE(title_hook, feed);
+IMPLEMENT_VMETHOD_INTERPOSE(title_hook, render);
+
+DFhackCExport command_result plugin_onstatechange(color_ostream &,
+                                                  state_change_event evt) {
+    if (evt == SC_VIEWSCREEN_CHANGED) {
+        clicked = false;
+    }
+    return CR_OK;
+}
+
+DFhackCExport command_result plugin_enable(color_ostream &, bool enable) {
+    if (is_enabled == enable)
+        return CR_OK;
+    if (enable != is_enabled) {
+        if (!INTERPOSE_HOOK(title_hook, feed).apply(enable) ||
+            !INTERPOSE_HOOK(title_hook, render).apply(enable))
+            return CR_FAILURE;
+
+        is_enabled = enable;
+    }
+    return CR_OK;
+}
+
+DFhackCExport command_result plugin_init(color_ostream &out, std::vector <PluginCommand> &) {
+    return plugin_enable(out, true);
+}
+
+DFhackCExport command_result plugin_shutdown(color_ostream &out) {
+    return plugin_enable(out, false);
+}

From 8ab2f063df3a32b475996ef5e0e8bc10c3e70463 Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Fri, 16 Sep 2022 13:38:05 -0700
Subject: [PATCH 658/854] hook remaining df screens

---
 plugins/overlay.cpp | 267 +++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 261 insertions(+), 6 deletions(-)

diff --git a/plugins/overlay.cpp b/plugins/overlay.cpp
index 42241aec6..9a5c625ab 100644
--- a/plugins/overlay.cpp
+++ b/plugins/overlay.cpp
@@ -1,4 +1,87 @@
+#include "df/viewscreen_adopt_regionst.h"
+#include "df/viewscreen_adventure_logst.h"
+#include "df/viewscreen_announcelistst.h"
+#include "df/viewscreen_assign_display_itemst.h"
+#include "df/viewscreen_barterst.h"
+#include "df/viewscreen_buildinglistst.h"
+#include "df/viewscreen_buildingst.h"
+#include "df/viewscreen_choose_start_sitest.h"
+#include "df/viewscreen_civlistst.h"
+#include "df/viewscreen_counterintelligencest.h"
+#include "df/viewscreen_createquotast.h"
+#include "df/viewscreen_customize_unitst.h"
+#include "df/viewscreen_dungeonmodest.h"
+#include "df/viewscreen_dungeon_monsterstatusst.h"
+#include "df/viewscreen_dungeon_wrestlest.h"
+#include "df/viewscreen_dwarfmodest.h"
+#include "df/viewscreen_entityst.h"
+#include "df/viewscreen_export_graphical_mapst.h"
+#include "df/viewscreen_export_regionst.h"
+#include "df/viewscreen_game_cleanerst.h"
+#include "df/viewscreen_image_creator_mode.h"
+#include "df/viewscreen_image_creatorst.h"
+#include "df/viewscreen_itemst.h"
+#include "df/viewscreen_joblistst.h"
+#include "df/viewscreen_jobmanagementst.h"
+#include "df/viewscreen_jobst.h"
+#include "df/viewscreen_justicest.h"
+#include "df/viewscreen_kitchenpref_page.h"
+#include "df/viewscreen_kitchenprefst.h"
+#include "df/viewscreen_layer_arena_creaturest.h"
+#include "df/viewscreen_layer_assigntradest.h"
+#include "df/viewscreen_layer_choose_language_namest.h"
+#include "df/viewscreen_layer_currencyst.h"
+#include "df/viewscreen_layer_export_play_mapst.h"
+#include "df/viewscreen_layer.h"
+#include "df/viewscreen_layer_militaryst.h"
+#include "df/viewscreen_layer_musicsoundst.h"
+#include "df/viewscreen_layer_noblelistst.h"
+#include "df/viewscreen_layer_overall_healthst.h"
+#include "df/viewscreen_layer_reactionst.h"
+#include "df/viewscreen_layer_squad_schedulest.h"
+#include "df/viewscreen_layer_stockpilest.h"
+#include "df/viewscreen_layer_stone_restrictionst.h"
+#include "df/viewscreen_layer_unit_actionst.h"
+#include "df/viewscreen_layer_unit_healthst.h"
+#include "df/viewscreen_layer_unit_relationshipst.h"
+#include "df/viewscreen_layer_world_gen_param_presetst.h"
+#include "df/viewscreen_layer_world_gen_paramst.h"
+#include "df/viewscreen_legendsst.h"
+#include "df/viewscreen_loadgamest.h"
+#include "df/viewscreen_locationsst.h"
+#include "df/viewscreen_meetingst.h"
+#include "df/viewscreen_movieplayerst.h"
+#include "df/viewscreen_new_regionst.h"
+#include "df/viewscreen_noblest.h"
+#include "df/viewscreen_optionst.h"
+#include "df/viewscreen_overallstatusst.h"
+#include "df/viewscreen_petitionsst.h"
+#include "df/viewscreen_petst.h"
+#include "df/viewscreen_pricest.h"
+#include "df/viewscreen_reportlistst.h"
+#include "df/viewscreen_requestagreementst.h"
+#include "df/viewscreen_savegamest.h"
+#include "df/viewscreen_selectitemst.h"
+#include "df/viewscreen_setupadventurest.h"
+#include "df/viewscreen_setupdwarfgamest.h"
+#include "df/viewscreen_storesst.h"
+#include "df/viewscreen_textviewerst.h"
 #include "df/viewscreen_titlest.h"
+#include "df/viewscreen_topicmeeting_fill_land_holder_positionsst.h"
+#include "df/viewscreen_topicmeetingst.h"
+#include "df/viewscreen_topicmeeting_takerequestsst.h"
+#include "df/viewscreen_tradeagreementst.h"
+#include "df/viewscreen_tradegoodsst.h"
+#include "df/viewscreen_tradelistst.h"
+#include "df/viewscreen_treasurelistst.h"
+#include "df/viewscreen_unitlist_page.h"
+#include "df/viewscreen_unitlistst.h"
+#include "df/viewscreen_unitst.h"
+#include "df/viewscreen_update_regionst.h"
+#include "df/viewscreen_wagesst.h"
+#include "df/viewscreen_workquota_conditionst.h"
+#include "df/viewscreen_workquota_detailsst.h"
+#include "df/viewscreen_workshop_profilest.h"
 
 #include "modules/Gui.h"
 
@@ -35,8 +118,9 @@ static void draw_widgets() {
     OutputString(COLOR_GREEN, x, y, button_text);
 }
 
-struct title_hook : df::viewscreen_titlest {
-    typedef df::viewscreen_titlest interpose_base;
+template<class T>
+struct viewscreen_overlay : T {
+    typedef T interpose_base;
 
     DEFINE_VMETHOD_INTERPOSE(void, feed, (set<df::interface_key> *input)) {
         if (!handle_click())
@@ -47,8 +131,94 @@ struct title_hook : df::viewscreen_titlest {
         draw_widgets();
     }
 };
-IMPLEMENT_VMETHOD_INTERPOSE(title_hook, feed);
-IMPLEMENT_VMETHOD_INTERPOSE(title_hook, render);
+
+#define IMPLEMENT_HOOKS(screen) \
+    typedef viewscreen_overlay<df::viewscreen_##screen##st> screen##_overlay; \
+    template<> IMPLEMENT_VMETHOD_INTERPOSE(screen##_overlay, feed); \
+    template<> IMPLEMENT_VMETHOD_INTERPOSE(screen##_overlay, render);
+
+IMPLEMENT_HOOKS(adopt_region)
+IMPLEMENT_HOOKS(adventure_log)
+IMPLEMENT_HOOKS(announcelist)
+IMPLEMENT_HOOKS(assign_display_item)
+IMPLEMENT_HOOKS(barter)
+IMPLEMENT_HOOKS(buildinglist)
+IMPLEMENT_HOOKS(building)
+IMPLEMENT_HOOKS(choose_start_site)
+IMPLEMENT_HOOKS(civlist)
+IMPLEMENT_HOOKS(counterintelligence)
+IMPLEMENT_HOOKS(createquota)
+IMPLEMENT_HOOKS(customize_unit)
+IMPLEMENT_HOOKS(dungeonmode)
+IMPLEMENT_HOOKS(dungeon_monsterstatus)
+IMPLEMENT_HOOKS(dungeon_wrestle)
+IMPLEMENT_HOOKS(dwarfmode)
+IMPLEMENT_HOOKS(entity)
+IMPLEMENT_HOOKS(export_graphical_map)
+IMPLEMENT_HOOKS(export_region)
+IMPLEMENT_HOOKS(game_cleaner)
+IMPLEMENT_HOOKS(image_creator)
+IMPLEMENT_HOOKS(item)
+IMPLEMENT_HOOKS(joblist)
+IMPLEMENT_HOOKS(jobmanagement)
+IMPLEMENT_HOOKS(job)
+IMPLEMENT_HOOKS(justice)
+IMPLEMENT_HOOKS(kitchenpref)
+IMPLEMENT_HOOKS(layer_arena_creature)
+IMPLEMENT_HOOKS(layer_assigntrade)
+IMPLEMENT_HOOKS(layer_choose_language_name)
+IMPLEMENT_HOOKS(layer_currency)
+IMPLEMENT_HOOKS(layer_export_play_map)
+IMPLEMENT_HOOKS(layer_military)
+IMPLEMENT_HOOKS(layer_musicsound)
+IMPLEMENT_HOOKS(layer_noblelist)
+IMPLEMENT_HOOKS(layer_overall_health)
+IMPLEMENT_HOOKS(layer_reaction)
+IMPLEMENT_HOOKS(layer_squad_schedule)
+IMPLEMENT_HOOKS(layer_stockpile)
+IMPLEMENT_HOOKS(layer_stone_restriction)
+IMPLEMENT_HOOKS(layer_unit_action)
+IMPLEMENT_HOOKS(layer_unit_health)
+IMPLEMENT_HOOKS(layer_unit_relationship)
+IMPLEMENT_HOOKS(layer_world_gen_param_preset)
+IMPLEMENT_HOOKS(layer_world_gen_param)
+IMPLEMENT_HOOKS(legends)
+IMPLEMENT_HOOKS(loadgame)
+IMPLEMENT_HOOKS(locations)
+IMPLEMENT_HOOKS(meeting)
+IMPLEMENT_HOOKS(movieplayer)
+IMPLEMENT_HOOKS(new_region)
+IMPLEMENT_HOOKS(noble)
+IMPLEMENT_HOOKS(option)
+IMPLEMENT_HOOKS(overallstatus)
+IMPLEMENT_HOOKS(petitions)
+IMPLEMENT_HOOKS(pet)
+IMPLEMENT_HOOKS(price)
+IMPLEMENT_HOOKS(reportlist)
+IMPLEMENT_HOOKS(requestagreement)
+IMPLEMENT_HOOKS(savegame)
+IMPLEMENT_HOOKS(selectitem)
+IMPLEMENT_HOOKS(setupadventure)
+IMPLEMENT_HOOKS(setupdwarfgame)
+IMPLEMENT_HOOKS(stores)
+IMPLEMENT_HOOKS(textviewer)
+IMPLEMENT_HOOKS(title)
+IMPLEMENT_HOOKS(topicmeeting_fill_land_holder_positions)
+IMPLEMENT_HOOKS(topicmeeting)
+IMPLEMENT_HOOKS(topicmeeting_takerequests)
+IMPLEMENT_HOOKS(tradeagreement)
+IMPLEMENT_HOOKS(tradegoods)
+IMPLEMENT_HOOKS(tradelist)
+IMPLEMENT_HOOKS(treasurelist)
+IMPLEMENT_HOOKS(unitlist)
+IMPLEMENT_HOOKS(unit)
+IMPLEMENT_HOOKS(update_region)
+IMPLEMENT_HOOKS(wages)
+IMPLEMENT_HOOKS(workquota_condition)
+IMPLEMENT_HOOKS(workquota_details)
+IMPLEMENT_HOOKS(workshop_profile)
+
+#undef IMPLEMENT_HOOKS
 
 DFhackCExport command_result plugin_onstatechange(color_ostream &,
                                                   state_change_event evt) {
@@ -58,12 +228,95 @@ DFhackCExport command_result plugin_onstatechange(color_ostream &,
     return CR_OK;
 }
 
+#define INTERPOSE_HOOKS_FAILED(screen) \
+    !INTERPOSE_HOOK(screen##_overlay, feed).apply(enable) || \
+    !INTERPOSE_HOOK(screen##_overlay, render).apply(enable)
+
 DFhackCExport command_result plugin_enable(color_ostream &, bool enable) {
     if (is_enabled == enable)
         return CR_OK;
+
     if (enable != is_enabled) {
-        if (!INTERPOSE_HOOK(title_hook, feed).apply(enable) ||
-            !INTERPOSE_HOOK(title_hook, render).apply(enable))
+        if (INTERPOSE_HOOKS_FAILED(adopt_region) ||
+                INTERPOSE_HOOKS_FAILED(adventure_log) ||
+                INTERPOSE_HOOKS_FAILED(announcelist) ||
+                INTERPOSE_HOOKS_FAILED(assign_display_item) ||
+                INTERPOSE_HOOKS_FAILED(barter) ||
+                INTERPOSE_HOOKS_FAILED(buildinglist) ||
+                INTERPOSE_HOOKS_FAILED(building) ||
+                INTERPOSE_HOOKS_FAILED(choose_start_site) ||
+                INTERPOSE_HOOKS_FAILED(civlist) ||
+                INTERPOSE_HOOKS_FAILED(counterintelligence) ||
+                INTERPOSE_HOOKS_FAILED(createquota) ||
+                INTERPOSE_HOOKS_FAILED(customize_unit) ||
+                INTERPOSE_HOOKS_FAILED(dungeonmode) ||
+                INTERPOSE_HOOKS_FAILED(dungeon_monsterstatus) ||
+                INTERPOSE_HOOKS_FAILED(dungeon_wrestle) ||
+                INTERPOSE_HOOKS_FAILED(dwarfmode) ||
+                INTERPOSE_HOOKS_FAILED(entity) ||
+                INTERPOSE_HOOKS_FAILED(export_graphical_map) ||
+                INTERPOSE_HOOKS_FAILED(export_region) ||
+                INTERPOSE_HOOKS_FAILED(game_cleaner) ||
+                INTERPOSE_HOOKS_FAILED(image_creator) ||
+                INTERPOSE_HOOKS_FAILED(item) ||
+                INTERPOSE_HOOKS_FAILED(joblist) ||
+                INTERPOSE_HOOKS_FAILED(jobmanagement) ||
+                INTERPOSE_HOOKS_FAILED(job) ||
+                INTERPOSE_HOOKS_FAILED(justice) ||
+                INTERPOSE_HOOKS_FAILED(kitchenpref) ||
+                INTERPOSE_HOOKS_FAILED(layer_arena_creature) ||
+                INTERPOSE_HOOKS_FAILED(layer_assigntrade) ||
+                INTERPOSE_HOOKS_FAILED(layer_choose_language_name) ||
+                INTERPOSE_HOOKS_FAILED(layer_currency) ||
+                INTERPOSE_HOOKS_FAILED(layer_export_play_map) ||
+                INTERPOSE_HOOKS_FAILED(layer_military) ||
+                INTERPOSE_HOOKS_FAILED(layer_musicsound) ||
+                INTERPOSE_HOOKS_FAILED(layer_noblelist) ||
+                INTERPOSE_HOOKS_FAILED(layer_overall_health) ||
+                INTERPOSE_HOOKS_FAILED(layer_reaction) ||
+                INTERPOSE_HOOKS_FAILED(layer_squad_schedule) ||
+                INTERPOSE_HOOKS_FAILED(layer_stockpile) ||
+                INTERPOSE_HOOKS_FAILED(layer_stone_restriction) ||
+                INTERPOSE_HOOKS_FAILED(layer_unit_action) ||
+                INTERPOSE_HOOKS_FAILED(layer_unit_health) ||
+                INTERPOSE_HOOKS_FAILED(layer_unit_relationship) ||
+                INTERPOSE_HOOKS_FAILED(layer_world_gen_param_preset) ||
+                INTERPOSE_HOOKS_FAILED(layer_world_gen_param) ||
+                INTERPOSE_HOOKS_FAILED(legends) ||
+                INTERPOSE_HOOKS_FAILED(loadgame) ||
+                INTERPOSE_HOOKS_FAILED(locations) ||
+                INTERPOSE_HOOKS_FAILED(meeting) ||
+                INTERPOSE_HOOKS_FAILED(movieplayer) ||
+                INTERPOSE_HOOKS_FAILED(new_region) ||
+                INTERPOSE_HOOKS_FAILED(noble) ||
+                INTERPOSE_HOOKS_FAILED(option) ||
+                INTERPOSE_HOOKS_FAILED(overallstatus) ||
+                INTERPOSE_HOOKS_FAILED(petitions) ||
+                INTERPOSE_HOOKS_FAILED(pet) ||
+                INTERPOSE_HOOKS_FAILED(price) ||
+                INTERPOSE_HOOKS_FAILED(reportlist) ||
+                INTERPOSE_HOOKS_FAILED(requestagreement) ||
+                INTERPOSE_HOOKS_FAILED(savegame) ||
+                INTERPOSE_HOOKS_FAILED(selectitem) ||
+                INTERPOSE_HOOKS_FAILED(setupadventure) ||
+                INTERPOSE_HOOKS_FAILED(setupdwarfgame) ||
+                INTERPOSE_HOOKS_FAILED(stores) ||
+                INTERPOSE_HOOKS_FAILED(textviewer) ||
+                INTERPOSE_HOOKS_FAILED(title) ||
+                INTERPOSE_HOOKS_FAILED(topicmeeting_fill_land_holder_positions) ||
+                INTERPOSE_HOOKS_FAILED(topicmeeting) ||
+                INTERPOSE_HOOKS_FAILED(topicmeeting_takerequests) ||
+                INTERPOSE_HOOKS_FAILED(tradeagreement) ||
+                INTERPOSE_HOOKS_FAILED(tradegoods) ||
+                INTERPOSE_HOOKS_FAILED(tradelist) ||
+                INTERPOSE_HOOKS_FAILED(treasurelist) ||
+                INTERPOSE_HOOKS_FAILED(unitlist) ||
+                INTERPOSE_HOOKS_FAILED(unit) ||
+                INTERPOSE_HOOKS_FAILED(update_region) ||
+                INTERPOSE_HOOKS_FAILED(wages) ||
+                INTERPOSE_HOOKS_FAILED(workquota_condition) ||
+                INTERPOSE_HOOKS_FAILED(workquota_details) ||
+                INTERPOSE_HOOKS_FAILED(workshop_profile))
             return CR_FAILURE;
 
         is_enabled = enable;
@@ -71,6 +324,8 @@ DFhackCExport command_result plugin_enable(color_ostream &, bool enable) {
     return CR_OK;
 }
 
+#undef INTERPOSE_HOOKS_FAILED
+
 DFhackCExport command_result plugin_init(color_ostream &out, std::vector <PluginCommand> &) {
     return plugin_enable(out, true);
 }

From 089d2b6c33d89e3c05a74c5e5f8a5539a8c5356a Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Fri, 16 Sep 2022 13:43:37 -0700
Subject: [PATCH 659/854] move dwarfmonitor's weather indicator to the right

---
 dfhack-config/dwarfmonitor.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dfhack-config/dwarfmonitor.json b/dfhack-config/dwarfmonitor.json
index 3fd365e74..007dad020 100644
--- a/dfhack-config/dwarfmonitor.json
+++ b/dfhack-config/dwarfmonitor.json
@@ -2,7 +2,7 @@
 	"widgets": [
 		{
 			"type": "weather",
-			"x": 1,
+			"x": 22,
 			"y": -1
 		},
 		{

From 4800037ad36d3059c584ff523e4c9275616d416b Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Fri, 16 Sep 2022 13:49:46 -0700
Subject: [PATCH 660/854] in dwarf mode, we must use lbut_down

---
 plugins/overlay.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/overlay.cpp b/plugins/overlay.cpp
index 9a5c625ab..c4bbfb95b 100644
--- a/plugins/overlay.cpp
+++ b/plugins/overlay.cpp
@@ -101,7 +101,7 @@ static bool clicked = false;
 
 static bool handle_click() {
     int32_t x, y;
-    if (!enabler->tracking_on || !enabler->mouse_lbut || clicked ||
+    if (!enabler->tracking_on || !enabler->mouse_lbut_down || clicked ||
             !Gui::getMousePos(x, y))
         return false;
     if (y == gps->dimy - 1 && x >= 1 && (size_t)x <= button_text.size()) {

From 301563d1e643fa6249c3d7c1708c221482df66d5 Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Fri, 16 Sep 2022 13:52:06 -0700
Subject: [PATCH 661/854] update changelog

---
 docs/changelog.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/changelog.txt b/docs/changelog.txt
index f46b197ab..c3f8996c3 100644
--- a/docs/changelog.txt
+++ b/docs/changelog.txt
@@ -36,6 +36,7 @@ changelog.txt uses a syntax similar to RST, with a few special sequences:
 ## New Plugins
 - `autonestbox`: split off from `zone` into its own plugin. Note that to enable, the command has changed from ``autonestbox start`` to ``enable autonestbox``.
 - `autobutcher`: split off from `zone` into its own plugin. Note that to enable, the command has changed from ``autobutcher start`` to ``enable autobutcher``.
+- `overlay`: display a "DFHack" button in the lower left corner that you can click to start the new GUI command launcher.
 
 ## New Tweaks
 

From b084171048657a4080bec4d0d67ab64ce88dfa11 Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Fri, 16 Sep 2022 14:01:29 -0700
Subject: [PATCH 662/854] add overlay docs

---
 docs/plugins/overlay.rst | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)
 create mode 100644 docs/plugins/overlay.rst

diff --git a/docs/plugins/overlay.rst b/docs/plugins/overlay.rst
new file mode 100644
index 000000000..9416fba31
--- /dev/null
+++ b/docs/plugins/overlay.rst
@@ -0,0 +1,20 @@
+overlay
+=======
+
+.. dfhack-tool::
+    :summary: Provide an on-screen clickable DFHack launcher button.
+    :tags: dfhack interface
+
+This tool places a small button in the lower left corner of the screen that you
+can click to run DFHack commands with `gui/launcher`.
+
+If you would rather always run `gui/launcher` with the hotkeys, or just don't
+want the DFHack button on-screen, just disable the plugin with
+``disable overlay``.
+
+Usage
+-----
+
+::
+
+    enable overlay

From 3feca2ae58e6977326130f0bad82d9cc6f9252ee Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Fri, 16 Sep 2022 16:19:21 -0700
Subject: [PATCH 663/854] make the overlay work with TWBT

---
 plugins/overlay.cpp | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/plugins/overlay.cpp b/plugins/overlay.cpp
index c4bbfb95b..386b4b532 100644
--- a/plugins/overlay.cpp
+++ b/plugins/overlay.cpp
@@ -1,3 +1,5 @@
+#include "df/renderer.h"
+
 #include "df/viewscreen_adopt_regionst.h"
 #include "df/viewscreen_adventure_logst.h"
 #include "df/viewscreen_announcelistst.h"
@@ -83,8 +85,7 @@
 #include "df/viewscreen_workquota_detailsst.h"
 #include "df/viewscreen_workshop_profilest.h"
 
-#include "modules/Gui.h"
-
+#include "Debug.h"
 #include "PluginManager.h"
 #include "VTableInterpose.h"
 #include "uicommon.h"
@@ -96,14 +97,23 @@ DFHACK_PLUGIN_IS_ENABLED(is_enabled);
 REQUIRE_GLOBAL(enabler);
 REQUIRE_GLOBAL(gps);
 
+namespace DFHack {
+    DBG_DECLARE(overlay, log, DebugCategory::LINFO);
+}
+
 static const std::string button_text = "[ DFHack Launcher ]";
 static bool clicked = false;
 
 static bool handle_click() {
-    int32_t x, y;
-    if (!enabler->tracking_on || !enabler->mouse_lbut_down || clicked ||
-            !Gui::getMousePos(x, y))
+    int32_t x = 0, y = 0;
+    if (!enabler->mouse_lbut_down || clicked ||
+            !enabler->renderer->get_mouse_coords(&x, &y)) {
+        DEBUG(log).print(
+            "lbut_down=%s; clicked=%s; mouse_x=%d; mouse_y=%d\n",
+            enabler->mouse_lbut_down ? "true" : "false",
+            clicked ? "true" : "false", x, y);
         return false;
+    }
     if (y == gps->dimy - 1 && x >= 1 && (size_t)x <= button_text.size()) {
         clicked = true;
         Core::getInstance().setHotkeyCmd("gui/launcher");

From d0a5db2a0d4b4aed4e6d4dcee24bb92393729a22 Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Fri, 16 Sep 2022 20:59:02 -0700
Subject: [PATCH 664/854] set sentinel value used by TWBT

---
 library/include/modules/Renderer.h | 7 +++++++
 library/modules/Renderer.cpp       | 2 ++
 plugins/overlay.cpp                | 6 +++---
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/library/include/modules/Renderer.h b/library/include/modules/Renderer.h
index 11abd7c1d..65a9694ab 100644
--- a/library/include/modules/Renderer.h
+++ b/library/include/modules/Renderer.h
@@ -5,6 +5,13 @@
 #pragma once
 
 namespace DFHack { namespace Renderer {
+    // If the the 'x' parameter points to this value, then the 'y' parameter will
+    // be interpreted as a boolean flag for whether to return map coordinates (false)
+    // or text tile coordinates (true). Only TWBT implements this logic, and this
+    // sentinel value can be removed once DF provides an API for retrieving the
+    // two sets of coordinates.
+    DFHACK_EXPORT extern const int32_t GET_MOUSE_COORDS_SENTINEL;
+
     struct DFHACK_EXPORT renderer_wrap : public df::renderer {
         void set_to_null();
         void copy_from_parent();
diff --git a/library/modules/Renderer.cpp b/library/modules/Renderer.cpp
index 474dc3656..b746a149c 100644
--- a/library/modules/Renderer.cpp
+++ b/library/modules/Renderer.cpp
@@ -9,6 +9,8 @@ using DFHack::Renderer::renderer_wrap;
 
 static renderer_wrap *original_renderer = NULL;
 
+const int32_t Renderer::GET_MOUSE_COORDS_SENTINEL = 0xcd1aa471;
+
 bool init()
 {
     if (!original_renderer)
diff --git a/plugins/overlay.cpp b/plugins/overlay.cpp
index 386b4b532..b8c4e1fb4 100644
--- a/plugins/overlay.cpp
+++ b/plugins/overlay.cpp
@@ -1,5 +1,3 @@
-#include "df/renderer.h"
-
 #include "df/viewscreen_adopt_regionst.h"
 #include "df/viewscreen_adventure_logst.h"
 #include "df/viewscreen_announcelistst.h"
@@ -90,6 +88,8 @@
 #include "VTableInterpose.h"
 #include "uicommon.h"
 
+#include "modules/Renderer.h"
+
 using namespace DFHack;
 
 DFHACK_PLUGIN("overlay");
@@ -105,7 +105,7 @@ static const std::string button_text = "[ DFHack Launcher ]";
 static bool clicked = false;
 
 static bool handle_click() {
-    int32_t x = 0, y = 0;
+    int32_t x = Renderer::GET_MOUSE_COORDS_SENTINEL, y = (int32_t)true;
     if (!enabler->mouse_lbut_down || clicked ||
             !enabler->renderer->get_mouse_coords(&x, &y)) {
         DEBUG(log).print(

From dc5010c2e27ed1767c32893b8eccd86e6ebe3c47 Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Fri, 16 Sep 2022 22:05:08 -0700
Subject: [PATCH 665/854] don't block text on the new region screen

---
 plugins/overlay.cpp | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/plugins/overlay.cpp b/plugins/overlay.cpp
index b8c4e1fb4..1e66814a0 100644
--- a/plugins/overlay.cpp
+++ b/plugins/overlay.cpp
@@ -51,7 +51,6 @@
 #include "df/viewscreen_locationsst.h"
 #include "df/viewscreen_meetingst.h"
 #include "df/viewscreen_movieplayerst.h"
-#include "df/viewscreen_new_regionst.h"
 #include "df/viewscreen_noblest.h"
 #include "df/viewscreen_optionst.h"
 #include "df/viewscreen_overallstatusst.h"
@@ -197,7 +196,6 @@ IMPLEMENT_HOOKS(loadgame)
 IMPLEMENT_HOOKS(locations)
 IMPLEMENT_HOOKS(meeting)
 IMPLEMENT_HOOKS(movieplayer)
-IMPLEMENT_HOOKS(new_region)
 IMPLEMENT_HOOKS(noble)
 IMPLEMENT_HOOKS(option)
 IMPLEMENT_HOOKS(overallstatus)
@@ -297,7 +295,6 @@ DFhackCExport command_result plugin_enable(color_ostream &, bool enable) {
                 INTERPOSE_HOOKS_FAILED(locations) ||
                 INTERPOSE_HOOKS_FAILED(meeting) ||
                 INTERPOSE_HOOKS_FAILED(movieplayer) ||
-                INTERPOSE_HOOKS_FAILED(new_region) ||
                 INTERPOSE_HOOKS_FAILED(noble) ||
                 INTERPOSE_HOOKS_FAILED(option) ||
                 INTERPOSE_HOOKS_FAILED(overallstatus) ||

From 888288212bd998c281532cac5141ed35244f9c39 Mon Sep 17 00:00:00 2001
From: DFHack-Urist via GitHub Actions
 <63161697+DFHack-Urist@users.noreply.github.com>
Date: Sat, 17 Sep 2022 07:19:03 +0000
Subject: [PATCH 666/854] Auto-update submodules

scripts: master
---
 scripts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts b/scripts
index d7b64afc9..a422b1bf7 160000
--- a/scripts
+++ b/scripts
@@ -1 +1 @@
-Subproject commit d7b64afc9fdc80b7c1075d5f87dc4512def457a6
+Subproject commit a422b1bf7ff99d578b59540108fe74eca38606d2

From 448eced17cf8963434ebfe2711d7a046c22354f2 Mon Sep 17 00:00:00 2001
From: Myk Taylor <myk002@yahoo.com>
Date: Sun, 18 Sep 2022 08:07:08 -0700
Subject: [PATCH 667/854] make Screen::getMousePos always return scr coords

---
 library/modules/Screen.cpp | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/library/modules/Screen.cpp b/library/modules/Screen.cpp
index 5001a34c0..bff14a380 100644
--- a/library/modules/Screen.cpp
+++ b/library/modules/Screen.cpp
@@ -31,6 +31,7 @@ distribution.
 #include <set>
 using namespace std;
 
+#include "modules/Renderer.h"
 #include "modules/Screen.h"
 #include "modules/GuiHooks.h"
 #include "MemAccess.h"
@@ -75,12 +76,14 @@ using std::string;
  * Screen painting API.
  */
 
+// returns text grid coordinates, even if the game map is scaled differently
 df::coord2d Screen::getMousePos()
 {
-    if (!gps || (enabler && !enabler->tracking_on))
+    int32_t x = Renderer::GET_MOUSE_COORDS_SENTINEL, y = (int32_t)true;
+    if (!enabler || !enabler->renderer->get_mouse_coords(&x, &y)) {
         return df::coord2d(-1, -1);
-
-    return df::coord2d(gps->mouse_x, gps->mouse_y);
+    }
+    return df::coord2d(x, y);
 }
 
 df::coord2d Screen::getWindowSize()
@@ -769,7 +772,7 @@ int dfhack_lua_viewscreen::do_input(lua_State *L)
         }
     }
 
-    if (enabler && enabler->tracking_on)
+    if (enabler)
     {
         if (enabler->mouse_lbut_down) {
             lua_pushboolean(L, true);

From 3b89f482d11e448cb70f5f4247413d990aef47d6 Mon Sep 17 00:00:00 2001
From: Myk Taylor <myk002@yahoo.com>
Date: Sun, 18 Sep 2022 08:18:08 -0700
Subject: [PATCH 668/854] use the new Screen::getMousePos() implementation

---
 plugins/overlay.cpp | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/plugins/overlay.cpp b/plugins/overlay.cpp
index 1e66814a0..30a5546a4 100644
--- a/plugins/overlay.cpp
+++ b/plugins/overlay.cpp
@@ -87,7 +87,7 @@
 #include "VTableInterpose.h"
 #include "uicommon.h"
 
-#include "modules/Renderer.h"
+#include "modules/Screen.h"
 
 using namespace DFHack;
 
@@ -104,16 +104,12 @@ static const std::string button_text = "[ DFHack Launcher ]";
 static bool clicked = false;
 
 static bool handle_click() {
-    int32_t x = Renderer::GET_MOUSE_COORDS_SENTINEL, y = (int32_t)true;
-    if (!enabler->mouse_lbut_down || clicked ||
-            !enabler->renderer->get_mouse_coords(&x, &y)) {
-        DEBUG(log).print(
-            "lbut_down=%s; clicked=%s; mouse_x=%d; mouse_y=%d\n",
-            enabler->mouse_lbut_down ? "true" : "false",
-            clicked ? "true" : "false", x, y);
+    if (!enabler->mouse_lbut_down || clicked) {
         return false;
     }
-    if (y == gps->dimy - 1 && x >= 1 && (size_t)x <= button_text.size()) {
+    df::coord2d pos = Screen::getMousePos();
+    DEBUG(log).print("clicked at screen coordinates (%d, %d)\n", pos.x, pos.y);
+    if (pos.y == gps->dimy - 1 && pos.x >= 1 && (size_t)pos.x <= button_text.size()) {
         clicked = true;
         Core::getInstance().setHotkeyCmd("gui/launcher");
         return true;

From 215a5b0a24be00d91dcf9376680e6311cf3df574 Mon Sep 17 00:00:00 2001
From: Myk Taylor <myk002@yahoo.com>
Date: Sun, 18 Sep 2022 08:19:02 -0700
Subject: [PATCH 669/854] add Gui::getMousePos() that always gets map coords

---
 library/include/modules/Gui.h |  5 ++---
 library/modules/Gui.cpp       | 17 ++++++++---------
 plugins/devel/kittens.cpp     | 11 +++++------
 plugins/mousequery.cpp        | 20 ++++----------------
 4 files changed, 19 insertions(+), 34 deletions(-)

diff --git a/library/include/modules/Gui.h b/library/include/modules/Gui.h
index 455032fea..a0ae27889 100644
--- a/library/include/modules/Gui.h
+++ b/library/include/modules/Gui.h
@@ -126,10 +126,11 @@ namespace DFHack
         DFHACK_EXPORT void showAutoAnnouncement(df::announcement_type type, df::coord pos, std::string message, int color = 7, bool bright = true, df::unit *unit1 = NULL, df::unit *unit2 = NULL);
 
         /*
-         * Cursor and window coords
+         * Cursor and window map coords
          */
         DFHACK_EXPORT df::coord getViewportPos();
         DFHACK_EXPORT df::coord getCursorPos();
+        DFHACK_EXPORT df::coord getMousePos();
 
         static const int AREA_MAP_WIDTH = 23;
         static const int MENU_WIDTH = 30;
@@ -162,8 +163,6 @@ namespace DFHack
         DFHACK_EXPORT bool getDesignationCoords (int32_t &x, int32_t &y, int32_t &z);
         DFHACK_EXPORT bool setDesignationCoords (const int32_t x, const int32_t y, const int32_t z);
 
-        DFHACK_EXPORT bool getMousePos (int32_t & x, int32_t & y);
-
         // The distance from the z-level of the tile at map coordinates (x, y) to the closest ground z-level below
         // Defaults to 0, unless overriden by plugins
         DFHACK_EXPORT int getDepthAt (int32_t x, int32_t y);
diff --git a/library/modules/Gui.cpp b/library/modules/Gui.cpp
index fc78bb57d..f9e15aac4 100644
--- a/library/modules/Gui.cpp
+++ b/library/modules/Gui.cpp
@@ -1831,17 +1831,16 @@ bool Gui::setDesignationCoords (const int32_t x, const int32_t y, const int32_t
     return true;
 }
 
-bool Gui::getMousePos (int32_t & x, int32_t & y)
+// returns the map coordinates that the mouse cursor is over
+df::coord Gui::getMousePos()
 {
-    if (gps) {
-        x = gps->mouse_x;
-        y = gps->mouse_y;
-    }
-    else {
-        x = -1;
-        y = -1;
+    df::coord pos;
+    if (gps && gps->mouse_x > -1) {
+        pos = getViewportPos();
+        pos.x += gps->mouse_x - 1;
+        pos.y += gps->mouse_y - 1;
     }
-    return (x == -1) ? false : true;
+    return pos;
 }
 
 int getDepthAt_default (int32_t x, int32_t y)
diff --git a/plugins/devel/kittens.cpp b/plugins/devel/kittens.cpp
index fce924aff..56ca813ae 100644
--- a/plugins/devel/kittens.cpp
+++ b/plugins/devel/kittens.cpp
@@ -135,13 +135,12 @@ DFhackCExport command_result plugin_onupdate ( color_ostream &out )
             last_designation[2] = desig_z;
             out.print("Designation: %d %d %d\n",desig_x, desig_y, desig_z);
         }
-        int mouse_x, mouse_y;
-        Gui::getMousePos(mouse_x,mouse_y);
-        if(mouse_x != last_mouse[0] || mouse_y != last_mouse[1])
+        df:coord mousePos = Gui::getMousePos();
+        if(mousePos.x != last_mouse[0] || mousePos.y != last_mouse[1])
         {
-            last_mouse[0] = mouse_x;
-            last_mouse[1] = mouse_y;
-            out.print("Mouse: %d %d\n",mouse_x, mouse_y);
+            last_mouse[0] = mousePos.x;
+            last_mouse[1] = mousePos.y;
+            out.print("Mouse: %d %d\n",mousePos.x, mousePos.y);
         }
     }
     return CR_OK;
diff --git a/plugins/mousequery.cpp b/plugins/mousequery.cpp
index cd85de2bc..2bfa08470 100644
--- a/plugins/mousequery.cpp
+++ b/plugins/mousequery.cpp
@@ -53,23 +53,11 @@ static enum { None, Left, Right } drag_mode;
 
 static df::coord get_mouse_pos(int32_t &mx, int32_t &my)
 {
-    df::coord pos;
-    pos.x = -30000;
-
-    if (!enabler->tracking_on)
-        return pos;
-
-    if (!Gui::getMousePos(mx, my))
-        return pos;
-
-    int32_t vx, vy, vz;
-    if (!Gui::getViewCoords(vx, vy, vz))
-        return pos;
-
-    pos.x = vx + mx - 1;
-    pos.y = vy + my - 1;
-    pos.z = vz - Gui::getDepthAt(mx, my);
+    df::coord pos = Gui::getMousePos();
+    pos.z -= Gui::getDepthAt(pos.x, pos.y);
 
+    mx = pos.x;
+    my = pos.y;
     return pos;
 }
 

From 1f15e4d47ec593cc5bc803d6e5bdec720c48b07b Mon Sep 17 00:00:00 2001
From: Myk Taylor <myk002@yahoo.com>
Date: Sun, 18 Sep 2022 08:19:56 -0700
Subject: [PATCH 670/854] expose Gui::getMousePos() to Lua

---
 library/LuaApi.cpp | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/library/LuaApi.cpp b/library/LuaApi.cpp
index 70cb01dfc..b556e5737 100644
--- a/library/LuaApi.cpp
+++ b/library/LuaApi.cpp
@@ -1523,6 +1523,12 @@ static int gui_getDwarfmodeViewDims(lua_State *state)
     return 1;
 }
 
+static int gui_getMousePos(lua_State *L)
+{
+    Lua::PushPosXYZ(L, Gui::getMousePos());
+    return 3;
+}
+
 static const LuaWrapper::FunctionReg dfhack_gui_module[] = {
     WRAPM(Gui, getCurViewscreen),
     WRAPM(Gui, getFocusString),
@@ -1555,6 +1561,7 @@ static const LuaWrapper::FunctionReg dfhack_gui_module[] = {
 
 static const luaL_Reg dfhack_gui_funcs[] = {
     { "getDwarfmodeViewDims", gui_getDwarfmodeViewDims },
+    { "getMousePos", gui_getMousePos },
     { NULL, NULL }
 };
 
@@ -2282,9 +2289,7 @@ static const LuaWrapper::FunctionReg dfhack_screen_module[] = {
 
 static int screen_getMousePos(lua_State *L)
 {
-    auto pos = Screen::getMousePos();
-    lua_pushinteger(L, pos.x);
-    lua_pushinteger(L, pos.y);
+    Lua::PushPosXY(L, Screen::getMousePos());
     return 2;
 }
 

From 3b650c8d0bb5cd31be1bbffcab7bef34ac4452dc Mon Sep 17 00:00:00 2001
From: Myk Taylor <myk002@yahoo.com>
Date: Sun, 18 Sep 2022 08:20:33 -0700
Subject: [PATCH 671/854] don't let changes to the lua cursor bleed through

before, we could end up changing the state of whoever last called
guidm.setCursorPos()
---
 library/lua/gui/dwarfmode.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/library/lua/gui/dwarfmode.lua b/library/lua/gui/dwarfmode.lua
index e56211233..db80554cd 100644
--- a/library/lua/gui/dwarfmode.lua
+++ b/library/lua/gui/dwarfmode.lua
@@ -104,7 +104,7 @@ function getCursorPos()
 end
 
 function setCursorPos(cursor)
-    df.global.cursor = cursor
+    df.global.cursor = copyall(cursor)
 end
 
 function clearCursorPos()

From 8fd86f6e566d6fa855650d49ac489e815ca6cd71 Mon Sep 17 00:00:00 2001
From: Myk Taylor <myk002@yahoo.com>
Date: Sun, 18 Sep 2022 08:40:22 -0700
Subject: [PATCH 672/854] fix typo in kittens.cpp

---
 plugins/devel/kittens.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/devel/kittens.cpp b/plugins/devel/kittens.cpp
index 56ca813ae..156686a1e 100644
--- a/plugins/devel/kittens.cpp
+++ b/plugins/devel/kittens.cpp
@@ -135,7 +135,7 @@ DFhackCExport command_result plugin_onupdate ( color_ostream &out )
             last_designation[2] = desig_z;
             out.print("Designation: %d %d %d\n",desig_x, desig_y, desig_z);
         }
-        df:coord mousePos = Gui::getMousePos();
+        df::coord mousePos = Gui::getMousePos();
         if(mousePos.x != last_mouse[0] || mousePos.y != last_mouse[1])
         {
             last_mouse[0] = mousePos.x;

From dbc5001bd8947731b676742f1329830eba1a6db0 Mon Sep 17 00:00:00 2001
From: Myk Taylor <myk002@yahoo.com>
Date: Sun, 18 Sep 2022 13:27:13 -0700
Subject: [PATCH 673/854] fail if mouse cursor isn't over the map area

---
 library/modules/Gui.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/library/modules/Gui.cpp b/library/modules/Gui.cpp
index f9e15aac4..56aa09b7f 100644
--- a/library/modules/Gui.cpp
+++ b/library/modules/Gui.cpp
@@ -1836,6 +1836,12 @@ df::coord Gui::getMousePos()
 {
     df::coord pos;
     if (gps && gps->mouse_x > -1) {
+        // return invalid coords if the cursor is not over the map
+        DwarfmodeDims dims = getDwarfmodeViewDims();
+        if (gps->mouse_x < dims.map_x1 || gps->mouse_x > dims.map_x2 ||
+                gps->mouse_y < dims.map_y1 || gps->mouse_y > dims.map_y2) {
+            return pos;
+        }
         pos = getViewportPos();
         pos.x += gps->mouse_x - 1;
         pos.y += gps->mouse_y - 1;

From 28b70eaee9d2d1b2b9d78ecd4d19bac13c8ba01b Mon Sep 17 00:00:00 2001
From: Myk Taylor <myk002@yahoo.com>
Date: Sun, 18 Sep 2022 13:27:33 -0700
Subject: [PATCH 674/854] return map coords as a coord, not x, y, z

---
 library/LuaApi.cpp | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/library/LuaApi.cpp b/library/LuaApi.cpp
index b556e5737..3a83f7aef 100644
--- a/library/LuaApi.cpp
+++ b/library/LuaApi.cpp
@@ -1525,8 +1525,12 @@ static int gui_getDwarfmodeViewDims(lua_State *state)
 
 static int gui_getMousePos(lua_State *L)
 {
-    Lua::PushPosXYZ(L, Gui::getMousePos());
-    return 3;
+    auto pos = Gui::getMousePos();
+    if (pos.isValid())
+        Lua::Push(L, pos);
+    else
+        lua_pushnil(L);
+    return 1;
 }
 
 static const LuaWrapper::FunctionReg dfhack_gui_module[] = {
@@ -2289,16 +2293,12 @@ static const LuaWrapper::FunctionReg dfhack_screen_module[] = {
 
 static int screen_getMousePos(lua_State *L)
 {
-    Lua::PushPosXY(L, Screen::getMousePos());
-    return 2;
+    return Lua::PushPosXY(L, Screen::getMousePos());
 }
 
 static int screen_getWindowSize(lua_State *L)
 {
-    auto pos = Screen::getWindowSize();
-    lua_pushinteger(L, pos.x);
-    lua_pushinteger(L, pos.y);
-    return 2;
+    return Lua::PushPosXY(L, Screen::getWindowSize());
 }
 
 static int screen_paintTile(lua_State *L)

From 8e718d9851600c7247b6e1c8f95db39e6f59b3b6 Mon Sep 17 00:00:00 2001
From: Myk Taylor <myk002@yahoo.com>
Date: Sun, 18 Sep 2022 13:31:20 -0700
Subject: [PATCH 675/854] add docs for dfhack.gui.getMousePos()

---
 docs/Lua API.rst | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/docs/Lua API.rst b/docs/Lua API.rst
index ba63030b5..64ccdd595 100644
--- a/docs/Lua API.rst	
+++ b/docs/Lua API.rst	
@@ -1088,6 +1088,11 @@ Announcements
   Uses the type to look up options from announcements.txt, and calls the above
   operations accordingly. The units are used to call ``addCombatReportAuto``.
 
+* ``dfhack.gui.getMousePos()``
+
+  Returns the map coordinates of the map tile the mouse is over as a table of
+  ``{x, y, z}``. If the cursor is not over the map, returns ``nil``.
+
 Other
 ~~~~~
 

From a3a06fb363cc5aee4ede1f85ddd1ed4e6bff0cbe Mon Sep 17 00:00:00 2001
From: Josh Cooper <cppcooper@users.noreply.github.com>
Date: Mon, 19 Sep 2022 10:23:18 -0700
Subject: [PATCH 676/854] Update docs/plugins/spectate.rst

removes extra blank line
---
 docs/plugins/spectate.rst | 1 -
 1 file changed, 1 deletion(-)

diff --git a/docs/plugins/spectate.rst b/docs/plugins/spectate.rst
index 31255b0d2..48bdd90bd 100644
--- a/docs/plugins/spectate.rst
+++ b/docs/plugins/spectate.rst
@@ -29,7 +29,6 @@ Examples
 ``spectate``
     The plugin reports its feature status.
 
-
 ``spectate auto-unpause 1``
     Enable the spectate plugin to automatically dismiss pause events caused
     by the game. Siege events are one example of such a game event.

From 24816763703f9179bf481602fbf7afc1962463a0 Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Mon, 19 Sep 2022 11:13:47 -0700
Subject: [PATCH 677/854] fix mouse pos offset and output 'X' at screen edge

---
 plugins/mousequery.cpp | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/plugins/mousequery.cpp b/plugins/mousequery.cpp
index 2bfa08470..6358262f4 100644
--- a/plugins/mousequery.cpp
+++ b/plugins/mousequery.cpp
@@ -20,6 +20,7 @@
 #include "uicommon.h"
 #include "TileTypes.h"
 #include "DataFuncs.h"
+#include "Debug.h"
 
 DFHACK_PLUGIN("mousequery");
 REQUIRE_GLOBAL(enabler);
@@ -32,6 +33,10 @@ using namespace df::enums::ui_sidebar_mode;
 
 #define PLUGIN_VERSION 0.18
 
+namespace DFHack {
+    DBG_DECLARE(mousequery,log,DebugCategory::LINFO);
+}
+
 static int32_t last_clicked_x, last_clicked_y, last_clicked_z;
 static int32_t last_pos_x, last_pos_y, last_pos_z;
 static df::coord last_move_pos;
@@ -56,8 +61,10 @@ static df::coord get_mouse_pos(int32_t &mx, int32_t &my)
     df::coord pos = Gui::getMousePos();
     pos.z -= Gui::getDepthAt(pos.x, pos.y);
 
-    mx = pos.x;
-    my = pos.y;
+    df::coord vpos = Gui::getViewportPos();
+    mx = pos.x - vpos.x + 1;
+    my = pos.y - vpos.y + 1;
+
     return pos;
 }
 
@@ -524,6 +531,7 @@ struct mousequery_hook : public df::viewscreen_dwarfmodest
         if (mpos.x == x && mpos.y == y && mpos.z == z)
             return;
 
+        DEBUG(log).print("moving cursor to %d, %d, %d\n", x, y, z);
         Gui::setCursorCoords(mpos.x, mpos.y, mpos.z);
         Gui::refreshSidebar();
     }
@@ -563,8 +571,6 @@ struct mousequery_hook : public df::viewscreen_dwarfmodest
         int32_t mx, my;
         auto mpos = get_mouse_pos(mx, my);
         bool mpos_valid = mpos.x != -30000 && mpos.y != -30000 && mpos.z != -30000;
-        if (mx < 1 || mx > dims.map_x2 || my < 1 || my > dims.map_y2)
-            mpos_valid = false;
 
         // Check if in lever binding mode
         if (Gui::getFocusString(Core::getTopViewscreen()) ==
@@ -711,7 +717,7 @@ struct mousequery_hook : public df::viewscreen_dwarfmodest
                 }
             }
 
-            OutputString(color, mx, my, "X", false, 0, 0, true);
+            Screen::paintTile(Screen::Pen('X', color), mx, my, true);
             return;
         }
 

From a5af7020eb910e9d06e1c9f115320e1f5fcf80b0 Mon Sep 17 00:00:00 2001
From: DFHack-Urist via GitHub Actions
 <63161697+DFHack-Urist@users.noreply.github.com>
Date: Tue, 20 Sep 2022 07:28:37 +0000
Subject: [PATCH 678/854] Auto-update submodules

scripts: master
---
 scripts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts b/scripts
index a422b1bf7..484988bb3 160000
--- a/scripts
+++ b/scripts
@@ -1 +1 @@
-Subproject commit a422b1bf7ff99d578b59540108fe74eca38606d2
+Subproject commit 484988bb3d64f7aed9442af3b226faa77d8fd00d

From ffe2365550b6c96a079261168caba806a36d3be2 Mon Sep 17 00:00:00 2001
From: DFHack-Urist via GitHub Actions
 <63161697+DFHack-Urist@users.noreply.github.com>
Date: Wed, 21 Sep 2022 07:42:18 +0000
Subject: [PATCH 679/854] Auto-update submodules

scripts: master
---
 scripts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts b/scripts
index 484988bb3..8c03de45b 160000
--- a/scripts
+++ b/scripts
@@ -1 +1 @@
-Subproject commit 484988bb3d64f7aed9442af3b226faa77d8fd00d
+Subproject commit 8c03de45ba8e772239224b49af2617fc714fbaa9

From 39acd3e9925f199672a98dcab6c94fa724b74eca Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Wed, 21 Sep 2022 08:59:01 -0700
Subject: [PATCH 680/854] don't display overlay on trade goods screen

so it doesn't overlap the trade value label
---
 plugins/overlay.cpp | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/plugins/overlay.cpp b/plugins/overlay.cpp
index 30a5546a4..1a0cc7c02 100644
--- a/plugins/overlay.cpp
+++ b/plugins/overlay.cpp
@@ -70,7 +70,6 @@
 #include "df/viewscreen_topicmeetingst.h"
 #include "df/viewscreen_topicmeeting_takerequestsst.h"
 #include "df/viewscreen_tradeagreementst.h"
-#include "df/viewscreen_tradegoodsst.h"
 #include "df/viewscreen_tradelistst.h"
 #include "df/viewscreen_treasurelistst.h"
 #include "df/viewscreen_unitlist_page.h"
@@ -211,7 +210,6 @@ IMPLEMENT_HOOKS(topicmeeting_fill_land_holder_positions)
 IMPLEMENT_HOOKS(topicmeeting)
 IMPLEMENT_HOOKS(topicmeeting_takerequests)
 IMPLEMENT_HOOKS(tradeagreement)
-IMPLEMENT_HOOKS(tradegoods)
 IMPLEMENT_HOOKS(tradelist)
 IMPLEMENT_HOOKS(treasurelist)
 IMPLEMENT_HOOKS(unitlist)
@@ -310,7 +308,6 @@ DFhackCExport command_result plugin_enable(color_ostream &, bool enable) {
                 INTERPOSE_HOOKS_FAILED(topicmeeting) ||
                 INTERPOSE_HOOKS_FAILED(topicmeeting_takerequests) ||
                 INTERPOSE_HOOKS_FAILED(tradeagreement) ||
-                INTERPOSE_HOOKS_FAILED(tradegoods) ||
                 INTERPOSE_HOOKS_FAILED(tradelist) ||
                 INTERPOSE_HOOKS_FAILED(treasurelist) ||
                 INTERPOSE_HOOKS_FAILED(unitlist) ||

From 9fb037574dd7a6de5c1324e499d7f94dc8b95ceb Mon Sep 17 00:00:00 2001
From: Myk Taylor <myk002@yahoo.com>
Date: Wed, 21 Sep 2022 06:58:42 -0700
Subject: [PATCH 681/854] add readthedocs configuration

---
 .readthedocs.requirements.txt |  1 +
 .readthedocs.yaml             | 17 +++++++++++++++++
 2 files changed, 18 insertions(+)
 create mode 100644 .readthedocs.requirements.txt
 create mode 100644 .readthedocs.yaml

diff --git a/.readthedocs.requirements.txt b/.readthedocs.requirements.txt
new file mode 100644
index 000000000..122610498
--- /dev/null
+++ b/.readthedocs.requirements.txt
@@ -0,0 +1 @@
+sphinx<4.4.0
diff --git a/.readthedocs.yaml b/.readthedocs.yaml
new file mode 100644
index 000000000..f3637b24b
--- /dev/null
+++ b/.readthedocs.yaml
@@ -0,0 +1,17 @@
+# .readthedocs.yaml
+# Read the Docs configuration file
+# See https://docs.readthedocs.io/en/stable/config-file/v2.html for details
+
+version: 2
+
+build:
+  os: ubuntu-20.04
+  tools:
+    python: "3"
+
+sphinx:
+   configuration: conf.py
+
+python:
+   install:
+   - requirements: .readthedocs.requirements.txt

From 2ef2ec66b6f48bec4a1aa8c90591be0d28cd7ac9 Mon Sep 17 00:00:00 2001
From: Myk Taylor <myk002@yahoo.com>
Date: Wed, 21 Sep 2022 09:42:42 -0700
Subject: [PATCH 682/854] update min sphinx version to 3.4.3

it might be able to go lower, but sphinx 1.8.6 is too low (it doesn't
support the calls we make to generate the genindex entries)
---
 conf.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/conf.py b/conf.py
index 68d11f0f9..0170a872b 100644
--- a/conf.py
+++ b/conf.py
@@ -138,7 +138,7 @@ generate_tag_indices()
 # -- General configuration ------------------------------------------------
 
 # If your documentation needs a minimal Sphinx version, state it here.
-needs_sphinx = '1.8'
+needs_sphinx = '3.4.3'
 
 # Add any Sphinx extension module names here, as strings. They can be
 # extensions coming with Sphinx (named 'sphinx.ext.*') or your custom

From 2a13664b36feab52c451cf3082b292c5c0871d8e Mon Sep 17 00:00:00 2001
From: Myk Taylor <myk002@yahoo.com>
Date: Wed, 21 Sep 2022 10:03:51 -0700
Subject: [PATCH 683/854] rename yaml to yml

---
 .readthedocs.yaml => .readthedocs.yml | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename .readthedocs.yaml => .readthedocs.yml (100%)

diff --git a/.readthedocs.yaml b/.readthedocs.yml
similarity index 100%
rename from .readthedocs.yaml
rename to .readthedocs.yml

From a1c57ccafd6c6abf520889cb54761c6facc83326 Mon Sep 17 00:00:00 2001
From: Myk Taylor <myk002@yahoo.com>
Date: Wed, 21 Sep 2022 10:07:20 -0700
Subject: [PATCH 684/854] pin the sphinx version exactly at 4.4.0

---
 .readthedocs.requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.readthedocs.requirements.txt b/.readthedocs.requirements.txt
index 122610498..1f028de41 100644
--- a/.readthedocs.requirements.txt
+++ b/.readthedocs.requirements.txt
@@ -1 +1 @@
-sphinx<4.4.0
+sphinx==4.4.0

From 35152bf02250061dee89136f786ee91c1a3a9600 Mon Sep 17 00:00:00 2001
From: Myk Taylor <myk002@yahoo.com>
Date: Tue, 20 Sep 2022 22:51:44 -0700
Subject: [PATCH 685/854] create genindex entries for all tools and commands

---
 docs/sphinx_extensions/dfhack/tool_docs.py | 22 ++++++++++++++++++++--
 1 file changed, 20 insertions(+), 2 deletions(-)

diff --git a/docs/sphinx_extensions/dfhack/tool_docs.py b/docs/sphinx_extensions/dfhack/tool_docs.py
index c7883e14c..6f5df5568 100644
--- a/docs/sphinx_extensions/dfhack/tool_docs.py
+++ b/docs/sphinx_extensions/dfhack/tool_docs.py
@@ -8,14 +8,18 @@ import os
 from typing import List, Optional, Type
 
 import docutils.nodes as nodes
+from docutils.nodes import Node
 import docutils.parsers.rst.directives as rst_directives
 import sphinx
 import sphinx.addnodes as addnodes
 import sphinx.directives
+from sphinx.util.docutils import SphinxDirective
+from sphinx.util.nodes import process_index_entry
 
 import dfhack.util
 
 
+
 logger = sphinx.util.logging.getLogger(__name__)
 
 
@@ -46,6 +50,17 @@ def make_summary(builder: sphinx.builders.Builder, summary: str) -> nodes.paragr
     para += nodes.inline(text=summary)
     return para
 
+def make_index(directive: SphinxDirective, name: str, summary: str) -> List[Node]:
+    targetid = 'index-%s' % directive.env.new_serialno('index')
+    targetnode = nodes.target('', '', ids=[targetid])
+    directive.state.document.note_explicit_target(targetnode)
+    indexnode = addnodes.index()
+    indexnode['entries'] = []
+    indexnode['inline'] = False
+    directive.set_source_info(indexnode)
+    entry_text = 'single: {}; {}'.format(name, summary)
+    indexnode['entries'].extend(process_index_entry(entry_text, targetnode['ids'][0]))
+    return [indexnode, targetnode]
 
 _KEYBINDS = {}
 _KEYBINDS_RENDERED = set()  # commands whose keybindings have been rendered
@@ -160,6 +175,7 @@ class DFHackToolDirective(DFHackToolDirectiveBase):
 
         ret_nodes = [tag_paragraph]
         if 'no-command' in self.options:
+            ret_nodes += make_index(self, self.get_name_or_docname() + ' (plugin)', self.options.get('summary', ''))
             ret_nodes += [make_summary(self.env.app.builder, self.options.get('summary', ''))]
         return ret_nodes
 
@@ -177,11 +193,13 @@ class DFHackCommandDirective(DFHackToolDirectiveBase):
 
     def render_content(self) -> List[nodes.Node]:
         command = self.get_name_or_docname()
-        return [
-            self.make_labeled_paragraph('Command', command, content_class=nodes.literal),
+        ret_nodes = [self.make_labeled_paragraph('Command', command, content_class=nodes.literal)]
+        ret_nodes += make_index(self, command, self.options.get('summary', ''))
+        ret_nodes += [
             make_summary(self.env.app.builder, self.options.get('summary', '')),
             *render_dfhack_keybind(command, builder=self.env.app.builder),
         ]
+        return ret_nodes
 
 
 def register(app):

From 682ed29c0cef0601ff85c7216714937a6ca8c0ab Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Wed, 21 Sep 2022 10:36:46 -0700
Subject: [PATCH 686/854] replace deprecated support page with a redirect

configured on the readthedocs web admin page
---
 docs/Support.rst | 3 ---
 1 file changed, 3 deletions(-)
 delete mode 100644 docs/Support.rst

diff --git a/docs/Support.rst b/docs/Support.rst
deleted file mode 100644
index af8bd583c..000000000
--- a/docs/Support.rst
+++ /dev/null
@@ -1,3 +0,0 @@
-:orphan:
-
-Please continue to the new `support` page.

From e36f6ea8441d8a80a50e99f38d67b8f27225e717 Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Wed, 21 Sep 2022 10:40:08 -0700
Subject: [PATCH 687/854] also build pdf format

---
 .readthedocs.yml | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/.readthedocs.yml b/.readthedocs.yml
index f3637b24b..88ee132ec 100644
--- a/.readthedocs.yml
+++ b/.readthedocs.yml
@@ -10,8 +10,11 @@ build:
     python: "3"
 
 sphinx:
-   configuration: conf.py
+  configuration: conf.py
+
+formats:
+  - pdf
 
 python:
-   install:
-   - requirements: .readthedocs.requirements.txt
+  install:
+  - requirements: .readthedocs.requirements.txt

From ee51e830ad01f428c757e3738d8434e9d65c9b2f Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Wed, 21 Sep 2022 10:40:17 -0700
Subject: [PATCH 688/854] update wording in Tools docs

---
 docs/Tools.rst | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/docs/Tools.rst b/docs/Tools.rst
index 623fc9c1f..89f712568 100644
--- a/docs/Tools.rst
+++ b/docs/Tools.rst
@@ -30,9 +30,11 @@ guildhalls and temples that you have agreed to.
 Finding the tool you need
 -------------------------
 
-DFHack tools are tagged with categories to make them easier to find. Note that a
-tool can belong to more than one category. If you'd like to see the full list of
-tools in one flat list, please refer to the `index <genindex>`.
+DFHack tools are tagged with categories to make them easier to find. These
+categories are listed in the next few sections. Note that a tool can belong to
+more than one category. If you already know what you're looking for, try the
+`search` box or Ctrl-F on this page. If you'd like to see the full list of tools
+in one flat list, please refer to the `alphabetized index <genindex>`.
 
 DFHack tools by game mode
 -------------------------

From 2e64464bb8be74dc3cb2cc30ea684f2e50ac1a07 Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Wed, 21 Sep 2022 10:44:01 -0700
Subject: [PATCH 689/854] reword sentence after title expansion

---
 docs/Tools.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/Tools.rst b/docs/Tools.rst
index 89f712568..aeff179aa 100644
--- a/docs/Tools.rst
+++ b/docs/Tools.rst
@@ -33,8 +33,8 @@ Finding the tool you need
 DFHack tools are tagged with categories to make them easier to find. These
 categories are listed in the next few sections. Note that a tool can belong to
 more than one category. If you already know what you're looking for, try the
-`search` box or Ctrl-F on this page. If you'd like to see the full list of tools
-in one flat list, please refer to the `alphabetized index <genindex>`.
+`search` or Ctrl-F on this page. If you'd like to see the full list of tools in
+one flat list, please refer to the `alphabetized index <genindex>`.
 
 DFHack tools by game mode
 -------------------------

From b6dee4b0f189318270cd0f5f9993fb3970379ec9 Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Wed, 21 Sep 2022 10:45:27 -0700
Subject: [PATCH 690/854] build all formats

---
 .readthedocs.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.readthedocs.yml b/.readthedocs.yml
index 88ee132ec..f1e062683 100644
--- a/.readthedocs.yml
+++ b/.readthedocs.yml
@@ -13,7 +13,7 @@ sphinx:
   configuration: conf.py
 
 formats:
-  - pdf
+  - all
 
 python:
   install:

From 7f31b612aed3725cbdd0ff41e8cd8065ae8b8adf Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Wed, 21 Sep 2022 10:47:02 -0700
Subject: [PATCH 691/854] readthedocs doesn't like "all", list separately

---
 .readthedocs.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.readthedocs.yml b/.readthedocs.yml
index f1e062683..1e570e571 100644
--- a/.readthedocs.yml
+++ b/.readthedocs.yml
@@ -13,7 +13,9 @@ sphinx:
   configuration: conf.py
 
 formats:
-  - all
+  - htmlzip
+  - pdf
+  - epub
 
 python:
   install:

From 30100bec8fb1650d62af11e48b9757af5ed9f3e3 Mon Sep 17 00:00:00 2001
From: Tachytaenius <henryfthomson@gmail.com>
Date: Thu, 22 Sep 2022 20:23:56 +0100
Subject: [PATCH 692/854] Add link to Tachy Guns and show more code
 configurations in guide

---
 docs/guides/modding-guide.rst | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/docs/guides/modding-guide.rst b/docs/guides/modding-guide.rst
index fa0510290..cc7d507d5 100644
--- a/docs/guides/modding-guide.rst
+++ b/docs/guides/modding-guide.rst
@@ -348,6 +348,9 @@ timer::
 The structure of a full mod
 ---------------------------
 
+For reference, `Tachy Guns <https://www.github.com/wolfboyft/tachy-guns>`__ is a
+full mod that conforms to this guide.
+
 Create a folder for mod projects somewhere outside your Dwarf Fortress
 installation directory (e.g. ``/path/to/mymods/``) and use your mod IDs as the
 names for the mod folders within it. In the example below, we'll use a mod ID of
@@ -425,13 +428,18 @@ Ok, you're all set up! Now, let's take a look at an example
         moduleA.onLoad()
         moduleB.onLoad()
 
-        -- register your callbacks
-        repeatUtil.scheduleEvery(modId .. ' every tick', 1, 'ticks',
-                                 moduleA.every1Tick)
+        -- multiple functions in the same repeat callback
+        repeatUtil.scheduleEvery(modId .. ' every tick', 1, 'ticks', function()
+            moduleA.every1Tick()
+            moduleB.every1Tick()
+        end)
+        
+        -- one function per repeat callback (you can put them in the
+        -- above format if you prefer)
         repeatUtil.scheduleEvery(modId .. ' 100 frames', 1, 'frames',
                                  moduleD.every100Frames)
 
-        -- multiple functions in the same callback
+        -- multiple functions in the same eventful callback
         eventful.onReactionComplete[modId] = function(reaction,
                 reaction_product, unit, input_items, input_reagents,
                 output_items)
@@ -442,7 +450,7 @@ Ok, you're all set up! Now, let's take a look at an example
                     unit, input_items, input_reagents, output_items)
         end
 
-        -- one function per callback (you can put them in the
+        -- one function per eventful callback (you can put them in the
         -- above format if you prefer)
         eventful.onProjItemCheckMovement[modId] = moduleD.onProjItemCheckMovement
         eventful.onProjUnitCheckMovement[modId] = moduleD.onProjUnitCheckMovement

From 6810f9bb903419f3225d2567f6f7260e27492e0e Mon Sep 17 00:00:00 2001
From: Tachytaenius <henryfthomson@gmail.com>
Date: Thu, 22 Sep 2022 20:31:43 +0100
Subject: [PATCH 693/854] Remove empty indented line

---
 docs/guides/modding-guide.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/guides/modding-guide.rst b/docs/guides/modding-guide.rst
index cc7d507d5..4b768be58 100644
--- a/docs/guides/modding-guide.rst
+++ b/docs/guides/modding-guide.rst
@@ -433,7 +433,7 @@ Ok, you're all set up! Now, let's take a look at an example
             moduleA.every1Tick()
             moduleB.every1Tick()
         end)
-        
+
         -- one function per repeat callback (you can put them in the
         -- above format if you prefer)
         repeatUtil.scheduleEvery(modId .. ' 100 frames', 1, 'frames',

From 4d662adfe56618919a917e7c7279cc948d7264a4 Mon Sep 17 00:00:00 2001
From: Myk <myk002@yahoo.com>
Date: Thu, 22 Sep 2022 17:39:54 -0700
Subject: [PATCH 694/854] Fix marker checking for ruby help text

---
 library/lua/helpdb.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/library/lua/helpdb.lua b/library/lua/helpdb.lua
index e5359b323..655b4143b 100644
--- a/library/lua/helpdb.lua
+++ b/library/lua/helpdb.lua
@@ -275,7 +275,7 @@ local function make_script_entry(old_entry, entry_name, kwargs)
     local is_rb = source_path:endswith('.rb')
     update_entry(entry, lines,
             {begin_marker=(is_rb and SCRIPT_DOC_BEGIN_RUBY or SCRIPT_DOC_BEGIN),
-             end_marker=(is_rb and SCRIPT_DOC_BEGIN_RUBY or SCRIPT_DOC_END),
+             end_marker=(is_rb and SCRIPT_DOC_END_RUBY or SCRIPT_DOC_END),
              first_line_is_short_help=(is_rb and '#' or '%-%-')})
     return entry
 end

From b07f3b5b6c3143d27643c2b8106644fd93a54ccf Mon Sep 17 00:00:00 2001
From: Myk <myk002@yahoo.com>
Date: Thu, 22 Sep 2022 17:43:56 -0700
Subject: [PATCH 695/854] stub help formatted same as real help

---
 library/lua/helpdb.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/library/lua/helpdb.lua b/library/lua/helpdb.lua
index 655b4143b..dc9eb1738 100644
--- a/library/lua/helpdb.lua
+++ b/library/lua/helpdb.lua
@@ -120,7 +120,7 @@ No help available.
 ]]
 local function make_default_entry(entry_name, help_source, kwargs)
     local default_long_help = DEFAULT_HELP_TEMPLATE:format(
-                                            entry_name, ('*'):rep(#entry_name))
+                                            entry_name, ('='):rep(#entry_name))
     return {
         help_source=help_source,
         short_help='No help available.',

From fae26b2375304265449f174b16e8ffc5917ffecc Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Fri, 23 Sep 2022 08:34:22 -0700
Subject: [PATCH 696/854] replace die's underline with tombstones

easter egg suggested by thurin : )
---
 library/lua/helpdb.lua  |   2 +
 test/library/helpdb.lua | 116 +++++++++++++++++++---------------------
 2 files changed, 57 insertions(+), 61 deletions(-)

diff --git a/library/lua/helpdb.lua b/library/lua/helpdb.lua
index dc9eb1738..c39d3ba80 100644
--- a/library/lua/helpdb.lua
+++ b/library/lua/helpdb.lua
@@ -321,6 +321,8 @@ local function scan_builtins(old_db)
                 HELP_SOURCES.RENDERED or HELP_SOURCES.STUB,
             {entry_types=entry_types})
     end
+    -- easter egg: replace underline for 'die' help with tombstones
+    textdb.die.long_help = textdb.die.long_help:gsub('=', string.char(239))
 end
 
 -- scan for enableable plugins and plugin-provided commands and add their help
diff --git a/test/library/helpdb.lua b/test/library/helpdb.lua
index 7a223bcaa..067f35532 100644
--- a/test/library/helpdb.lua
+++ b/test/library/helpdb.lua
@@ -42,10 +42,7 @@ local files = {
     ['hack/docs/docs/Tags.txt']=[[
 * fort: Tools that are useful while in fort mode.
 
-* armok: Tools that give you complete control over
-  an aspect of the game or provide access to
-  information that the game intentionally keeps
-  hidden.
+* armok: Tools that give you complete control over an aspect of the game or provide access to information that the game intentionally keeps hidden.
 
 * map: Tools that interact with the game map.
 
@@ -55,68 +52,65 @@ local files = {
     ]],
     ['hack/docs/docs/tools/hascommands.txt']=[[
 hascommands
-***********
+===========
 
-**Tags:** fort | armok | units
+Tags: fort | armok | units
 
-Documented a plugin that
-has commands.
+  Documented a plugin that has commands.
 
-**Command:** "boxbinders"
+Command: "boxbinders"
 
-Documented boxbinders.
+  Documented boxbinders.
 
-**Command:** "bindboxers"
+Command: "bindboxers"
 
-Documented bindboxers.
+  Documented bindboxers.
 
 Documented full help.
     ]],
     ['hack/docs/docs/tools/samename.txt']=[[
 samename
-********
+========
 
-**Tags:** fort | armok
-| units
+Tags: fort | armok | units
 
-**Command:** "samename"
+Command: "samename"
 
-Documented samename.
+  Documented samename.
 
 Documented full help.
     ]],
     ['hack/docs/docs/tools/nocommand.txt']=[[
 nocommand
-*********
+=========
 
-**Tags:** fort | armok |
-units
+Tags: fort | armok | units
 
-Documented nocommand.
+  Documented nocommand.
 
 Documented full help.
     ]],
     ['hack/docs/docs/tools/basic.txt']=[[
 basic
-*****
+=====
 
-**Tags:** map
+Tags: map
 
-**Command:** "basic"
+Command: "basic"
 
-Documented basic.
+  Documented basic.
 
 Documented full help.
     ]],
     ['hack/docs/docs/tools/subdir/scriptname.txt']=[[
 subdir/scriptname
-*****************
+=================
 
-**Tags:** map
+Tags: map
 
-**Command:** "subdir/scriptname"
+Command: "subdir/scriptname"
 
-Documented subdir/scriptname.
+  Documented subdir/scriptname.
 
 Documented full help.
     ]],
@@ -126,11 +120,11 @@ Documented full help.
 basic
 =====
 
-**Tags:** map
+Tags: map
 
-**Command:** "basic"
+Command: "basic"
 
-in-file basic.
+  in-file basic.
 
 Documented full help.
 ]====]
@@ -142,11 +136,11 @@ script contents
 subdir/scriptname
 =================
 
-**Tags:** map
+Tags: map
 
-**Command:** "subdir/scriptname"
+Command: "subdir/scriptname"
 
-in-file scriptname.
+  in-file scriptname.
 
 Documented full help.
 ]====]
@@ -158,11 +152,11 @@ script contents
 inscript_docs
 =============
 
-**Tags:** map | badtag
+Tags: map | badtag
 
-**Command:** "inscript_docs"
+Command: "inscript_docs"
 
-in-file inscript_docs.
+  in-file inscript_docs.
 
 Documented full help.
 ]====]
@@ -182,11 +176,11 @@ script contents
 basic
 =====
 
-**Tags:** map
+Tags: map
 
-**Command:** "basic"
+Command: "basic"
 
-in-file basic (other).
+  in-file basic (other).
 
 Documented full help.
 ]====]
@@ -198,11 +192,11 @@ script contents
 subdir/scriptname
 =================
 
-**Tags:** map
+Tags: map
 
-**Command:** "subdir/scriptname"
+Command: "subdir/scriptname"
 
-in-file scriptname (other).
+  in-file scriptname (other).
 
 Documented full help.
 ]====]
@@ -214,11 +208,11 @@ script contents
 inscript_docs
 =============
 
-**Tags:** map
+Tags: map
 
-**Command:** "inscript_docs"
+Command: "inscript_docs"
 
-in-file inscript_docs (other).
+  in-file inscript_docs (other).
 
 Documented full help.
 ]====]
@@ -400,15 +394,15 @@ end
 function test.get_entry_long_help()
     local expected = [[
 basic
-*****
+=====
 
-**Tags:** map
+Tags: map
 
-**Command:**
+Command:
 "basic"
 
-Documented
-basic.
+  Documented
+  basic.
 
 Documented
 full help.
@@ -432,34 +426,34 @@ full help.
 
     -- plugins/commands that have no doc files get the default template
     expect.eq([[ls
-**
+==
 
 No help available.
 ]], h.get_entry_long_help('ls'))
     expect.eq([[nodocs_hascommands
-******************
+==================
 
 No help available.
 ]], h.get_entry_long_help('nodocs_hascommands'))
     expect.eq([[nodocs_hascommands
-******************
+==================
 
 No help available.
 ]], h.get_entry_long_help('nodoc_command'))
     expect.eq([[Nodocs samename.
         This command has the same name as its host plugin but no rst docs.]], h.get_entry_long_help('nodocs_samename'))
     expect.eq([[nodocs_nocommand
-****************
+================
 
 No help available.
 ]], h.get_entry_long_help('nodocs_nocommand'))
     expect.eq([[nodocs_script
-*************
+=============
 
 No help available.
 ]], h.get_entry_long_help('nodocs_script'))
     expect.eq([[inscript_short_only
-*******************
+===================
 
 No help available.
 ]], h.get_entry_long_help('inscript_short_only'))
@@ -468,11 +462,11 @@ No help available.
     expect.eq([[inscript_docs
 =============
 
-**Tags:** map | badtag
+Tags: map | badtag
 
-**Command:** "inscript_docs"
+Command: "inscript_docs"
 
-in-file inscript_docs.
+  in-file inscript_docs.
 
 Documented full help.]], h.get_entry_long_help('inscript_docs'))
 end

From 7c498e66119890bbb3188c245d1e098048532e72 Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Fri, 23 Sep 2022 08:39:40 -0700
Subject: [PATCH 697/854] add note about regenerating dwarfmonitor.json

---
 docs/changelog.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/changelog.txt b/docs/changelog.txt
index c3f8996c3..895f7db72 100644
--- a/docs/changelog.txt
+++ b/docs/changelog.txt
@@ -36,7 +36,7 @@ changelog.txt uses a syntax similar to RST, with a few special sequences:
 ## New Plugins
 - `autonestbox`: split off from `zone` into its own plugin. Note that to enable, the command has changed from ``autonestbox start`` to ``enable autonestbox``.
 - `autobutcher`: split off from `zone` into its own plugin. Note that to enable, the command has changed from ``autobutcher start`` to ``enable autobutcher``.
-- `overlay`: display a "DFHack" button in the lower left corner that you can click to start the new GUI command launcher.
+- `overlay`: display a "DFHack" button in the lower left corner that you can click to start the new GUI command launcher. The `dwarfmonitor` weather display had to be moved to make room for the button. If you are seeing the weather indicator rendered over the overlay button, please remove the ``dfhack-config/dwarfmonitor.json`` file to fix the weather indicator display offset.
 
 ## New Tweaks
 

From 618a191c8756d469d916498977100542860b8649 Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Wed, 21 Sep 2022 12:54:12 -0700
Subject: [PATCH 698/854] fix directive use for reveal.rst

---
 docs/plugins/reveal.rst | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/docs/plugins/reveal.rst b/docs/plugins/reveal.rst
index 19066076b..bbcc07b6b 100644
--- a/docs/plugins/reveal.rst
+++ b/docs/plugins/reveal.rst
@@ -7,19 +7,19 @@ reveal
     :summary: Reveals the map.
     :tags: adventure fort armok inspection map
 
-.. dfhack-tool:: unreveal
+.. dfhack-command:: unreveal
    :summary: Hides previously hidden tiles again.
 
-.. dfhack-tool:: revforget
+.. dfhack-command:: revforget
    :summary: Discard records about what was visible before revealing the map.
 
-.. dfhack-tool:: revtoggle
+.. dfhack-command:: revtoggle
    :summary: Switch between reveal and unreveal.
 
-.. dfhack-tool:: revflood
+.. dfhack-command:: revflood
    :summary: Hide everything, then reveal tiles with a path to the cursor.
 
-.. dfhack-tool:: nopause
+.. dfhack-command:: nopause
    :summary: Disable pausing.
 
 This reveals all z-layers in fort mode. It also works in adventure mode, but any

From 4913637b620a45e2aa97157e5866d90df64104ad Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Wed, 21 Sep 2022 12:54:28 -0700
Subject: [PATCH 699/854] genindex label "alphabetical" -> "annotated"

---
 docs/Tools.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/Tools.rst b/docs/Tools.rst
index aeff179aa..e694ba897 100644
--- a/docs/Tools.rst
+++ b/docs/Tools.rst
@@ -34,7 +34,7 @@ DFHack tools are tagged with categories to make them easier to find. These
 categories are listed in the next few sections. Note that a tool can belong to
 more than one category. If you already know what you're looking for, try the
 `search` or Ctrl-F on this page. If you'd like to see the full list of tools in
-one flat list, please refer to the `alphabetized index <genindex>`.
+one flat list, please refer to the `annotated index <genindex>`.
 
 DFHack tools by game mode
 -------------------------

From 278b7528ac60d9c838f56981d1f2c2c2f3b77bf7 Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Wed, 21 Sep 2022 17:53:51 -0700
Subject: [PATCH 700/854] implement basic domain index structure

---
 conf.py                                    | 59 ++------------------
 docs/Core.rst                              |  2 +-
 docs/Memory-research.rst                   |  2 +-
 docs/Tags.rst                              | 54 +++++++++---------
 docs/sphinx_extensions/dfhack/tool_docs.py | 64 ++++++++++++++++++++--
 library/lua/helpdb.lua                     |  2 +-
 6 files changed, 94 insertions(+), 89 deletions(-)

diff --git a/conf.py b/conf.py
index 0170a872b..01c358153 100644
--- a/conf.py
+++ b/conf.py
@@ -58,9 +58,6 @@ def doc_dir(dirname, files, prefix):
 def doc_all_dirs():
     """Collect the commands and paths to include in our docs."""
     tools = []
-    # TODO: as we scan the docs, parse out the tags and short descriptions and
-    # build a map for use in generating the tags pages and links in the tool
-    # doc footers
     for root, _, files in os.walk('docs/builtins'):
         tools.extend(doc_dir(root, files, os.path.relpath(root, 'docs/builtins')))
     for root, _, files in os.walk('docs/plugins'):
@@ -69,59 +66,16 @@ def doc_all_dirs():
         tools.extend(doc_dir(root, files, os.path.relpath(root, 'scripts/docs')))
     return tuple(tools)
 
-DOC_ALL_DIRS = doc_all_dirs()
-
-
-def get_tags():
-    groups = {}
-    group_re = re.compile(r'"([^"]+)"')
-    tag_re = re.compile(r'- `tag/([^`]+)`: (.*)')
-    with open('docs/Tags.rst') as f:
-        lines = f.readlines()
-        for line in lines:
-            line = line.strip()
-            m = re.match(group_re, line)
-            if m:
-                group = m.group(1)
-                groups[group] = []
-                continue
-            m = re.match(tag_re, line)
-            if m:
-                tag = m.group(1)
-                desc = m.group(2)
-                groups[group].append((tag, desc))
-    return groups
-
-
-def generate_tag_indices():
-    os.makedirs('docs/tags', mode=0o755, exist_ok=True)
-    tag_groups = get_tags()
-    for tag_group in tag_groups:
-        with write_file_if_changed(('docs/tags/by{group}.rst').format(group=tag_group)) as topidx:
-            for tag_tuple in tag_groups[tag_group]:
-                tag = tag_tuple[0]
-                with write_file_if_changed(('docs/tags/{name}.rst').format(name=tag)) as tagidx:
-                    tagidx.write('TODO: add links to the tools that have this tag')
-                topidx.write(('.. _tag/{name}:\n\n').format(name=tag))
-                topidx.write(('{name}\n').format(name=tag))
-                topidx.write(('{underline}\n').format(underline='*'*len(tag)))
-                topidx.write(('{desc}\n\n').format(desc=tag_tuple[1]))
-                topidx.write(('.. include:: /docs/tags/{name}.rst\n\n').format(name=tag))
-
 
 def write_tool_docs():
     """
     Creates a file for each tool with the ".. include::" directives to pull in
-    the original documentation. Then we generate a label and useful info in the
-    footer.
+    the original documentation.
     """
-    for k in DOC_ALL_DIRS:
+    for k in doc_all_dirs():
         header = ':orphan:\n'
         label = ('.. _{name}:\n\n').format(name=k[0])
         include = ('.. include:: /{path}\n\n').format(path=k[1])
-        # TODO: generate a footer with links to tools that share at least one
-        # tag with this tool. Just the tool names, strung across the bottom of
-        # the page in one long wrapped line, similar to how the wiki does it
         os.makedirs(os.path.join('docs/tools', os.path.dirname(k[0])),
                     mode=0o755, exist_ok=True)
         with write_file_if_changed('docs/tools/{}.rst'.format(k[0])) as outfile:
@@ -131,9 +85,8 @@ def write_tool_docs():
             outfile.write(include)
 
 
-# Actually call the docs generator and run test
 write_tool_docs()
-generate_tag_indices()
+
 
 # -- General configuration ------------------------------------------------
 
@@ -315,11 +268,9 @@ html_sidebars = {
     ]
 }
 
-# If false, no module index is generated.
-html_domain_indices = False
-
-# If false, no genindex.html is generated.
+# generate indices
 html_use_index = True
+html_domain_indices = True
 
 # don't link to rst sources in the generated pages
 html_show_sourcelink = False
diff --git a/docs/Core.rst b/docs/Core.rst
index e03a7fcba..012236d59 100644
--- a/docs/Core.rst
+++ b/docs/Core.rst
@@ -185,7 +185,7 @@ where ``*`` can be any string, including the empty string.
 A world being loaded can mean a fortress, an adventurer, or legends mode.
 
 These files are best used for non-persistent commands, such as setting
-a `tag/bugfix` script to run on `repeat`.
+a `bugfix-tag-index` script to run on `repeat`.
 
 
 .. _onMapLoad.init:
diff --git a/docs/Memory-research.rst b/docs/Memory-research.rst
index d9c0833e3..c4c7aeb63 100644
--- a/docs/Memory-research.rst
+++ b/docs/Memory-research.rst
@@ -63,7 +63,7 @@ are not built by default, but can be built by setting the ``BUILD_DEVEL``
 Scripts
 ~~~~~~~
 
-Several `development tools <tag/dev>` can be useful for memory research.
+Several `development tools <dev-tag-index>` can be useful for memory research.
 These include (but are not limited to):
 
 - `devel/dump-offsets`
diff --git a/docs/Tags.rst b/docs/Tags.rst
index 9f3906d58..14a12f411 100644
--- a/docs/Tags.rst
+++ b/docs/Tags.rst
@@ -13,36 +13,36 @@ for the tag assignment spreadsheet.
 
 "when" tags
 -----------
-- `tag/adventure`: Tools that are useful while in adventure mode. Note that some tools only tagged with "fort" might also work in adventure mode, but not always in expected ways. Feel free to experiment, though!
-- `tag/dfhack`: Tools that you use to run DFHack commands or interact with the DFHack library. This tag also includes tools that help you manage the DF game itself (e.g. settings, saving, etc.)
-- `tag/embark`: Tools that are useful while on the fort embark screen or while creating an adventurer.
-- `tag/fort`: Tools that are useful while in fort mode.
-- `tag/legends`: Tools that are useful while in legends mode.
+- `adventure-tag-index`: Tools that are useful while in adventure mode. Note that some tools only tagged with "fort" might also work in adventure mode, but not always in expected ways. Feel free to experiment, though!
+- `dfhack-tag-index`: Tools that you use to run DFHack commands or interact with the DFHack library. This tag also includes tools that help you manage the DF game itself (e.g. settings, saving, etc.)
+- `embark-tag-index`: Tools that are useful while on the fort embark screen or while creating an adventurer.
+- `fort-tag-index`: Tools that are useful while in fort mode.
+- `legends-tag-index`: Tools that are useful while in legends mode.
 
 "why" tags
 ----------
-- `tag/armok`: Tools that give you complete control over an aspect of the game or provide access to information that the game intentionally keeps hidden.
-- `tag/auto`: Tools that run in the background and automatically manage routine, toilsome aspects of your fortress.
-- `tag/bugfix`: Tools that fix specific bugs, either permanently or on-demand.
-- `tag/design`: Tools that help you design your fort.
-- `tag/dev`: Tools that are useful when developing scripts or mods.
-- `tag/fps`: Tools that help you manage FPS drop.
-- `tag/gameplay`: Tools that introduce new gameplay elements.
-- `tag/inspection`: Tools that let you view information that is otherwise difficult to find.
-- `tag/productivity`: Tools that help you do things that you could do manually, but using the tool is better and faster.
+- `armok-tag-index`: Tools that give you complete control over an aspect of the game or provide access to information that the game intentionally keeps hidden.
+- `auto-tag-index`: Tools that run in the background and automatically manage routine, toilsome aspects of your fortress.
+- `bugfix-tag-index`: Tools that fix specific bugs, either permanently or on-demand.
+- `design-tag-index`: Tools that help you design your fort.
+- `dev-tag-index`: Tools that are useful when developing scripts or mods.
+- `fps-tag-index`: Tools that help you manage FPS drop.
+- `gameplay-tag-index`: Tools that introduce new gameplay elements.
+- `inspection-tag-index`: Tools that let you view information that is otherwise difficult to find.
+- `productivity-tag-index`: Tools that help you do things that you could do manually, but using the tool is better and faster.
 
 "what" tags
 -----------
-- `tag/animals`: Tools that interact with animals.
-- `tag/buildings`: Tools that interact with buildings and furniture.
-- `tag/graphics`: Tools that interact with game graphics.
-- `tag/interface`: Tools that interact with or extend the DF user interface.
-- `tag/items`: Tools that interact with in-game items.
-- `tag/jobs`: Tools that interact with jobs.
-- `tag/labors`: Tools that deal with labor assignment.
-- `tag/map`: Tools  that interact with the game map.
-- `tag/military`: Tools that interact with the military.
-- `tag/plants`: Tools that interact with trees, shrubs, and crops.
-- `tag/stockpiles`: Tools that interact wtih stockpiles.
-- `tag/units`: Tools that interact with units.
-- `tag/workorders`: Tools that interact with workorders.
+- `animals-tag-index`: Tools that interact with animals.
+- `buildings-tag-index`: Tools that interact with buildings and furniture.
+- `graphics-tag-index`: Tools that interact with game graphics.
+- `interface-tag-index`: Tools that interact with or extend the DF user interface.
+- `items-tag-index`: Tools that interact with in-game items.
+- `jobs-tag-index`: Tools that interact with jobs.
+- `labors-tag-index`: Tools that deal with labor assignment.
+- `map-tag-index`: Tools  that interact with the game map.
+- `military-tag-index`: Tools that interact with the military.
+- `plants-tag-index`: Tools that interact with trees, shrubs, and crops.
+- `stockpiles-tag-index`: Tools that interact wtih stockpiles.
+- `units-tag-index`: Tools that interact with units.
+- `workorders-tag-index`: Tools that interact with workorders.
diff --git a/docs/sphinx_extensions/dfhack/tool_docs.py b/docs/sphinx_extensions/dfhack/tool_docs.py
index 6f5df5568..cff47de79 100644
--- a/docs/sphinx_extensions/dfhack/tool_docs.py
+++ b/docs/sphinx_extensions/dfhack/tool_docs.py
@@ -5,7 +5,8 @@
 
 import logging
 import os
-from typing import List, Optional, Type
+import re
+from typing import Iterable, List, Optional, Tuple, Type
 
 import docutils.nodes as nodes
 from docutils.nodes import Node
@@ -13,13 +14,13 @@ import docutils.parsers.rst.directives as rst_directives
 import sphinx
 import sphinx.addnodes as addnodes
 import sphinx.directives
+from sphinx.domains import Domain, Index, IndexEntry
 from sphinx.util.docutils import SphinxDirective
 from sphinx.util.nodes import process_index_entry
 
 import dfhack.util
 
 
-
 logger = sphinx.util.logging.getLogger(__name__)
 
 
@@ -165,7 +166,7 @@ class DFHackToolDirective(DFHackToolDirectiveBase):
                 addnodes.pending_xref(tag, nodes.inline(text=tag), **{
                     'reftype': 'ref',
                     'refdomain': 'std',
-                    'reftarget': 'tag/' + tag,
+                    'reftarget': tag + '-tag-index',
                     'refexplicit': False,
                     'refwarn': True,
                 }),
@@ -202,6 +203,56 @@ class DFHackCommandDirective(DFHackToolDirectiveBase):
         return ret_nodes
 
 
+def get_tags():
+    groups = {}
+    group_re = re.compile(r'"([^"]+)"')
+    tag_re = re.compile(r'- `([^`]+)-tag-index`: (.*)')
+    with open('docs/Tags.rst') as f:
+        lines = f.readlines()
+        for line in lines:
+            line = line.strip()
+            m = re.match(group_re, line)
+            if m:
+                group = m.group(1)
+                groups[group] = []
+                continue
+            m = re.match(tag_re, line)
+            if m:
+                tag = m.group(1)
+                desc = m.group(2)
+                groups[group].append((tag, desc))
+    return groups
+
+
+def generate_tag_index(self, docnames: Optional[Iterable[str]] = None) -> Tuple[List[Tuple[str, List[IndexEntry]]], bool]:
+    return [('A', [['name', 0, '', '', '', '', '']])], False
+
+
+def init_tag_indices(app):
+    os.makedirs('docs/tags', mode=0o755, exist_ok=True)
+    tag_groups = get_tags()
+    for tag_group in tag_groups:
+        with dfhack.util.write_file_if_changed(('docs/tags/by{group}.rst').format(group=tag_group)) as topidx:
+            for tag_tuple in tag_groups[tag_group]:
+                tag, desc = tag_tuple[0], tag_tuple[1]
+                topidx.write(('- `{name} <{name}-tag-index>`\n').format(name=tag))
+                topidx.write(('    {desc}\n').format(desc=desc))
+
+                domain_class = type(tag+'Domain', (Domain, ), {
+                        'name': tag,
+                        'label': 'Container domain for tag: ' + tag,
+                    })
+                index_class = type(tag+'Index', (Index, ), {
+                        'name': 'tag-index',
+                        'localname': tag + ' tag index',
+                        'shortname': tag,
+                        'desc': desc,
+                        'generate': generate_tag_index,
+                    })
+                app.add_domain(domain_class)
+                app.add_index_to_domain(tag, index_class)
+
+
 def register(app):
     app.add_directive('dfhack-tool', DFHackToolDirective)
     app.add_directive('dfhack-command', DFHackCommandDirective)
@@ -212,11 +263,14 @@ def register(app):
 def setup(app):
     app.connect('builder-inited', register)
 
+    init_tag_indices(app)
+
     # TODO: re-enable once detection is corrected
     # app.connect('build-finished', lambda *_: check_missing_keybinds())
 
+    # TODO: implement parallel builds so we can set these back to True
     return {
         'version': '0.1',
-        'parallel_read_safe': True,
-        'parallel_write_safe': True,
+        'parallel_read_safe': False,
+        'parallel_write_safe': False,
     }
diff --git a/library/lua/helpdb.lua b/library/lua/helpdb.lua
index c39d3ba80..ac6adb55d 100644
--- a/library/lua/helpdb.lua
+++ b/library/lua/helpdb.lua
@@ -396,7 +396,7 @@ local function initialize_tags()
             desc = desc .. ' ' .. line
             tag_index[tag].description = desc
         else
-            _,_,tag,desc = line:find('^%* (%w+): (.+)')
+            _,_,tag,desc = line:find('^%* (%w+)[^:]*: (.+)')
             if not tag then goto continue end
             tag_index[tag] = {description=desc}
             in_desc = true

From a1d3fe77b5d3265823cd55659c9479e5ea33bb83 Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Fri, 23 Sep 2022 08:10:37 -0700
Subject: [PATCH 701/854] add a bit more index infrastructure

---
 docs/sphinx_extensions/dfhack/tool_docs.py | 27 +++++++++++++++-------
 1 file changed, 19 insertions(+), 8 deletions(-)

diff --git a/docs/sphinx_extensions/dfhack/tool_docs.py b/docs/sphinx_extensions/dfhack/tool_docs.py
index cff47de79..152a65280 100644
--- a/docs/sphinx_extensions/dfhack/tool_docs.py
+++ b/docs/sphinx_extensions/dfhack/tool_docs.py
@@ -6,7 +6,7 @@
 import logging
 import os
 import re
-from typing import Iterable, List, Optional, Tuple, Type
+from typing import Dict, Iterable, List, Optional, Tuple, Type
 
 import docutils.nodes as nodes
 from docutils.nodes import Node
@@ -167,10 +167,12 @@ class DFHackToolDirective(DFHackToolDirectiveBase):
                     'reftype': 'ref',
                     'refdomain': 'std',
                     'reftarget': tag + '-tag-index',
-                    'refexplicit': False,
+                    'refexplicit': True,
                     'refwarn': True,
                 }),
                 nodes.inline(text=' | '),
+                indexdata = (self.env.docname)
+                self.env.domaindata[tag]['objects'].append(indexdata)
             ]
         tag_paragraph.pop()
 
@@ -224,8 +226,15 @@ def get_tags():
     return groups
 
 
-def generate_tag_index(self, docnames: Optional[Iterable[str]] = None) -> Tuple[List[Tuple[str, List[IndexEntry]]], bool]:
-    return [('A', [['name', 0, '', '', '', '', '']])], False
+def tag_domain_get_objects(self):
+    for obj in self.data['objects']:
+        yield(obj)
+
+def tag_domain_merge_domaindata(self, docnames: List[str], otherdata: Dict) -> None:
+    self.data['objects'].extend(otherdata['objects'])
+
+def tag_index_generate(self, docnames: Optional[Iterable[str]] = None) -> Tuple[List[Tuple[str, List[IndexEntry]]], bool]:
+    return [('G', [['gui/blueprint', 0, 'docs/tools/gui/blueprint', 'gui-blueprint', '', '', '']])], False
 
 
 def init_tag_indices(app):
@@ -241,13 +250,16 @@ def init_tag_indices(app):
                 domain_class = type(tag+'Domain', (Domain, ), {
                         'name': tag,
                         'label': 'Container domain for tag: ' + tag,
+                        'initial_data': {'objects': []},
+                        'merge_domaindata': tag_domain_merge_domaindata,
+                        'get_objects': tag_domain_get_objects,
                     })
                 index_class = type(tag+'Index', (Index, ), {
                         'name': 'tag-index',
                         'localname': tag + ' tag index',
                         'shortname': tag,
                         'desc': desc,
-                        'generate': generate_tag_index,
+                        'generate': tag_index_generate,
                     })
                 app.add_domain(domain_class)
                 app.add_index_to_domain(tag, index_class)
@@ -268,9 +280,8 @@ def setup(app):
     # TODO: re-enable once detection is corrected
     # app.connect('build-finished', lambda *_: check_missing_keybinds())
 
-    # TODO: implement parallel builds so we can set these back to True
     return {
         'version': '0.1',
-        'parallel_read_safe': False,
-        'parallel_write_safe': False,
+        'parallel_read_safe': True,
+        'parallel_write_safe': True,
     }

From a92e5d1f74e7017b0bc4b11cc8b5681d7a01e3f6 Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Fri, 23 Sep 2022 09:32:08 -0700
Subject: [PATCH 702/854] populate, merge, and generate real tag indices

---
 docs/sphinx_extensions/dfhack/tool_docs.py | 24 +++++++++++++++++-----
 1 file changed, 19 insertions(+), 5 deletions(-)

diff --git a/docs/sphinx_extensions/dfhack/tool_docs.py b/docs/sphinx_extensions/dfhack/tool_docs.py
index 152a65280..d32f7c0b3 100644
--- a/docs/sphinx_extensions/dfhack/tool_docs.py
+++ b/docs/sphinx_extensions/dfhack/tool_docs.py
@@ -3,6 +3,7 @@
 #   https://www.sphinx-doc.org/en/master/development/tutorials/recipe.html
 #   https://www.sphinx-doc.org/en/master/usage/restructuredtext/basics.html#rst-directives
 
+from collections import defaultdict
 import logging
 import os
 import re
@@ -171,9 +172,10 @@ class DFHackToolDirective(DFHackToolDirectiveBase):
                     'refwarn': True,
                 }),
                 nodes.inline(text=' | '),
-                indexdata = (self.env.docname)
-                self.env.domaindata[tag]['objects'].append(indexdata)
             ]
+            name = self.get_name_or_docname()
+            indexdata = (name, self.options.get('summary', ''), '', self.env.docname, '', 0)
+            self.env.domaindata[tag]['objects'].append(indexdata)
         tag_paragraph.pop()
 
         ret_nodes = [tag_paragraph]
@@ -231,10 +233,22 @@ def tag_domain_get_objects(self):
         yield(obj)
 
 def tag_domain_merge_domaindata(self, docnames: List[str], otherdata: Dict) -> None:
-    self.data['objects'].extend(otherdata['objects'])
+    seen = set()
+    objs = self.data['objects']
+    for obj in objs:
+        seen.add(obj[0])
+    for obj in otherdata['objects']:
+        if obj[0] not in seen:
+            objs.append(obj)
+    objs.sort()
 
 def tag_index_generate(self, docnames: Optional[Iterable[str]] = None) -> Tuple[List[Tuple[str, List[IndexEntry]]], bool]:
-    return [('G', [['gui/blueprint', 0, 'docs/tools/gui/blueprint', 'gui-blueprint', '', '', '']])], False
+    content = defaultdict(list)
+    for name, desc, _, docname, _, _ in self.domain.data['objects']:
+        first_letter = name[0].lower()
+        content[first_letter].append(
+            IndexEntry(name, 0, docname, '', '', '', desc))
+    return (sorted(content.items()), False)
 
 
 def init_tag_indices(app):
@@ -256,7 +270,7 @@ def init_tag_indices(app):
                     })
                 index_class = type(tag+'Index', (Index, ), {
                         'name': 'tag-index',
-                        'localname': tag + ' tag index',
+                        'localname': '"' + tag + '" tag index',
                         'shortname': tag,
                         'desc': desc,
                         'generate': tag_index_generate,

From 1b9cd830093fdf1a2fe541f01cd341ca7df65e82 Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Fri, 23 Sep 2022 10:10:28 -0700
Subject: [PATCH 703/854] use a domain index instead of the genindex

---
 conf.py                                    |  4 +-
 docs/Tools.rst                             |  2 +-
 docs/sphinx_extensions/dfhack/tool_docs.py | 65 +++++++++-------------
 3 files changed, 30 insertions(+), 41 deletions(-)

diff --git a/conf.py b/conf.py
index 01c358153..2742e18f0 100644
--- a/conf.py
+++ b/conf.py
@@ -268,8 +268,8 @@ html_sidebars = {
     ]
 }
 
-# generate indices
-html_use_index = True
+# generate domain indices but not the (unused) genindex
+html_use_index = False
 html_domain_indices = True
 
 # don't link to rst sources in the generated pages
diff --git a/docs/Tools.rst b/docs/Tools.rst
index e694ba897..20ceea769 100644
--- a/docs/Tools.rst
+++ b/docs/Tools.rst
@@ -34,7 +34,7 @@ DFHack tools are tagged with categories to make them easier to find. These
 categories are listed in the next few sections. Note that a tool can belong to
 more than one category. If you already know what you're looking for, try the
 `search` or Ctrl-F on this page. If you'd like to see the full list of tools in
-one flat list, please refer to the `annotated index <genindex>`.
+one flat list, please refer to the `annotated index <all-tag-index>`.
 
 DFHack tools by game mode
 -------------------------
diff --git a/docs/sphinx_extensions/dfhack/tool_docs.py b/docs/sphinx_extensions/dfhack/tool_docs.py
index d32f7c0b3..412a332b8 100644
--- a/docs/sphinx_extensions/dfhack/tool_docs.py
+++ b/docs/sphinx_extensions/dfhack/tool_docs.py
@@ -52,18 +52,6 @@ def make_summary(builder: sphinx.builders.Builder, summary: str) -> nodes.paragr
     para += nodes.inline(text=summary)
     return para
 
-def make_index(directive: SphinxDirective, name: str, summary: str) -> List[Node]:
-    targetid = 'index-%s' % directive.env.new_serialno('index')
-    targetnode = nodes.target('', '', ids=[targetid])
-    directive.state.document.note_explicit_target(targetnode)
-    indexnode = addnodes.index()
-    indexnode['entries'] = []
-    indexnode['inline'] = False
-    directive.set_source_info(indexnode)
-    entry_text = 'single: {}; {}'.format(name, summary)
-    indexnode['entries'].extend(process_index_entry(entry_text, targetnode['ids'][0]))
-    return [indexnode, targetnode]
-
 _KEYBINDS = {}
 _KEYBINDS_RENDERED = set()  # commands whose keybindings have been rendered
 
@@ -137,6 +125,10 @@ class DFHackToolDirectiveBase(sphinx.directives.ObjectDescription):
             else:
                 return parts[-1]
 
+    def add_index_entry(self, name, tag) -> None:
+        indexdata = (name, self.options.get('summary', ''), '', self.env.docname, '', 0)
+        self.env.domaindata[tag]['objects'].append(indexdata)
+
     @staticmethod
     def wrap_box(*children: List[nodes.Node]) -> nodes.Admonition:
         return nodes.topic('', *children, classes=['dfhack-tool-summary'])
@@ -173,14 +165,12 @@ class DFHackToolDirective(DFHackToolDirectiveBase):
                 }),
                 nodes.inline(text=' | '),
             ]
-            name = self.get_name_or_docname()
-            indexdata = (name, self.options.get('summary', ''), '', self.env.docname, '', 0)
-            self.env.domaindata[tag]['objects'].append(indexdata)
+            self.add_index_entry(self.get_name_or_docname(), tag)
         tag_paragraph.pop()
 
         ret_nodes = [tag_paragraph]
         if 'no-command' in self.options:
-            ret_nodes += make_index(self, self.get_name_or_docname() + ' (plugin)', self.options.get('summary', ''))
+            self.add_index_entry(self.get_name_or_docname() + ' (plugin)', 'all')
             ret_nodes += [make_summary(self.env.app.builder, self.options.get('summary', ''))]
         return ret_nodes
 
@@ -198,13 +188,12 @@ class DFHackCommandDirective(DFHackToolDirectiveBase):
 
     def render_content(self) -> List[nodes.Node]:
         command = self.get_name_or_docname()
-        ret_nodes = [self.make_labeled_paragraph('Command', command, content_class=nodes.literal)]
-        ret_nodes += make_index(self, command, self.options.get('summary', ''))
-        ret_nodes += [
+        self.add_index_entry(command, 'all')
+        return [
+            self.make_labeled_paragraph('Command', command, content_class=nodes.literal),
             make_summary(self.env.app.builder, self.options.get('summary', '')),
             *render_dfhack_keybind(command, builder=self.env.app.builder),
         ]
-        return ret_nodes
 
 
 def get_tags():
@@ -250,6 +239,22 @@ def tag_index_generate(self, docnames: Optional[Iterable[str]] = None) -> Tuple[
             IndexEntry(name, 0, docname, '', '', '', desc))
     return (sorted(content.items()), False)
 
+def register_index(app, tag, title):
+    domain_class = type(tag+'Domain', (Domain, ), {
+            'name': tag,
+            'label': 'Container domain for tag: ' + tag,
+            'initial_data': {'objects': []},
+            'merge_domaindata': tag_domain_merge_domaindata,
+            'get_objects': tag_domain_get_objects,
+        })
+    index_class = type(tag+'Index', (Index, ), {
+            'name': 'tag-index',
+            'localname': title,
+            'shortname': tag,
+            'generate': tag_index_generate,
+        })
+    app.add_domain(domain_class)
+    app.add_index_to_domain(tag, index_class)
 
 def init_tag_indices(app):
     os.makedirs('docs/tags', mode=0o755, exist_ok=True)
@@ -260,35 +265,19 @@ def init_tag_indices(app):
                 tag, desc = tag_tuple[0], tag_tuple[1]
                 topidx.write(('- `{name} <{name}-tag-index>`\n').format(name=tag))
                 topidx.write(('    {desc}\n').format(desc=desc))
-
-                domain_class = type(tag+'Domain', (Domain, ), {
-                        'name': tag,
-                        'label': 'Container domain for tag: ' + tag,
-                        'initial_data': {'objects': []},
-                        'merge_domaindata': tag_domain_merge_domaindata,
-                        'get_objects': tag_domain_get_objects,
-                    })
-                index_class = type(tag+'Index', (Index, ), {
-                        'name': 'tag-index',
-                        'localname': '"' + tag + '" tag index',
-                        'shortname': tag,
-                        'desc': desc,
-                        'generate': tag_index_generate,
-                    })
-                app.add_domain(domain_class)
-                app.add_index_to_domain(tag, index_class)
+                register_index(app, tag, '"%s" tag index' % tag)
 
 
 def register(app):
     app.add_directive('dfhack-tool', DFHackToolDirective)
     app.add_directive('dfhack-command', DFHackCommandDirective)
-
     _KEYBINDS.update(scan_all_keybinds(os.path.join(dfhack.util.DFHACK_ROOT, 'data', 'init')))
 
 
 def setup(app):
     app.connect('builder-inited', register)
 
+    register_index(app, 'all', 'Index of DFHack tools')
     init_tag_indices(app)
 
     # TODO: re-enable once detection is corrected

From 5869ba64c8b77edaacfc2eba84afe9bcb6e4730d Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Fri, 23 Sep 2022 10:21:53 -0700
Subject: [PATCH 704/854] add tag description to the tag index page

this is a terrible hack that only works because sphinx doesn't sanitize
its input for the html builder. we set the title to

  '%s<h4>%s</h4>' % (tag, desc)

so the final html looks like <h1>adventure<h4>...</h4></h1>

this may not play nice with the pdf builder..
---
 docs/sphinx_extensions/dfhack/tool_docs.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/sphinx_extensions/dfhack/tool_docs.py b/docs/sphinx_extensions/dfhack/tool_docs.py
index 412a332b8..fef6ca15a 100644
--- a/docs/sphinx_extensions/dfhack/tool_docs.py
+++ b/docs/sphinx_extensions/dfhack/tool_docs.py
@@ -265,7 +265,7 @@ def init_tag_indices(app):
                 tag, desc = tag_tuple[0], tag_tuple[1]
                 topidx.write(('- `{name} <{name}-tag-index>`\n').format(name=tag))
                 topidx.write(('    {desc}\n').format(desc=desc))
-                register_index(app, tag, '"%s" tag index' % tag)
+                register_index(app, tag, '%s<h4>%s</h4>' % (tag, desc))
 
 
 def register(app):

From 52011bde7bef90ac550070a1dbe01378d4950b6e Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Fri, 23 Sep 2022 11:13:49 -0700
Subject: [PATCH 705/854] share tag list between tool and commands

so all relevant tag index entries get generated
---
 docs/sphinx_extensions/dfhack/tool_docs.py | 29 ++++++++++++++++------
 1 file changed, 22 insertions(+), 7 deletions(-)

diff --git a/docs/sphinx_extensions/dfhack/tool_docs.py b/docs/sphinx_extensions/dfhack/tool_docs.py
index fef6ca15a..e9aa6e888 100644
--- a/docs/sphinx_extensions/dfhack/tool_docs.py
+++ b/docs/sphinx_extensions/dfhack/tool_docs.py
@@ -125,9 +125,13 @@ class DFHackToolDirectiveBase(sphinx.directives.ObjectDescription):
             else:
                 return parts[-1]
 
-    def add_index_entry(self, name, tag) -> None:
-        indexdata = (name, self.options.get('summary', ''), '', self.env.docname, '', 0)
-        self.env.domaindata[tag]['objects'].append(indexdata)
+    def add_index_entries(self, name) -> None:
+        docname = self.env.docname
+        tags = self.env.domaindata['tag-repo']['doctags'][docname]
+        indexdata = (name, self.options.get('summary', ''), '', docname, '', 0)
+        self.env.domaindata['all']['objects'].append(indexdata)
+        for tag in tags:
+            self.env.domaindata[tag]['objects'].append(indexdata)
 
     @staticmethod
     def wrap_box(*children: List[nodes.Node]) -> nodes.Admonition:
@@ -154,7 +158,9 @@ class DFHackToolDirective(DFHackToolDirectiveBase):
 
     def render_content(self) -> List[nodes.Node]:
         tag_paragraph = self.make_labeled_paragraph('Tags')
-        for tag in self.options.get('tags', []):
+        tags = self.options.get('tags', [])
+        self.env.domaindata['tag-repo']['doctags'][self.env.docname] = tags
+        for tag in tags:
             tag_paragraph += [
                 addnodes.pending_xref(tag, nodes.inline(text=tag), **{
                     'reftype': 'ref',
@@ -165,12 +171,11 @@ class DFHackToolDirective(DFHackToolDirectiveBase):
                 }),
                 nodes.inline(text=' | '),
             ]
-            self.add_index_entry(self.get_name_or_docname(), tag)
         tag_paragraph.pop()
 
         ret_nodes = [tag_paragraph]
         if 'no-command' in self.options:
-            self.add_index_entry(self.get_name_or_docname() + ' (plugin)', 'all')
+            self.add_index_entries(self.get_name_or_docname() + ' (plugin)')
             ret_nodes += [make_summary(self.env.app.builder, self.options.get('summary', ''))]
         return ret_nodes
 
@@ -188,7 +193,7 @@ class DFHackCommandDirective(DFHackToolDirectiveBase):
 
     def render_content(self) -> List[nodes.Node]:
         command = self.get_name_or_docname()
-        self.add_index_entry(command, 'all')
+        self.add_index_entries(command)
         return [
             self.make_labeled_paragraph('Command', command, content_class=nodes.literal),
             make_summary(self.env.app.builder, self.options.get('summary', '')),
@@ -196,6 +201,15 @@ class DFHackCommandDirective(DFHackToolDirectiveBase):
         ]
 
 
+class TagRepoDomain(Domain):
+    name = 'tag-repo'
+    label = 'Holds tag associations per document'
+    initial_data = {'doctags': {}}
+
+    def merge_domaindata(self, docnames: List[str], otherdata: Dict) -> None:
+        self.data['doctags'].update(otherdata['doctags'])
+
+
 def get_tags():
     groups = {}
     group_re = re.compile(r'"([^"]+)"')
@@ -277,6 +291,7 @@ def register(app):
 def setup(app):
     app.connect('builder-inited', register)
 
+    app.add_domain(TagRepoDomain)
     register_index(app, 'all', 'Index of DFHack tools')
     init_tag_indices(app)
 

From 1cd5e8657a759e64e98b7e4348a0e753686a2419 Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Fri, 23 Sep 2022 11:33:14 -0700
Subject: [PATCH 706/854] link directly to the tool page title

instead of the top of the page
this is especially important on mobile where the top of the page is
taken up with the sidebar boilerplate
---
 docs/sphinx_extensions/dfhack/tool_docs.py | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/docs/sphinx_extensions/dfhack/tool_docs.py b/docs/sphinx_extensions/dfhack/tool_docs.py
index e9aa6e888..e7302c3cd 100644
--- a/docs/sphinx_extensions/dfhack/tool_docs.py
+++ b/docs/sphinx_extensions/dfhack/tool_docs.py
@@ -115,20 +115,23 @@ class DFHackToolDirectiveBase(sphinx.directives.ObjectDescription):
     required_arguments = 0
     optional_arguments = 1
 
+    def get_tool_name_from_docname(self):
+        parts = self.env.docname.split('/')
+        if 'tools' in parts:
+            return '/'.join(parts[parts.index('tools') + 1:])
+        else:
+            return parts[-1]
+
     def get_name_or_docname(self):
         if self.arguments:
             return self.arguments[0]
-        else:
-            parts = self.env.docname.split('/')
-            if 'tools' in parts:
-                return '/'.join(parts[parts.index('tools') + 1:])
-            else:
-                return parts[-1]
+        return self.get_tool_name_from_docname()
 
     def add_index_entries(self, name) -> None:
         docname = self.env.docname
+        anchor = self.get_tool_name_from_docname().replace('/', '-')
         tags = self.env.domaindata['tag-repo']['doctags'][docname]
-        indexdata = (name, self.options.get('summary', ''), '', docname, '', 0)
+        indexdata = (name, self.options.get('summary', ''), '', docname, anchor, 0)
         self.env.domaindata['all']['objects'].append(indexdata)
         for tag in tags:
             self.env.domaindata[tag]['objects'].append(indexdata)
@@ -247,10 +250,10 @@ def tag_domain_merge_domaindata(self, docnames: List[str], otherdata: Dict) -> N
 
 def tag_index_generate(self, docnames: Optional[Iterable[str]] = None) -> Tuple[List[Tuple[str, List[IndexEntry]]], bool]:
     content = defaultdict(list)
-    for name, desc, _, docname, _, _ in self.domain.data['objects']:
+    for name, desc, _, docname, anchor, _ in self.domain.data['objects']:
         first_letter = name[0].lower()
         content[first_letter].append(
-            IndexEntry(name, 0, docname, '', '', '', desc))
+            IndexEntry(name, 0, docname, anchor, '', '', desc))
     return (sorted(content.items()), False)
 
 def register_index(app, tag, title):

From 98b6ad4954ef2b51782488b5744020d449185c50 Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Fri, 23 Sep 2022 12:34:50 -0700
Subject: [PATCH 707/854] fix index titles on pdf

---
 docs/Tags.rst                              | 54 +++++++++++-----------
 docs/sphinx_extensions/dfhack/tool_docs.py | 16 +++++--
 2 files changed, 40 insertions(+), 30 deletions(-)

diff --git a/docs/Tags.rst b/docs/Tags.rst
index 14a12f411..45bfeb9b3 100644
--- a/docs/Tags.rst
+++ b/docs/Tags.rst
@@ -13,36 +13,36 @@ for the tag assignment spreadsheet.
 
 "when" tags
 -----------
-- `adventure-tag-index`: Tools that are useful while in adventure mode. Note that some tools only tagged with "fort" might also work in adventure mode, but not always in expected ways. Feel free to experiment, though!
-- `dfhack-tag-index`: Tools that you use to run DFHack commands or interact with the DFHack library. This tag also includes tools that help you manage the DF game itself (e.g. settings, saving, etc.)
-- `embark-tag-index`: Tools that are useful while on the fort embark screen or while creating an adventurer.
-- `fort-tag-index`: Tools that are useful while in fort mode.
-- `legends-tag-index`: Tools that are useful while in legends mode.
+- `adventure <adventure-tag-index>`: Tools that are useful while in adventure mode. Note that some tools only tagged with "fort" might also work in adventure mode, but not always in expected ways. Feel free to experiment, though!
+- `dfhack <dfhack-tag-index>`: Tools that you use to run DFHack commands or interact with the DFHack library. This tag also includes tools that help you manage the DF game itself (e.g. settings, saving, etc.)
+- `embark <embark-tag-index>`: Tools that are useful while on the fort embark screen or while creating an adventurer.
+- `fort <fort-tag-index>`: Tools that are useful while in fort mode.
+- `legends <legends-tag-index>`: Tools that are useful while in legends mode.
 
 "why" tags
 ----------
-- `armok-tag-index`: Tools that give you complete control over an aspect of the game or provide access to information that the game intentionally keeps hidden.
-- `auto-tag-index`: Tools that run in the background and automatically manage routine, toilsome aspects of your fortress.
-- `bugfix-tag-index`: Tools that fix specific bugs, either permanently or on-demand.
-- `design-tag-index`: Tools that help you design your fort.
-- `dev-tag-index`: Tools that are useful when developing scripts or mods.
-- `fps-tag-index`: Tools that help you manage FPS drop.
-- `gameplay-tag-index`: Tools that introduce new gameplay elements.
-- `inspection-tag-index`: Tools that let you view information that is otherwise difficult to find.
-- `productivity-tag-index`: Tools that help you do things that you could do manually, but using the tool is better and faster.
+- `armok <armok-tag-index>`: Tools that give you complete control over an aspect of the game or provide access to information that the game intentionally keeps hidden.
+- `auto <auto-tag-index>`: Tools that run in the background and automatically manage routine, toilsome aspects of your fortress.
+- `bugfix <bugfix-tag-index>`: Tools that fix specific bugs, either permanently or on-demand.
+- `design <design-tag-index>`: Tools that help you design your fort.
+- `dev <dev-tag-index>`: Tools that are useful when developing scripts or mods.
+- `fps <fps-tag-index>`: Tools that help you manage FPS drop.
+- `gameplay <gameplay-tag-index>`: Tools that introduce new gameplay elements.
+- `inspection <inspection-tag-index>`: Tools that let you view information that is otherwise difficult to find.
+- `productivity <productivity-tag-index>`: Tools that help you do things that you could do manually, but using the tool is better and faster.
 
 "what" tags
 -----------
-- `animals-tag-index`: Tools that interact with animals.
-- `buildings-tag-index`: Tools that interact with buildings and furniture.
-- `graphics-tag-index`: Tools that interact with game graphics.
-- `interface-tag-index`: Tools that interact with or extend the DF user interface.
-- `items-tag-index`: Tools that interact with in-game items.
-- `jobs-tag-index`: Tools that interact with jobs.
-- `labors-tag-index`: Tools that deal with labor assignment.
-- `map-tag-index`: Tools  that interact with the game map.
-- `military-tag-index`: Tools that interact with the military.
-- `plants-tag-index`: Tools that interact with trees, shrubs, and crops.
-- `stockpiles-tag-index`: Tools that interact wtih stockpiles.
-- `units-tag-index`: Tools that interact with units.
-- `workorders-tag-index`: Tools that interact with workorders.
+- `animals <animals-tag-index>`: Tools that interact with animals.
+- `buildings <buildings-tag-index>`: Tools that interact with buildings and furniture.
+- `graphics <graphics-tag-index>`: Tools that interact with game graphics.
+- `interface <interface-tag-index>`: Tools that interact with or extend the DF user interface.
+- `items <items-tag-index>`: Tools that interact with in-game items.
+- `jobs <jobs-tag-index>`: Tools that interact with jobs.
+- `labors <labors-tag-index>`: Tools that deal with labor assignment.
+- `map <map-tag-index>`: Tools  that interact with the game map.
+- `military <military-tag-index>`: Tools that interact with the military.
+- `plants <plants-tag-index>`: Tools that interact with trees, shrubs, and crops.
+- `stockpiles <stockpiles-tag-index>`: Tools that interact wtih stockpiles.
+- `units <units-tag-index>`: Tools that interact with units.
+- `workorders <workorders-tag-index>`: Tools that interact with workorders.
diff --git a/docs/sphinx_extensions/dfhack/tool_docs.py b/docs/sphinx_extensions/dfhack/tool_docs.py
index e7302c3cd..581cee26e 100644
--- a/docs/sphinx_extensions/dfhack/tool_docs.py
+++ b/docs/sphinx_extensions/dfhack/tool_docs.py
@@ -216,7 +216,7 @@ class TagRepoDomain(Domain):
 def get_tags():
     groups = {}
     group_re = re.compile(r'"([^"]+)"')
-    tag_re = re.compile(r'- `([^`]+)-tag-index`: (.*)')
+    tag_re = re.compile(r'- `([^ ]+) <[^>]+>`: (.*)')
     with open('docs/Tags.rst') as f:
         lines = f.readlines()
         for line in lines:
@@ -282,15 +282,25 @@ def init_tag_indices(app):
                 tag, desc = tag_tuple[0], tag_tuple[1]
                 topidx.write(('- `{name} <{name}-tag-index>`\n').format(name=tag))
                 topidx.write(('    {desc}\n').format(desc=desc))
-                register_index(app, tag, '%s<h4>%s</h4>' % (tag, desc))
+                register_index(app, tag, desc)
 
 
+def update_index_titles(app):
+    for domain in app.env.domains.values():
+        for index in domain.indices:
+            if index.shortname == 'all':
+                continue
+            if app.builder.format == 'html':
+                index.localname = '"%s" tag index<h4>%s</h4>' % (index.shortname, index.localname)
+            else:
+                index.localname = '%s tag index - %s' % (index.shortname, index.localname)
+
 def register(app):
     app.add_directive('dfhack-tool', DFHackToolDirective)
     app.add_directive('dfhack-command', DFHackCommandDirective)
+    update_index_titles(app)
     _KEYBINDS.update(scan_all_keybinds(os.path.join(dfhack.util.DFHACK_ROOT, 'data', 'init')))
 
-
 def setup(app):
     app.connect('builder-inited', register)
 

From 4ae1b7fb747245df0358cc85a0778641ab536ea4 Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Fri, 23 Sep 2022 12:51:50 -0700
Subject: [PATCH 708/854] fix anchor text transformation

---
 docs/sphinx_extensions/dfhack/tool_docs.py | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/docs/sphinx_extensions/dfhack/tool_docs.py b/docs/sphinx_extensions/dfhack/tool_docs.py
index 581cee26e..62569a4d1 100644
--- a/docs/sphinx_extensions/dfhack/tool_docs.py
+++ b/docs/sphinx_extensions/dfhack/tool_docs.py
@@ -110,6 +110,14 @@ def check_missing_keybinds():
         logger.warning('Undocumented keybindings for command: %s', missing_command)
 
 
+_anchor_pattern = re.compile(r'^\d+')
+
+def to_anchor(name: str) -> str:
+    name = name.lower()
+    name = name.replace('/', '-')
+    name = re.sub(_anchor_pattern, '', name)
+    return name
+
 class DFHackToolDirectiveBase(sphinx.directives.ObjectDescription):
     has_content = False
     required_arguments = 0
@@ -129,7 +137,7 @@ class DFHackToolDirectiveBase(sphinx.directives.ObjectDescription):
 
     def add_index_entries(self, name) -> None:
         docname = self.env.docname
-        anchor = self.get_tool_name_from_docname().replace('/', '-')
+        anchor = to_anchor(self.get_tool_name_from_docname())
         tags = self.env.domaindata['tag-repo']['doctags'][docname]
         indexdata = (name, self.options.get('summary', ''), '', docname, anchor, 0)
         self.env.domaindata['all']['objects'].append(indexdata)
@@ -293,7 +301,7 @@ def update_index_titles(app):
             if app.builder.format == 'html':
                 index.localname = '"%s" tag index<h4>%s</h4>' % (index.shortname, index.localname)
             else:
-                index.localname = '%s tag index - %s' % (index.shortname, index.localname)
+                index.localname = '"%s" tag index - %s' % (index.shortname, index.localname)
 
 def register(app):
     app.add_directive('dfhack-tool', DFHackToolDirective)

From 50f0d1137215d4505c837a732fe6548f8bf64c55 Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Fri, 23 Sep 2022 13:19:13 -0700
Subject: [PATCH 709/854] include tool desc in the index for all formats

---
 docs/sphinx_extensions/dfhack/tool_docs.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/docs/sphinx_extensions/dfhack/tool_docs.py b/docs/sphinx_extensions/dfhack/tool_docs.py
index 62569a4d1..18532c9d5 100644
--- a/docs/sphinx_extensions/dfhack/tool_docs.py
+++ b/docs/sphinx_extensions/dfhack/tool_docs.py
@@ -260,8 +260,11 @@ def tag_index_generate(self, docnames: Optional[Iterable[str]] = None) -> Tuple[
     content = defaultdict(list)
     for name, desc, _, docname, anchor, _ in self.domain.data['objects']:
         first_letter = name[0].lower()
+        extra, descr = desc, ''
+        if self.domain.env.app.builder.format == 'html':
+            extra, descr = '', desc
         content[first_letter].append(
-            IndexEntry(name, 0, docname, anchor, '', '', desc))
+            IndexEntry(name, 0, docname, anchor, extra, '', descr))
     return (sorted(content.items()), False)
 
 def register_index(app, tag, title):

From 6b219f342dda546496a948625dd22bfeae0c876f Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Fri, 23 Sep 2022 14:09:15 -0700
Subject: [PATCH 710/854] add a TOC of all tools so the pdf picks them up

---
 docs/Tools.rst | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/docs/Tools.rst b/docs/Tools.rst
index 20ceea769..401276d7f 100644
--- a/docs/Tools.rst
+++ b/docs/Tools.rst
@@ -50,3 +50,14 @@ DFHack tools by what they affect
 --------------------------------
 
 .. include:: tags/bywhat.rst
+
+All DFHack tools alphabetically
+-------------------------------
+
+.. toctree::
+  :glob:
+  :maxdepth: 1
+  :titlesonly:
+
+  tools/*
+  tools/*/*

From 8546b2963cd7970878ae8b5f1f38f19afd114fdc Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Fri, 23 Sep 2022 15:58:31 -0700
Subject: [PATCH 711/854] tool docs are no longer toc-orphaned

---
 conf.py | 2 --
 1 file changed, 2 deletions(-)

diff --git a/conf.py b/conf.py
index 2742e18f0..661b0daea 100644
--- a/conf.py
+++ b/conf.py
@@ -73,13 +73,11 @@ def write_tool_docs():
     the original documentation.
     """
     for k in doc_all_dirs():
-        header = ':orphan:\n'
         label = ('.. _{name}:\n\n').format(name=k[0])
         include = ('.. include:: /{path}\n\n').format(path=k[1])
         os.makedirs(os.path.join('docs/tools', os.path.dirname(k[0])),
                     mode=0o755, exist_ok=True)
         with write_file_if_changed('docs/tools/{}.rst'.format(k[0])) as outfile:
-            outfile.write(header)
             if k[0] != 'search':
                 outfile.write(label)
             outfile.write(include)

From b1801d25ca4285646cb7c6e647ea88614241ebfb Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Fri, 23 Sep 2022 15:59:25 -0700
Subject: [PATCH 712/854] update scripts ref

---
 scripts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts b/scripts
index 8c03de45b..a1374b572 160000
--- a/scripts
+++ b/scripts
@@ -1 +1 @@
-Subproject commit 8c03de45ba8e772239224b49af2617fc714fbaa9
+Subproject commit a1374b5726b3dd682ac41d21701f186e748c0974

From d0f9b1d324bfeb52e605153ef462e76f04a56849 Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Fri, 23 Sep 2022 16:01:33 -0700
Subject: [PATCH 713/854] update scripts ref

---
 scripts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts b/scripts
index a1374b572..f318f56f7 160000
--- a/scripts
+++ b/scripts
@@ -1 +1 @@
-Subproject commit a1374b5726b3dd682ac41d21701f186e748c0974
+Subproject commit f318f56f75aa40f2bd91c1cd32c3b426f7821db4

From c4ebd195e8185b81aa6080b0d7e1fd939726ac0a Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Fri, 23 Sep 2022 16:02:26 -0700
Subject: [PATCH 714/854] update scripts ref

---
 scripts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts b/scripts
index f318f56f7..00fb32809 160000
--- a/scripts
+++ b/scripts
@@ -1 +1 @@
-Subproject commit f318f56f75aa40f2bd91c1cd32c3b426f7821db4
+Subproject commit 00fb328091d2950257aa576b223ca22aa621332b

From 9eaf3acb256b97220d8b06fff0586e261917d6ff Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Fri, 23 Sep 2022 16:09:46 -0700
Subject: [PATCH 715/854] ensure readthedocs checks out submodules

---
 .readthedocs.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.readthedocs.yml b/.readthedocs.yml
index 1e570e571..e66d3da1b 100644
--- a/.readthedocs.yml
+++ b/.readthedocs.yml
@@ -9,13 +9,13 @@ build:
   tools:
     python: "3"
 
+submodules:
+  include: all
+
 sphinx:
   configuration: conf.py
 
-formats:
-  - htmlzip
-  - pdf
-  - epub
+formats: all
 
 python:
   install:

From 65500e60690ce803366a6d820b87859dbb018bed Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Fri, 23 Sep 2022 16:21:47 -0700
Subject: [PATCH 716/854] update scripts ref

---
 scripts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts b/scripts
index 00fb32809..f02f2eb92 160000
--- a/scripts
+++ b/scripts
@@ -1 +1 @@
-Subproject commit 00fb328091d2950257aa576b223ca22aa621332b
+Subproject commit f02f2eb9231c94385750fd318dfb85eed47be66f

From e6336e769a2625ee55c9435f2be5c773f758dc37 Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Sun, 4 Sep 2022 23:08:56 -0400
Subject: [PATCH 717/854] Units::teleport(): set idle_area

---
 docs/changelog.txt        | 1 +
 library/modules/Units.cpp | 1 +
 2 files changed, 2 insertions(+)

diff --git a/docs/changelog.txt b/docs/changelog.txt
index 895f7db72..813dfee77 100644
--- a/docs/changelog.txt
+++ b/docs/changelog.txt
@@ -80,6 +80,7 @@ changelog.txt uses a syntax similar to RST, with a few special sequences:
 - Removed ``Windows`` module (C++-only) - unused.
 - ``Constructions`` module (C++-only): removed ``t_construction``, ``isValid()``, ``getCount()``, ``getConstruction()``, and ``copyConstruction()``. Access ``world.constructions`` directly instead.
 - ``Gui::getSelectedItem()``, ``Gui::getAnyItem()``: added support for the artifacts screen
+- ``Units::teleport()``: now sets ``unit.idle_area``
 
 ## Lua
 - History: added ``dfhack.getCommandHistory(history_id, history_filename)`` and ``dfhack.addCommandToHistory(history_id, history_filename, command)`` so gui scripts can access a commandline history without requiring a terminal.
diff --git a/library/modules/Units.cpp b/library/modules/Units.cpp
index 8e9f624ea..32b9f28e5 100644
--- a/library/modules/Units.cpp
+++ b/library/modules/Units.cpp
@@ -174,6 +174,7 @@ bool Units::teleport(df::unit *unit, df::coord target_pos)
 
     // move unit to destination
     unit->pos = target_pos;
+    unit->idle_area = target_pos;
 
     // move unit's riders (including babies) to destination
     if (unit->flags1.bits.ridden)

From c1b9ffc7ca7cef93ebaa0554f39a1fb40d10ef77 Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Sat, 24 Sep 2022 13:31:18 -0400
Subject: [PATCH 718/854] Clarify changelog

Based on clarification from Doublestrafe and Quietust
---
 docs/changelog.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/changelog.txt b/docs/changelog.txt
index 813dfee77..b7d822801 100644
--- a/docs/changelog.txt
+++ b/docs/changelog.txt
@@ -80,7 +80,7 @@ changelog.txt uses a syntax similar to RST, with a few special sequences:
 - Removed ``Windows`` module (C++-only) - unused.
 - ``Constructions`` module (C++-only): removed ``t_construction``, ``isValid()``, ``getCount()``, ``getConstruction()``, and ``copyConstruction()``. Access ``world.constructions`` directly instead.
 - ``Gui::getSelectedItem()``, ``Gui::getAnyItem()``: added support for the artifacts screen
-- ``Units::teleport()``: now sets ``unit.idle_area``
+- ``Units::teleport()``: now sets ``unit.idle_area`` to discourage units from walking back to their original location (or teleporting back, if using `fastdwarf`)
 
 ## Lua
 - History: added ``dfhack.getCommandHistory(history_id, history_filename)`` and ``dfhack.addCommandToHistory(history_id, history_filename, command)`` so gui scripts can access a commandline history without requiring a terminal.

From e9eeb5fda03b24bd9455963a8d2c40b7ac201ccd Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Sat, 24 Sep 2022 13:59:04 -0400
Subject: [PATCH 719/854] tool_docs: don't assume cwd is dfhack root

hopefully fixes the CI docs build in dfhack/scripts
---
 docs/sphinx_extensions/dfhack/tool_docs.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/docs/sphinx_extensions/dfhack/tool_docs.py b/docs/sphinx_extensions/dfhack/tool_docs.py
index 18532c9d5..836bab217 100644
--- a/docs/sphinx_extensions/dfhack/tool_docs.py
+++ b/docs/sphinx_extensions/dfhack/tool_docs.py
@@ -225,7 +225,7 @@ def get_tags():
     groups = {}
     group_re = re.compile(r'"([^"]+)"')
     tag_re = re.compile(r'- `([^ ]+) <[^>]+>`: (.*)')
-    with open('docs/Tags.rst') as f:
+    with open(os.path.join(dfhack.util.DOCS_ROOT, 'Tags.rst')) as f:
         lines = f.readlines()
         for line in lines:
             line = line.strip()
@@ -285,10 +285,11 @@ def register_index(app, tag, title):
     app.add_index_to_domain(tag, index_class)
 
 def init_tag_indices(app):
-    os.makedirs('docs/tags', mode=0o755, exist_ok=True)
+    os.makedirs(os.path.join(dfhack.util.DOCS_ROOT, 'tags'), mode=0o755, exist_ok=True)
     tag_groups = get_tags()
     for tag_group in tag_groups:
-        with dfhack.util.write_file_if_changed(('docs/tags/by{group}.rst').format(group=tag_group)) as topidx:
+        group_file_path = os.path.join(dfhack.util.DOCS_ROOT, 'tags', 'by{group}.rst'.format(group=tag_group))
+        with dfhack.util.write_file_if_changed(group_file_path) as topidx:
             for tag_tuple in tag_groups[tag_group]:
                 tag, desc = tag_tuple[0], tag_tuple[1]
                 topidx.write(('- `{name} <{name}-tag-index>`\n').format(name=tag))

From ea7326a1c852db60c575e504c45a2eee861243cd Mon Sep 17 00:00:00 2001
From: Myk Taylor <myk002@yahoo.com>
Date: Sat, 24 Sep 2022 20:47:16 -0700
Subject: [PATCH 720/854] add more job types to the example prioritize list

---
 data/examples/init/onMapLoad_dreamfort.init | 26 +++++++++++++++------
 1 file changed, 19 insertions(+), 7 deletions(-)

diff --git a/data/examples/init/onMapLoad_dreamfort.init b/data/examples/init/onMapLoad_dreamfort.init
index 05d32134f..619349986 100644
--- a/data/examples/init/onMapLoad_dreamfort.init
+++ b/data/examples/init/onMapLoad_dreamfort.init
@@ -1,6 +1,7 @@
 # This dfhack config file automates common tasks for your forts.
 # It was written for the Dreamfort set of quickfort blueprints, but the
-# configuration here is useful for any fort! Feed free to edit or override
+# configuration here is useful for any fort! Copy this file to your
+# dfhack-config/init directory to use. Feed free to edit or override
 # to your liking.
 
 # Uncomment this next line if you want buildingplan (and quickfort) to use only
@@ -48,13 +49,24 @@ seedwatch all 30
 
 # ensures important tasks get assigned to workers.
 # otherwise these job types can get ignored in busy forts.
-prioritize -a StoreItemInVehicle StoreItemInBag StoreItemInBarrel PullLever
-prioritize -a StoreItemInLocation StoreItemInHospital
-prioritize -a DestroyBuilding RemoveConstruction RecoverWounded DumpItem
-prioritize -a CleanSelf SlaughterAnimal PrepareRawFish ExtractFromRawFish
-prioritize -a TradeAtDepot BringItemToDepot CleanTrap ManageWorkOrders
+#
+# take care of rottables before they rot
 prioritize -a --haul-labor=Food,Body StoreItemInStockpile
 prioritize -a --reaction-name=TAN_A_HIDE CustomReaction
+prioritize -a PrepareRawFish
+#
+# organize items efficiently so new items can be brought to the stockpiles
+prioritize -a StoreItemInVehicle StoreItemInBag StoreItemInBarrel
+prioritize -a StoreItemInLocation StoreItemInHospital StoreItemInBin
+#
+# when these things come up, get them done ASAP
+prioritize -a ManageWorkOrders TradeAtDepot BringItemToDepot CleanTrap
+prioritize -a DestroyBuilding RemoveConstruction RecoverWounded DumpItem
+prioritize -a PullLever CleanSelf SlaughterAnimal CollectSand
+prioritize -a PenLargeAnimal PenSmallAnimal PitLargeAnimal PitSmallAnimal
+prioritize -a TameAnimal TrainAnimal TrainHuntingAnimal TrainWarAnimal
+prioritize -a FellTree FireBallista FireCatapult OperatePump
+prioritize -a MakeArmor MakeWeapon
 
 # autobutcher settings are saved in the savegame, so we only need to set them once.
 # this way, any custom settings you set during gameplay are not overwritten
@@ -78,7 +90,7 @@ on-new-fortress autobutcher target 50 50 14 2 BIRD_GOOSE
 on-new-fortress autobutcher target 2 2 4 2 ALPACA SHEEP LLAMA
 # pigs give milk and meat and are zero-maintenance.
 on-new-fortress autobutcher target 5 5 6 2 PIG
-# butcher all unprofitable animals
+# immediately butcher all unprofitable animals
 on-new-fortress autobutcher target 0 0 0 0 HORSE YAK DONKEY WATER_BUFFALO GOAT CAVY BIRD_DUCK BIRD_GUINEAFOWL
 # watch for new animals
 on-new-fortress autobutcher autowatch

From 07d3e70b8a1a3b24799aa2e2f5942dba4341b0f4 Mon Sep 17 00:00:00 2001
From: DFHack-Urist via GitHub Actions
 <63161697+DFHack-Urist@users.noreply.github.com>
Date: Sun, 25 Sep 2022 07:19:50 +0000
Subject: [PATCH 721/854] Auto-update submodules

scripts: master
---
 scripts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts b/scripts
index f02f2eb92..a5b542eef 160000
--- a/scripts
+++ b/scripts
@@ -1 +1 @@
-Subproject commit f02f2eb9231c94385750fd318dfb85eed47be66f
+Subproject commit a5b542eef784fc86618c824052f60ecf2582833f

From cb80f7dd756aa434bff836a37c4088edfdcfc2af Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Sun, 25 Sep 2022 16:04:36 -0700
Subject: [PATCH 722/854] don't cache dup civzones when scanning buildings

---
 docs/changelog.txt            |  1 +
 library/modules/Buildings.cpp | 10 +++++-----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/docs/changelog.txt b/docs/changelog.txt
index b7d822801..52e906486 100644
--- a/docs/changelog.txt
+++ b/docs/changelog.txt
@@ -49,6 +49,7 @@ changelog.txt uses a syntax similar to RST, with a few special sequences:
 - `dig-now`: Fix direction of smoothed walls when adjacent to a door or floodgate
 - ``job.removeJob()``: ensure jobs are removed from the world list when they are canceled
 - `quickfort`: `Dreamfort <quickfort-blueprint-guide>` blueprint set: declare the hospital zone before building the coffer; otherwise DF fails to stock the hospital with materials
+- ``dfhack.buildings.findCivzonesAt``: no longer return duplicate civzones after loading a save with existing civzones
 
 ## Misc Improvements
 - Init scripts: ``dfhack.init`` and other init scripts have moved to ``dfhack-config/init/``. If you have customized your ``dfhack.init`` file and want to keep your changes, please move the part that you have customized to the new location at ``dfhack-config/init/dfhack.init``. If you do not have changes that you want to keep, do not copy anything, and the new defaults will be used automatically.
diff --git a/library/modules/Buildings.cpp b/library/modules/Buildings.cpp
index dd8d5f0e9..1918771ae 100644
--- a/library/modules/Buildings.cpp
+++ b/library/modules/Buildings.cpp
@@ -308,9 +308,8 @@ df::building *Buildings::findAtTile(df::coord pos)
 
 static unordered_map<int32_t, df::coord> corner1;
 static unordered_map<int32_t, df::coord> corner2;
-static void cacheBuilding(df::building *building) {
+static void cacheBuilding(df::building *building, bool is_civzone) {
     int32_t id = building->id;
-    bool is_civzone = !building->isSettingOccupancy();
     df::coord p1(min(building->x1, building->x2), min(building->y1,building->y2), building->z);
     df::coord p2(max(building->x1, building->x2), max(building->y1,building->y2), building->z);
 
@@ -344,7 +343,7 @@ static void cacheNewCivzones() {
         auto &vec = world->buildings.other[buildings_other_id::ANY_ZONE];
         int32_t idx = df::building::binsearch_index(vec, id);
         if (idx > -1)
-            cacheBuilding(vec[idx]);
+            cacheBuilding(vec[idx], true);
     }
     nextCivzone = nextBuildingId;
 }
@@ -1311,8 +1310,9 @@ void Buildings::updateBuildings(color_ostream&, void* ptr)
 
     if (building)
     {
-        if (!corner1.count(id))
-            cacheBuilding(building);
+        bool is_civzone = !building->isSettingOccupancy();
+        if (!corner1.count(id) && !is_civzone)
+            cacheBuilding(building, false);
     }
     else if (corner1.count(id))
     {

From fce4c9aa97b71ba1dd8ae32d8552e2313a6ac422 Mon Sep 17 00:00:00 2001
From: DFHack-Urist via GitHub Actions
 <63161697+DFHack-Urist@users.noreply.github.com>
Date: Mon, 26 Sep 2022 07:36:25 +0000
Subject: [PATCH 723/854] Auto-update submodules

scripts: master
---
 scripts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts b/scripts
index a5b542eef..086409c42 160000
--- a/scripts
+++ b/scripts
@@ -1 +1 @@
-Subproject commit a5b542eef784fc86618c824052f60ecf2582833f
+Subproject commit 086409c42cdf83e1be8631345b192bb60012939e

From b744d1a8e5cbe4144a9331467d880fc20e007c10 Mon Sep 17 00:00:00 2001
From: Myk Taylor <myk002@yahoo.com>
Date: Mon, 26 Sep 2022 22:08:55 -0700
Subject: [PATCH 724/854] add medical jobs to the priority list

as per discussion on reddit
https://www.reddit.com/r/dwarffortress/comments/xj00e9/science_job_priority/
---
 data/examples/init/onMapLoad_dreamfort.init | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/data/examples/init/onMapLoad_dreamfort.init b/data/examples/init/onMapLoad_dreamfort.init
index 619349986..e23b28285 100644
--- a/data/examples/init/onMapLoad_dreamfort.init
+++ b/data/examples/init/onMapLoad_dreamfort.init
@@ -55,18 +55,25 @@ prioritize -a --haul-labor=Food,Body StoreItemInStockpile
 prioritize -a --reaction-name=TAN_A_HIDE CustomReaction
 prioritize -a PrepareRawFish
 #
+# ensure medical, hygiene, and hospice tasks get done
+prioritize -a CleanSelf RecoverWounded ApplyCast BringCrutch CleanPatient
+prioritize -a DiagnosePatient DressWound GiveFood GiveWater ImmobilizeBreak
+prioritize -a PlaceInTraction SetBone Surgery Suture
+#
 # organize items efficiently so new items can be brought to the stockpiles
 prioritize -a StoreItemInVehicle StoreItemInBag StoreItemInBarrel
 prioritize -a StoreItemInLocation StoreItemInHospital StoreItemInBin
 #
-# when these things come up, get them done ASAP
-prioritize -a ManageWorkOrders TradeAtDepot BringItemToDepot CleanTrap
-prioritize -a DestroyBuilding RemoveConstruction RecoverWounded DumpItem
-prioritize -a PullLever CleanSelf SlaughterAnimal CollectSand
-prioritize -a PenLargeAnimal PenSmallAnimal PitLargeAnimal PitSmallAnimal
+# ensure prisoners and animals are tended to quickly
+prioritize -a --haul-labor=Animals StoreItemInStockpile
 prioritize -a TameAnimal TrainAnimal TrainHuntingAnimal TrainWarAnimal
+prioritize -a PenLargeAnimal PitLargeAnimal SlaughterAnimal
+#
+# when these things come up, get them done ASAP
+prioritize -a ManageWorkOrders TradeAtDepot BringItemToDepot
+prioritize -a DestroyBuilding RemoveConstruction DumpItem PullLever
 prioritize -a FellTree FireBallista FireCatapult OperatePump
-prioritize -a MakeArmor MakeWeapon
+prioritize -a CollectSand MakeArmor MakeWeapon
 
 # autobutcher settings are saved in the savegame, so we only need to set them once.
 # this way, any custom settings you set during gameplay are not overwritten

From 2cf23e2b3489715e5b59f2fa019823040d73a822 Mon Sep 17 00:00:00 2001
From: DFHack-Urist via GitHub Actions
 <63161697+DFHack-Urist@users.noreply.github.com>
Date: Tue, 27 Sep 2022 07:41:21 +0000
Subject: [PATCH 725/854] Auto-update submodules

scripts: master
---
 scripts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts b/scripts
index 086409c42..4f568fc83 160000
--- a/scripts
+++ b/scripts
@@ -1 +1 @@
-Subproject commit 086409c42cdf83e1be8631345b192bb60012939e
+Subproject commit 4f568fc8331d62bc6646055c1252bba19b3a526d

From a0cc040d9c62539aa21787291c9585d07c97aede Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Wed, 28 Sep 2022 12:15:25 -0700
Subject: [PATCH 726/854] use new prioritize defaults

---
 data/examples/init/onMapLoad_dreamfort.init | 26 +--------------------
 1 file changed, 1 insertion(+), 25 deletions(-)

diff --git a/data/examples/init/onMapLoad_dreamfort.init b/data/examples/init/onMapLoad_dreamfort.init
index e23b28285..fe2b1d54e 100644
--- a/data/examples/init/onMapLoad_dreamfort.init
+++ b/data/examples/init/onMapLoad_dreamfort.init
@@ -49,31 +49,7 @@ seedwatch all 30
 
 # ensures important tasks get assigned to workers.
 # otherwise these job types can get ignored in busy forts.
-#
-# take care of rottables before they rot
-prioritize -a --haul-labor=Food,Body StoreItemInStockpile
-prioritize -a --reaction-name=TAN_A_HIDE CustomReaction
-prioritize -a PrepareRawFish
-#
-# ensure medical, hygiene, and hospice tasks get done
-prioritize -a CleanSelf RecoverWounded ApplyCast BringCrutch CleanPatient
-prioritize -a DiagnosePatient DressWound GiveFood GiveWater ImmobilizeBreak
-prioritize -a PlaceInTraction SetBone Surgery Suture
-#
-# organize items efficiently so new items can be brought to the stockpiles
-prioritize -a StoreItemInVehicle StoreItemInBag StoreItemInBarrel
-prioritize -a StoreItemInLocation StoreItemInHospital StoreItemInBin
-#
-# ensure prisoners and animals are tended to quickly
-prioritize -a --haul-labor=Animals StoreItemInStockpile
-prioritize -a TameAnimal TrainAnimal TrainHuntingAnimal TrainWarAnimal
-prioritize -a PenLargeAnimal PitLargeAnimal SlaughterAnimal
-#
-# when these things come up, get them done ASAP
-prioritize -a ManageWorkOrders TradeAtDepot BringItemToDepot
-prioritize -a DestroyBuilding RemoveConstruction DumpItem PullLever
-prioritize -a FellTree FireBallista FireCatapult OperatePump
-prioritize -a CollectSand MakeArmor MakeWeapon
+prioritize -aq defaults
 
 # autobutcher settings are saved in the savegame, so we only need to set them once.
 # this way, any custom settings you set during gameplay are not overwritten

From b6acf7a9286b3dd9809cbd72ea318f270ebe4cdf Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Wed, 28 Sep 2022 12:45:57 -0700
Subject: [PATCH 727/854] address feedback on the docs

---
 docs/plugins/3dveins.rst     |  8 ++++----
 docs/plugins/add-spatter.rst |  3 +++
 docs/plugins/autohauler.rst  |  4 ++--
 docs/plugins/autolabor.rst   |  9 +++++----
 docs/plugins/autonestbox.rst | 14 +++++++-------
 5 files changed, 21 insertions(+), 17 deletions(-)

diff --git a/docs/plugins/3dveins.rst b/docs/plugins/3dveins.rst
index f71a14343..96fbcf836 100644
--- a/docs/plugins/3dveins.rst
+++ b/docs/plugins/3dveins.rst
@@ -25,10 +25,10 @@ Example
 
     3dveins
 
-New veins are generated using 3D Perlin noise in order to produce a layout that
-flows smoothly between z-levels. The vein distribution is based on the world
-seed, so running the command for the second time should produce no change. It is
-best to run it just once immediately after embark.
+New veins are generated using natural-looking 3D Perlin noise in order to
+produce a layout that flows smoothly between z-levels. The vein distribution is
+based on the world seed, so running the command for the second time should
+produce no change. It is best to run it just once immediately after embark.
 
 This command is intended as only a cosmetic change, so it takes care to exactly
 preserve the mineral counts reported by ``prospect all``. The amounts of layer
diff --git a/docs/plugins/add-spatter.rst b/docs/plugins/add-spatter.rst
index 873bd761f..1ce32fcbe 100644
--- a/docs/plugins/add-spatter.rst
+++ b/docs/plugins/add-spatter.rst
@@ -12,3 +12,6 @@ names starting with ``SPATTER_ADD_``, so there are no commands to run to use it.
 These reactions will then produce contaminants on items instead of improvements.
 The contaminants are immune to being washed away by water or destroyed by
 `clean`.
+
+You must have a mod installed that adds the appropriate tokens in order for this
+plugin to do anything.
diff --git a/docs/plugins/autohauler.rst b/docs/plugins/autohauler.rst
index a71d3ed02..08c84327a 100644
--- a/docs/plugins/autohauler.rst
+++ b/docs/plugins/autohauler.rst
@@ -5,7 +5,7 @@ autohauler
     :summary: Automatically manage hauling labors.
     :tags: fort auto labors
 
-Similar to `autolabor`, but instead of managing all labors, ``autohauler`` only
+Similar to `autolabor`, but instead of managing all labors, autohauler only
 addresses hauling labors, leaving the assignment of skilled labors entirely up
 to you. You can use the in-game `manipulator` UI or an external tool like Dwarf
 Therapist to do so.
@@ -19,7 +19,7 @@ assignment, with most skilled labors only being assigned to just a few dwarves
 and almost every non-military dwarf having at least one skilled labor assigned.
 
 Autohauler allows a skill to be used as a flag to exempt a dwarf from
-``autohauler``'s effects. By default, this is the unused ALCHEMIST labor, but it
+autohauler's effects. By default, this is the unused ALCHEMIST labor, but it
 can be changed by the user.
 
 Usage
diff --git a/docs/plugins/autolabor.rst b/docs/plugins/autolabor.rst
index ed39c2666..861655ab4 100644
--- a/docs/plugins/autolabor.rst
+++ b/docs/plugins/autolabor.rst
@@ -45,10 +45,11 @@ and manager.
 Hunting is never assigned without a butchery, and fishing is never assigned
 without a fishery.
 
-For each labor, a preference order is calculated based on skill, biased against
-masters of other trades and excluding those who can't do the job. The labor is
-then added to the best <minimum> dwarves for that labor, then to additional
-dwarfs that meet any of these conditions:
+For each labor, a preference order is calculated based on skill, excluding those
+who can't do the job. Dwarves who are masters of particular skills are
+deprioritized in the preference list for other skills. The labor is then added
+to the best <minimum> dwarves for that labor, then to additional dwarfs that
+meet any of these conditions:
 
 * The dwarf is idle and there are no idle dwarves assigned to this labor
 * The dwarf has non-zero skill associated with the labor
diff --git a/docs/plugins/autonestbox.rst b/docs/plugins/autonestbox.rst
index 9d5683f2b..27074fe1c 100644
--- a/docs/plugins/autonestbox.rst
+++ b/docs/plugins/autonestbox.rst
@@ -5,13 +5,13 @@ autonestbox
     :summary: Auto-assign egg-laying female pets to nestbox zones.
     :tags: fort auto animals
 
-To use this feature, you must create pen/pasture zones above nestboxes. If the
-pen is bigger than 1x1, the nestbox must be in the top left corner. Only 1 unit
-will be assigned per pen, regardless of the size. Egg layers who are also
-grazers will be ignored, since confining them to a 1x1 pasture is not a good
-idea. Only tame and domesticated own units are processed since pasturing
-half-trained wild egg layers could destroy your neat nestbox zones when they
-revert to wild.
+To use this feature, you must create pen/pasture zones on the same tiles as
+built nestboxes. If the pen is bigger than 1x1, the nestbox must be in the top
+left corner. Only 1 unit will be assigned per pen, regardless of the size. Egg
+layers who are also grazers will be ignored, since confining them to a 1x1
+pasture is not a good idea. Only tame and domesticated own units are processed
+since pasturing half-trained wild egg layers could destroy your neat nestbox
+zones when they revert to wild.
 
 Note that the age of the units is not checked, so you might get some egg-laying
 kids assigned to the nestbox zones. Most birds grow up quite fast, though, so

From 9a2cb5ea4492783d4b8cb52c49fea92dad402838 Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Wed, 28 Sep 2022 14:49:03 -0700
Subject: [PATCH 728/854] fix ALL the typos

done by copying everything into Google docs and running spellcheck
---
 docs/Compile.rst                        |  8 ++--
 docs/Documentation.rst                  |  2 +-
 docs/Introduction.rst                   |  4 +-
 docs/Lua API.rst                        | 58 ++++++++++++-------------
 docs/NEWS.rst                           |  2 +-
 docs/Structures-intro.rst               |  2 +-
 docs/Tags.rst                           |  2 +-
 docs/guides/modding-guide.rst           | 10 ++---
 docs/guides/quickfort-alias-guide.rst   |  6 +--
 docs/guides/quickfort-library-guide.rst |  2 +-
 docs/guides/quickfort-user-guide.rst    | 10 ++---
 docs/plugins/autobutcher.rst            |  4 +-
 docs/plugins/autolabor.rst              |  6 +--
 docs/plugins/automaterial.rst           |  4 +-
 docs/plugins/burrows.rst                |  2 +-
 docs/plugins/changelayer.rst            |  2 +-
 docs/plugins/changevein.rst             |  2 +-
 docs/plugins/command-prompt.rst         |  2 +-
 docs/plugins/cursecheck.rst             |  2 +-
 docs/plugins/debug.rst                  |  8 ++--
 docs/plugins/dwarfmonitor.rst           |  2 +-
 docs/plugins/dwarfvet.rst               | 12 ++---
 docs/plugins/embark-tools.rst           |  2 +-
 docs/plugins/fix-unit-occupancy.rst     |  4 +-
 docs/plugins/forceequip.rst             |  2 +-
 docs/plugins/labormanager.rst           |  4 +-
 docs/plugins/lair.rst                   |  2 +-
 docs/plugins/manipulator.rst            |  2 +-
 docs/plugins/map-render.rst             |  2 +-
 docs/plugins/power-meter.rst            |  2 +-
 docs/plugins/regrass.rst                |  2 +-
 docs/plugins/rendermax.rst              |  2 +-
 docs/plugins/resume.rst                 |  2 +-
 docs/plugins/search.rst                 |  2 +-
 docs/plugins/seedwatch.rst              |  2 +-
 docs/plugins/stocks.rst                 |  2 +-
 docs/plugins/tiletypes.rst              |  2 +-
 docs/plugins/tubefill.rst               |  2 +-
 docs/plugins/tweak.rst                  |  2 +-
 docs/plugins/workflow.rst               |  2 +-
 docs/plugins/zone.rst                   |  4 +-
 41 files changed, 98 insertions(+), 98 deletions(-)

diff --git a/docs/Compile.rst b/docs/Compile.rst
index 0f3880816..ae23a1b73 100644
--- a/docs/Compile.rst
+++ b/docs/Compile.rst
@@ -289,7 +289,7 @@ DF, which causes DF to use your system libstdc++ instead::
     rm libs/libstdc++.so.6
 
 Note that distributing binaries compiled with newer GCC versions may result in
-the opposite compatibily issue: users with *older* GCC versions may encounter
+the opposite compatibility issue: users with *older* GCC versions may encounter
 similar errors. This is why DFHack distributes both GCC 4.8 and GCC 7 builds. If
 you are planning on distributing binaries to other users, we recommend using an
 older GCC (but still at least 4.8) version if possible.
@@ -314,7 +314,7 @@ Notes for GCC 8+ or OS X 10.10+ users
 
 If none of these situations apply to you, skip to `osx-setup`.
 
-If you have issues building on OS X 10.10 (Yosemite) or above, try definining
+If you have issues building on OS X 10.10 (Yosemite) or above, try defining
 the following environment variable::
 
     export MACOSX_DEPLOYMENT_TARGET=10.9
@@ -503,7 +503,7 @@ in their name. If this redirect doesn't occur, just copy, paste, and enter the
 download link again and you should see the options. You need to get:
 Visual C++ Build Tools for Visual Studio 2015 with Update 3.
 Click the download button next to it and a dropdown of download formats will appear.
-Select the DVD format to download an ISO file. When the donwload is complete,
+Select the DVD format to download an ISO file. When the download is complete,
 click on the ISO file and a folder will popup with the following contents:
 
 * packages (folder)
@@ -561,7 +561,7 @@ Additional dependencies: installing with the Chocolatey Package Manager
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 The remainder of dependencies - Git, CMake, StrawberryPerl, and Python - can be
-most easily installed using the Chocolatey Package Manger. Chocolatey is a
+most easily installed using the Chocolatey Package Manager. Chocolatey is a
 \*nix-style package manager for Windows. It's fast, small (8-20MB on disk)
 and very capable. Think "``apt-get`` for Windows."
 
diff --git a/docs/Documentation.rst b/docs/Documentation.rst
index 13ae58dca..6ac5ef382 100644
--- a/docs/Documentation.rst
+++ b/docs/Documentation.rst
@@ -76,7 +76,7 @@ replaced with the corresponding title and linked:  e.g. ```autolabor```
 => `autolabor`. Scripts and plugins have link targets that match their names
 created for you automatically.
 
-If you want to link to a heading in your own page, you can specifiy it like this::
+If you want to link to a heading in your own page, you can specify it like this::
 
     `Heading text exactly as written`_
 
diff --git a/docs/Introduction.rst b/docs/Introduction.rst
index d90983d8c..798a9c3c8 100644
--- a/docs/Introduction.rst
+++ b/docs/Introduction.rst
@@ -28,7 +28,7 @@ or for coexistence in a single DF install, even with incompatible components.
 
 For developers, DFHack unites the various ways tools access DF memory and
 allows easier development of new tools.  As an open-source project under
-`various open-source licences <license>`, contributions are welcome.
+`various open-source licenses <license>`, contributions are welcome.
 
 
 .. contents:: Contents
@@ -54,7 +54,7 @@ used by the DFHack console.
   to be used this way.
 
 * Commands can also run at startup via `init files <init-files>`,
-  on in batches at other times with the `script` command.
+  or in batches at other times with the `script` command.
 
 * Finally, some commands are persistent once enabled, and will sit in the
   background managing or changing some aspect of the game if you `enable` them.
diff --git a/docs/Lua API.rst b/docs/Lua API.rst
index 64ccdd595..4aa8d78cb 100644
--- a/docs/Lua API.rst	
+++ b/docs/Lua API.rst	
@@ -740,7 +740,7 @@ Functions:
 
 * ``dfhack.matinfo.decode(type,index)``
 
-  Looks up material info for the given number pair; if not found, returs *nil*.
+  Looks up material info for the given number pair; if not found, returns *nil*.
 
 * ``....decode(matinfo)``, ``....decode(item)``, ``....decode(obj)``
 
@@ -1099,7 +1099,7 @@ Other
 * ``dfhack.gui.getDepthAt(x, y)``
 
   Returns the distance from the z-level of the tile at map coordinates (x, y) to
-  the closest ground z-level below. Defaults to 0, unless overriden by plugins.
+  the closest ground z-level below. Defaults to 0, unless overridden by plugins.
 
 Job module
 ----------
@@ -1869,7 +1869,7 @@ Among them are:
   - ``full_rectangle = true``
 
     For buildings like stockpiles or farm plots that can normally
-    accomodate individual tile exclusion, forces an error if any
+    accommodate individual tile exclusion, forces an error if any
     tiles within the specified width*height are obstructed.
 
   - ``items = { item, item ... }``, or ``filters = { {...}, {...}... }``
@@ -2169,7 +2169,7 @@ Supported callbacks and fields are:
 
   Called when keyboard or mouse events are available.
   If any keys are pressed, the keys argument is a table mapping them to *true*.
-  Note that this refers to logical keybingings computed from real keys via
+  Note that this refers to logical keybindings computed from real keys via
   options; if multiple interpretations exist, the table will contain multiple keys.
 
   The table also may contain special keys:
@@ -2494,7 +2494,7 @@ Core context specific functions:
   unit of time used, and may be one of ``'frames'`` (raw FPS),
   ``'ticks'`` (unpaused FPS), ``'days'``, ``'months'``,
   ``'years'`` (in-game time). All timers other than
-  ``'frames'`` are cancelled when the world is unloaded,
+  ``'frames'`` are canceled when the world is unloaded,
   and cannot be queued until it is loaded again.
   Returns the timer id, or *nil* if unsuccessful due to
   world being unloaded.
@@ -2677,7 +2677,7 @@ environment by the mandatory init file dfhack.lua:
 
 .. _lua-string:
 
-String class extentions
+String class extensions
 -----------------------
 
 DFHack extends Lua's basic string class to include a number of convenience
@@ -2698,7 +2698,7 @@ functions. These are invoked just like standard string functions, e.g.::
 * ``string:split([delimiter[, plain]])``
 
   Split a string by the given delimiter. If no delimiter is specified, space
-  (``' '``) is used. The delimter is treated as a pattern unless a ``plain`` is
+  (``' '``) is used. The delimiter is treated as a pattern unless a ``plain`` is
   specified and set to ``true``. To treat multiple successive delimiter
   characters as a single delimiter, e.g. to avoid getting empty string elements,
   pass a pattern like ``' +'``. Be aware that passing patterns that match empty
@@ -2975,10 +2975,10 @@ parameters.
   (e.g. combining the previous two examples into ``-abcdparam``)
 
   Long options focus on clarity. They are usually entire words, or several words
-  combined with hypens (``-``) or underscores (``_``). If they take an argument,
-  the argument can be separated from the option name by a space or an equals
-  sign (``=``). For example, the following two commandlines are equivalent:
-  ``yourscript --style pretty`` and ``yourscript --style=pretty``.
+  combined with hyphens (``-``) or underscores (``_``). If they take an
+  argument, the argument can be separated from the option name by a space or an
+  equals sign (``=``). For example, the following two commandlines are
+  equivalent: ``yourscript --style pretty`` and ``yourscript --style=pretty``.
 
   Another reason to use long options is if they represent an esoteric parameter
   that you don't expect to be commonly used and that you don't want to "waste" a
@@ -3172,7 +3172,7 @@ create profiler objects which can be used to profile and generate report.
 
 * ``profiler.newProfiler([variant[, sampling_frequency]])``
 
-  Returns an profile object with ``variant`` either ``'time'`` or ``'call'``.
+  Returns a profile object with ``variant`` either ``'time'`` or ``'call'``.
   ``'time'`` variant takes optional ``sampling_frequency`` parameter to select
   lua instruction counts between samples. Default is ``'time'`` variant with
   ``10*1000`` frequency.
@@ -3257,7 +3257,7 @@ Implements a trivial single-inheritance class system.
 
   The main difference is that attributes are processed as a separate
   initialization step, before any ``init`` methods are called. They
-  also make the directy relation between instance fields and constructor
+  also make the direct relation between instance fields and constructor
   arguments more explicit.
 
 * ``new_obj = Class{ foo = arg, bar = arg, ... }``
@@ -3267,8 +3267,8 @@ Implements a trivial single-inheritance class system.
 
   1. An empty instance table is created, and its metatable set.
   2. The ``preinit`` methods are called via ``invoke_before`` (see below)
-     with the table used as argument to the class. These methods are intended
-     for validating and tweaking that argument table.
+     with the table used as the argument to the class. These methods are
+     intended for validating and tweaking that argument table.
   3. Declared ATTRS are initialized from the argument table or their default values.
   4. The ``init`` methods are called via ``invoke_after`` with the argument table.
      This is the main constructor method.
@@ -3339,7 +3339,7 @@ A module for reading custom tokens added to the raws by mods.
 
   Where ``typeInstance`` is a unit, entity, item, job, projectile, building, plant, or interaction
   instance. Gets ``typeDefinition`` and then returns the same as ``getToken(typeDefinition, token)``.
-  For units, it gets the token from the race or caste instead if appplicable. For plants growth items,
+  For units, it gets the token from the race or caste instead if applicable. For plants growth items,
   it gets the token from the plant or plant growth instead if applicable. For plants it does the same
   but with growth number -1.
 
@@ -3661,7 +3661,7 @@ It also always has the following fields:
 
 These fields are computed by the layout process:
 
-:frame_parent_rect: The ViewRect represeting the client area of the parent view.
+:frame_parent_rect: The ViewRect representing the client area of the parent view.
 :frame_rect: The ``mkdims`` rect of the outer frame in parent-local coordinates.
 :frame_body: The ViewRect representing the body part of the View's own frame.
 
@@ -3897,13 +3897,13 @@ Base of all the widgets. Inherits from View and has the following attributes:
   :r: gap between the right edges of the frame and the parent.
   :b: gap between the bottom edges of the frame and the parent.
   :w: maximum width of the frame.
-  :h: maximum heigth of the frame.
+  :h: maximum height of the frame.
   :xalign: X alignment of the frame.
   :yalign: Y alignment of the frame.
 
   First the ``l,t,r,b`` fields restrict the available area for
   placing the frame. If ``w`` and ``h`` are not specified or
-  larger then the computed area, it becomes the frame. Otherwise
+  larger than the computed area, it becomes the frame. Otherwise
   the smaller frame is placed within the are based on the
   ``xalign/yalign`` fields. If the align hints are omitted, they
   are assumed to be 0, 1, or 0.5 based on which of the ``l/r/t/b``
@@ -4437,7 +4437,7 @@ Functions
         .. note:: this is the only mandatory field.
 
     :fix_impassible:
-        if true make impassible tiles impassible to liquids too
+        if true make impassable tiles impassable to liquids too
     :consume:
         how much machine power is needed to work.
         Disables reactions if not supplied enough and ``needs_power==1``
@@ -4461,7 +4461,7 @@ Functions
     :canBeRoomSubset:
         a flag if this building can be counted in room. 1 means it can, 0 means it can't and -1 default building behaviour
     :auto_gears:
-        a flag that automatically fills up gears and animate. It looks over building definition for gear icons and maps them.
+        a flag that automatically fills up gears and animations. It looks over the building definition for gear icons and maps them.
 
     Animate table also might contain:
 
@@ -4472,7 +4472,7 @@ Functions
 
 ``getPower(building)`` returns two number - produced and consumed power if building can be modified and returns nothing otherwise
 
-``setPower(building,produced,consumed)`` sets current productiona and consumption for a building.
+``setPower(building,produced,consumed)`` sets current power production and consumption for a building.
 
 Examples
 --------
@@ -4506,7 +4506,7 @@ Native functions provided by the `buildingplan` plugin:
 * ``bool isPlanModeEnabled(df::building_type type, int16_t subtype, int32_t custom)`` returns whether the buildingplan UI is enabled for the specified building type.
 * ``bool isPlannedBuilding(df::building *bld)`` returns whether the given building is managed by buildingplan.
 * ``void addPlannedBuilding(df::building *bld)`` suspends the building jobs and adds the building to the monitor list.
-* ``void doCycle()`` runs a check for whether buildlings in the monitor list can be assigned items and unsuspended. This method runs automatically twice a game day, so you only need to call it directly if you want buildingplan to do a check right now.
+* ``void doCycle()`` runs a check for whether buildings in the monitor list can be assigned items and unsuspended. This method runs automatically twice a game day, so you only need to call it directly if you want buildingplan to do a check right now.
 * ``void scheduleCycle()`` schedules a cycle to be run during the next non-paused game frame. Can be called multiple times while the game is paused and only one cycle will be scheduled.
 
 burrows
@@ -4740,7 +4740,7 @@ List of events
 
 1. ``onReactionCompleting(reaction,reaction_product,unit,input_items,input_reagents,output_items,call_native)``
 
-   Is called once per reaction product, before reaction had a chance to call native code for item creation.
+   Is called once per reaction product, before the reaction has a chance to call native code for item creation.
    Setting ``call_native.value=false`` cancels further processing: no items are created and ``onReactionComplete`` is not called.
 
 2. ``onReactionComplete(reaction,reaction_product,unit,input_items,input_reagents,output_items)``
@@ -4796,7 +4796,7 @@ These events are straight from EventManager module. Each of them first needs to
 
 4. ``onJobCompleted(job)``
 
-   Gets called when job is finished. The job that is passed to this function is a copy. Requires a frequency of 0 in order to distinguish between workshop jobs that were cancelled by the user and workshop jobs that completed successfully.
+   Gets called when job is finished. The job that is passed to this function is a copy. Requires a frequency of 0 in order to distinguish between workshop jobs that were canceled by the user and workshop jobs that completed successfully.
 
 5. ``onUnitDeath(unit_id)``
 
@@ -4855,7 +4855,7 @@ Functions
 
 5. ``registerSidebar(shop_name,callback)``
 
-   Enable callback when sidebar for ``shop_name`` is drawn. Usefull for custom workshop views e.g. using gui.dwarfmode lib. Also accepts a ``class`` instead of function
+   Enable callback when sidebar for ``shop_name`` is drawn. Useful for custom workshop views e.g. using gui.dwarfmode lib. Also accepts a ``class`` instead of function
    as callback. Best used with ``gui.dwarfmode`` class ``WorkshopOverlay``.
 
 Examples
@@ -4898,7 +4898,7 @@ luasocket
 =========
 
 A way to access csocket from lua. The usage is made similar to luasocket in vanilla lua distributions. Currently
-only subset of functions exist and only tcp mode is implemented.
+only a subset of the functions exist and only tcp mode is implemented.
 
 .. contents::
   :local:
@@ -4977,7 +4977,7 @@ Functions
 
 - ``render_map_rect(x,y,z,w,h)``
 
-  returns a table with w*h*4 entries of rendered tiles. The format is same as ``df.global.gps.screen`` (tile,foreground,bright,background).
+  returns a table with w*h*4 entries of rendered tiles. The format is the same as ``df.global.gps.screen`` (tile,foreground,bright,background).
 
 .. _pathable-api:
 
@@ -5094,7 +5094,7 @@ Scripts
    :local:
 
 Any files with the ``.lua`` extension placed into the :file:`hack/scripts` folder
-are automatically made avaiable as DFHack commands. The command corresponding to
+are automatically made available as DFHack commands. The command corresponding to
 a script is simply the script's filename, relative to the scripts folder, with
 the extension omitted. For example:
 
diff --git a/docs/NEWS.rst b/docs/NEWS.rst
index fb33aebf9..13d5e38de 100644
--- a/docs/NEWS.rst
+++ b/docs/NEWS.rst
@@ -22,6 +22,6 @@ See `dev-changelog` for a list of changes grouped by development releases.
 
 Older Changelogs
 ================
-Are kept in a seperate file:  `History`
+Are kept in a separate file:  `History`
 
 .. that's ``docs/History.rst``, if you're reading the raw text.
diff --git a/docs/Structures-intro.rst b/docs/Structures-intro.rst
index 48aa571c8..9d304949f 100644
--- a/docs/Structures-intro.rst
+++ b/docs/Structures-intro.rst
@@ -18,7 +18,7 @@ layout changes, and will need to be recompiled for every new DF version.
 
 Addresses of DF global objects and vtables are stored in a separate file,
 :file:`symbols.xml`. Since these are only absolute addresses, they do not need
-to be compiled in to DFHack code, and are instead loaded at runtime. This makes
+to be compiled into DFHack code, and are instead loaded at runtime. This makes
 fixes and additions to global addresses possible without recompiling DFHack.
 In an installed copy of DFHack, this file can be found at the root of the
 ``hack`` folder.
diff --git a/docs/Tags.rst b/docs/Tags.rst
index 45bfeb9b3..2ee18de48 100644
--- a/docs/Tags.rst
+++ b/docs/Tags.rst
@@ -43,6 +43,6 @@ for the tag assignment spreadsheet.
 - `map <map-tag-index>`: Tools  that interact with the game map.
 - `military <military-tag-index>`: Tools that interact with the military.
 - `plants <plants-tag-index>`: Tools that interact with trees, shrubs, and crops.
-- `stockpiles <stockpiles-tag-index>`: Tools that interact wtih stockpiles.
+- `stockpiles <stockpiles-tag-index>`: Tools that interact with stockpiles.
 - `units <units-tag-index>`: Tools that interact with units.
 - `workorders <workorders-tag-index>`: Tools that interact with workorders.
diff --git a/docs/guides/modding-guide.rst b/docs/guides/modding-guide.rst
index 4b768be58..da33a5a9d 100644
--- a/docs/guides/modding-guide.rst
+++ b/docs/guides/modding-guide.rst
@@ -129,7 +129,7 @@ provides two libraries for this, ``repeat-util`` and `eventful <eventful-api>`.
 ``repeat-util`` is used to run a function once per a configurable number of
 frames (paused or unpaused), ticks (unpaused), in-game days, months, or years.
 If you need to be aware the instant something happens, you'll need to run a
-check once a tick. Be careful not to do this gratuitiously, though, since
+check once a tick. Be careful not to do this gratuitously, though, since
 running that often can slow down the game!
 
 ``eventful``, on the other hand, is much more performance-friendly since it will
@@ -176,10 +176,10 @@ you can react to with ``eventful``.
 
 Now, you may have noticed that you won't be able to register multiple callbacks
 with a single key named after your mod. You can, of course, call all the
-functions you want from a single registed callback. Alternately, you can create
-multiple callbacks using different keys, using your mod ID as a key name prefix.
-If you do register multiple callbacks, though, there are no guarantees about the
-call order.
+functions you want from a single registered callback. Alternately, you can
+create multiple callbacks using different keys, using your mod ID as a key name
+prefix. If you do register multiple callbacks, though, there are no guarantees
+about the call order.
 
 Custom raw tokens
 -----------------
diff --git a/docs/guides/quickfort-alias-guide.rst b/docs/guides/quickfort-alias-guide.rst
index 50e5d7650..a89e6f338 100644
--- a/docs/guides/quickfort-alias-guide.rst
+++ b/docs/guides/quickfort-alias-guide.rst
@@ -80,7 +80,7 @@ sequence, potentially with other aliases. If the alias is the only text in the
 cell, the alias name is matched and its expansion is used. If the alias has
 other keys before or after it, the alias name must be surrounded in curly
 brackets (:kbd:`{` and :kbd:`}`). An alias can be surrounded in curly brackets
-even if it is the only text in the cell, it just isn't necesary. For example,
+even if it is the only text in the cell, it just isn't necessary. For example,
 the following blueprint uses the ``aliasname`` alias by itself in the first
 two rows and uses it as part of a longer sequence in the third row::
 
@@ -454,7 +454,7 @@ be used for either the ``quantum_enable`` or ``route_enable`` sub-aliases.
 Experienced Dwarf Fortress players may be wondering how the same aliases can
 work in both contexts since the keys for entering the configuration screen
 differ. Fear not! There is some sub-alias magic at work here. If you define
-your own stockpile configuraiton aliases, you can use the magic yourself by
+your own stockpile configuration aliases, you can use the magic yourself by
 building your aliases on the ``*prefix`` aliases described later in this
 guide.
 
@@ -652,7 +652,7 @@ sheetprefix           enablesheet           disablesheet
 Then, for each item category, there are aliases that manipulate interesting
 subsets of that category:
 
-* Exclusive aliases forbid everthing within a category and then enable only
+* Exclusive aliases forbid everything within a category and then enable only
   the named item type (or named class of items)
 * ``forbid*`` aliases forbid the named type and leave the rest of the
   stockpile untouched.
diff --git a/docs/guides/quickfort-library-guide.rst b/docs/guides/quickfort-library-guide.rst
index 86c82ac60..157bb10a1 100644
--- a/docs/guides/quickfort-library-guide.rst
+++ b/docs/guides/quickfort-library-guide.rst
@@ -198,7 +198,7 @@ Light aquifer tap
 ~~~~~~~~~~~~~~~~~
 
 The aquifer tap helps you create a safe, everlasting source of fresh water from
-a light aquifer. See the step-by-step guide, including informaton on how to
+a light aquifer. See the step-by-step guide, including information on how to
 create a drainage system so your dwarves don't drown when digging the tap, by
 running ``quickfort run library/aquifer_tap.csv -n /help``.
 
diff --git a/docs/guides/quickfort-user-guide.rst b/docs/guides/quickfort-user-guide.rst
index 693ab033c..71a80818c 100644
--- a/docs/guides/quickfort-user-guide.rst
+++ b/docs/guides/quickfort-user-guide.rst
@@ -245,7 +245,7 @@ If there weren't an alias named ``booze`` then the literal characters
 spell those aliases correctly!
 
 You can save a lot of time and effort by using aliases instead of adding all
-key seqences directly to your blueprints. For more details, check out the
+key sequences directly to your blueprints. For more details, check out the
 `quickfort-alias-guide`. You can also see examples of aliases being used in the
 query blueprints in the
 :source:`DFHack blueprint library <data/blueprints/library>`. You can create
@@ -683,7 +683,7 @@ three vertical tiles like this::
    ` end here   ` #
    # #          # #
 
-Then to carve the cross, you'd do a horizonal segment::
+Then to carve the cross, you'd do a horizontal segment::
 
    `          ` `        #
    start here ` end here #
@@ -740,7 +740,7 @@ Or you could use the aliases to specify tile by tile::
    #       #       #       #
 
 The aliases can also be used to designate a solid block of track. This is
-epecially useful for obliterating low-quality engravings so you can re-smooth
+especially useful for obliterating low-quality engravings so you can re-smooth
 and re-engrave with higher quality. For example, you could use the following
 sequence of blueprints to ensure a 10x10 floor area contains only masterwork
 engravings::
@@ -1157,7 +1157,7 @@ blueprint::
    "#meta label(help) message(This is the help text for the blueprint set
    contained in this file.
 
-   First, make sure that you embark in...) blueprint set walkthough"
+   First, make sure that you embark in...) blueprint set walkthrough"
 
 could more naturally be written as a ``#notes`` blueprint::
 
@@ -1739,7 +1739,7 @@ priorities <quickfort-dig-priorities>`.
     Use dig priorities to control ramp creation.
 
 We can `ensure <https://docs.google.com/spreadsheets/d/1IBy6_pGEe6WSBCLukDz_5I-4vi_mpHuJJyOp2j6SJlY/edit#gid=962076234>`__
-the bottom level is carved out before the layer above is channelled by assigning
+the bottom level is carved out before the layer above is channeled by assigning
 the channel designations lower priorities (the ``h5``\s in the third layer --
 scroll down).
 
diff --git a/docs/plugins/autobutcher.rst b/docs/plugins/autobutcher.rst
index 83c99271a..f288f9073 100644
--- a/docs/plugins/autobutcher.rst
+++ b/docs/plugins/autobutcher.rst
@@ -6,7 +6,7 @@ autobutcher
     :tags: fort auto fps animals
 
 This plugin monitors how many pets you have of each gender and age and assigns
-excess lifestock for slaughter. It requires that you add the target race(s) to a
+excess livestock for slaughter. It requires that you add the target race(s) to a
 watch list. Units will be ignored if they are:
 
 * Untamed
@@ -44,7 +44,7 @@ Usage
     - fa = number of female adults
     - ma = number of female adults
     If you specify ``all``, then this command will set the counts for all races
-    on your current watchlist (including the races which are currenly set to
+    on your current watchlist (including the races which are currently set to
     'unwatched') and sets the new default for future watch commands. If you
     specify ``new``, then this command just sets the new default counts for
     future watch commands without changing your current watchlist. Otherwise,
diff --git a/docs/plugins/autolabor.rst b/docs/plugins/autolabor.rst
index 861655ab4..b39884957 100644
--- a/docs/plugins/autolabor.rst
+++ b/docs/plugins/autolabor.rst
@@ -11,7 +11,7 @@ dwarves to specialize in specific skills.
 Autolabor frequently checks how many jobs of each type are available and sets
 labors proportionally in order to get them all done quickly. Labors with
 equipment -- mining, hunting, and woodcutting -- which are abandoned if labors
-change mid-job, are handled slightly differently to minimise churn.
+change mid-job, are handled slightly differently to minimize churn.
 
 Dwarves on active military duty or dwarves assigned to burrows are left
 untouched by autolabor.
@@ -39,7 +39,7 @@ and filling ponds. Other jobs are automatically assigned as described above.
 Each of these settings can be adjusted.
 
 Jobs are rarely assigned to nobles with responsibilities for meeting diplomats
-or merchants, never to the chief medical dwarf, and less often to the bookeeper
+or merchants, never to the chief medical dwarf, and less often to the bookkeeper
 and manager.
 
 Hunting is never assigned without a butchery, and fishing is never assigned
@@ -63,7 +63,7 @@ Examples
 ``autolabor MINE 5``
     Keep at least 5 dwarves with mining enabled.
 ``autolabor CUT_GEM 1 1``
-    Keep exactly 1 dwarf with gemcutting enabled.
+    Keep exactly 1 dwarf with gem cutting enabled.
 ``autolabor COOK 1 1 3``
     Keep 1 dwarf with cooking enabled, selected only from the top 3.
 ``autolabor FEED_WATER_CIVILIANS haulers``
diff --git a/docs/plugins/automaterial.rst b/docs/plugins/automaterial.rst
index 068664638..ac1b3a1da 100644
--- a/docs/plugins/automaterial.rst
+++ b/docs/plugins/automaterial.rst
@@ -48,6 +48,6 @@ construction menu after selecting materials, it returns you back to this screen.
 If you use this along with several autoselect enabled materials, you should be
 able to place complex constructions more conveniently.
 
-The ``automaterial`` plugin also enables extra contruction placement modes, such
-as designating areas larger than 10x10 and allowing you to designate hollow
+The ``automaterial`` plugin also enables extra construction placement modes,
+such as designating areas larger than 10x10 and allowing you to designate hollow
 rectangles instead of the default filled ones.
diff --git a/docs/plugins/burrows.rst b/docs/plugins/burrows.rst
index 50d736b95..fb3876e97 100644
--- a/docs/plugins/burrows.rst
+++ b/docs/plugins/burrows.rst
@@ -34,7 +34,7 @@ Usage
 ``burrow remove-units target-burrow <burrow> [<burrow> ...]``
     Remove units in source burrows from the target.
 ``burrow set-tiles target-burrow <burrow> [<burrow> ...]``
-    Clear target burrow tiles and adds tiles from the names source burrows.
+    Clear target burrow tiles and add tiles from the names source burrows.
 ``burrow add-tiles target-burrow <burrow> [<burrow> ...]``
     Add tiles from the source burrows to the target.
 ``burrow remove-tiles target-burrow <burrow> [<burrow> ...]``
diff --git a/docs/plugins/changelayer.rst b/docs/plugins/changelayer.rst
index f9467315f..f986a1e3d 100644
--- a/docs/plugins/changelayer.rst
+++ b/docs/plugins/changelayer.rst
@@ -35,7 +35,7 @@ Examples
 ``changelayer GRANITE``
    Convert the layer at the cursor position into granite.
 ``changelayer SILTY_CLAY force``
-   Convert teh layer at the cursor position into clay, even if it's stone.
+   Convert the layer at the cursor position into clay, even if it's stone.
 ``changelayer MARBLE all_biomes all_layers``
    Convert all layers of all biomes which are not soil into marble.
 
diff --git a/docs/plugins/changevein.rst b/docs/plugins/changevein.rst
index f033a4a6a..4e4512bb1 100644
--- a/docs/plugins/changevein.rst
+++ b/docs/plugins/changevein.rst
@@ -5,7 +5,7 @@ changevein
     :summary: Change the material of a mineral inclusion.
     :tags: fort armok map
 
-You can change a vein to any incorganic material RAW id. Note that this command
+You can change a vein to any inorganic material RAW id. Note that this command
 only affects tiles within the current 16x16 block - for large veins and
 clusters, you will need to use this command multiple times.
 
diff --git a/docs/plugins/command-prompt.rst b/docs/plugins/command-prompt.rst
index 7ccad6c71..c4b464a80 100644
--- a/docs/plugins/command-prompt.rst
+++ b/docs/plugins/command-prompt.rst
@@ -13,7 +13,7 @@ Usage
     command-prompt [entry]
 
 If called with parameters, it starts with that text in the command edit area.
-This is most useful for developers, who can set a keybinding to open a laungage
+This is most useful for developers, who can set a keybinding to open a language
 interpreter for lua or Ruby by starting with the `:lua <lua>` or `:rb <rb>`
 portions of the command already filled in.
 
diff --git a/docs/plugins/cursecheck.rst b/docs/plugins/cursecheck.rst
index 2d623241c..94012919b 100644
--- a/docs/plugins/cursecheck.rst
+++ b/docs/plugins/cursecheck.rst
@@ -33,7 +33,7 @@ Examples
 - ``cursecheck detail all``
    Give detailed info about all cursed creatures including deceased ones.
 - ``cursecheck nick``
-   Give a nickname all living/active cursed creatures.
+   Give a nickname to all living/active cursed creatures.
 
 .. note::
 
diff --git a/docs/plugins/debug.rst b/docs/plugins/debug.rst
index 0e184595f..0c5a587fb 100644
--- a/docs/plugins/debug.rst
+++ b/docs/plugins/debug.rst
@@ -42,13 +42,13 @@ Usage
 -----
 
 ``debugfilter category [<plugin regex>] [<category regex>]``
-    List available debug plugin and category names. If filters aren't givenm
+    List available debug plugin and category names. If filters aren't given
     then all plugins/categories are matched. This command is a good way to test
     regex parameters before you pass them to ``set``.
 ``debugfilter filter [<id>]``
     List active and passive debug print level changes. The optional ``id``
-    parameter is the id listed as first column in the filter list. If ``id`` is
-    given, then the command shows extended information for the given filter
+    parameter is the id listed as the first column in the filter list. If ``id``
+    is given, then the command shows extended information for the given filter
     only.
 ``debugfilter set [<level>] [<plugin regex>] [<category regex>]``
     Create a new debug filter to set category verbosity levels. This filter
@@ -61,7 +61,7 @@ Usage
 ``debugfilter disable <id> [<id> ...]``
     Disable a space separated list of filters but keep it in the filter list.
 ``debugfilter enable <id> [<id> ...]``
-    Enable a space sperate list of filters.
+    Enable a space separated list of filters.
 ``debugfilter header [enable] | [disable] [<element> ...]``
     Control which header metadata is shown along with each log message. Run it
     without parameters to see the list of configurable elements. Include an
diff --git a/docs/plugins/dwarfmonitor.rst b/docs/plugins/dwarfmonitor.rst
index bfdbd13b5..79472ae58 100644
--- a/docs/plugins/dwarfmonitor.rst
+++ b/docs/plugins/dwarfmonitor.rst
@@ -87,7 +87,7 @@ Some widgets support additional options:
 * ``cursor`` widget:
 
   * ``format``: Specifies the format. ``X``, ``x``, ``Y``, and ``y`` are
-    replaced with the corresponding cursor cordinates, while all other
+    replaced with the corresponding cursor coordinates, while all other
     characters are unmodified.
   * ``show_invalid``: If set to ``true``, the mouse coordinates will both be
     displayed as ``-1`` when the cursor is outside of the DF window; otherwise,
diff --git a/docs/plugins/dwarfvet.rst b/docs/plugins/dwarfvet.rst
index e7ddf73d6..fa165250d 100644
--- a/docs/plugins/dwarfvet.rst
+++ b/docs/plugins/dwarfvet.rst
@@ -5,12 +5,12 @@ dwarfvet
     :summary: Allows animals to be treated at animal hospitals.
     :tags: fort gameplay animals
 
-Annoyed your dragons become useless after a minor injury? Well, with dwarfvet,
-injured animals will be treated at an animal hospital, which is simply a hospital
-that is also an animal training zone. Dwarfs with the Animal Caretaker labor
-enabled will come to the hospital to treat animals. Normal medical skills are
-used (and trained), but no experience is given to the Animal Caretaker skill
-itself.
+Annoyed that your dragons become useless after a minor injury? Well, with
+dwarfvet, injured animals will be treated at an animal hospital, which is simply
+a hospital that is also an animal training zone. Dwarfs with the Animal
+Caretaker labor enabled will come to the hospital to treat animals. Normal
+medical skills are used (and trained), but no experience is given to the Animal
+Caretaker skill itself.
 
 Usage
 -----
diff --git a/docs/plugins/embark-tools.rst b/docs/plugins/embark-tools.rst
index 64db27953..781d66e90 100644
--- a/docs/plugins/embark-tools.rst
+++ b/docs/plugins/embark-tools.rst
@@ -14,7 +14,7 @@ Usage
     embark-tools enable|disable all
     embark-tools enable|disable <tool> [<tool> ...]
 
-Avaliable tools are:
+Available tools are:
 
 ``anywhere``
     Allows embarking anywhere (including sites, mountain-only biomes, and
diff --git a/docs/plugins/fix-unit-occupancy.rst b/docs/plugins/fix-unit-occupancy.rst
index 991c77314..0559d4a2f 100644
--- a/docs/plugins/fix-unit-occupancy.rst
+++ b/docs/plugins/fix-unit-occupancy.rst
@@ -18,7 +18,7 @@ Usage
     fix-unit-occupancy interval <num_ticks>
 
 When run without arguments (or with just the ``here`` or ``-n`` parameters),
-the fix just runs once. You can also have it run periodically by enbling the
+the fix just runs once. You can also have it run periodically by enabling the
 plugin.
 
 Examples
@@ -35,7 +35,7 @@ Options
 ``here``
     Only operate on the tile at the cursor.
 ``-n``
-    Report issues, but do not any write changes to the map.
+    Report issues, but do not write any changes to the map.
 ``interval <num_ticks>``
     Set how often the plugin will check for and fix issues when it is enabled.
     The default is 1200 ticks, or 1 game day.
diff --git a/docs/plugins/forceequip.rst b/docs/plugins/forceequip.rst
index a32af524b..26ab378ee 100644
--- a/docs/plugins/forceequip.rst
+++ b/docs/plugins/forceequip.rst
@@ -64,7 +64,7 @@ Examples
 ``forceequip v bp QQQ``
     List the bodyparts of the selected unit.
 ``forceequip bp LH``
-    Equips an appopriate item onto the unit's left hand.
+    Equips an appropriate item onto the unit's left hand.
 ``forceequip m bp LH``
     Equips ALL appropriate items onto the unit's left hand. The unit may end up
     wearing a dozen left-handed mittens. Use with caution, and remember that
diff --git a/docs/plugins/labormanager.rst b/docs/plugins/labormanager.rst
index 5c3632b6a..e3443280d 100644
--- a/docs/plugins/labormanager.rst
+++ b/docs/plugins/labormanager.rst
@@ -37,7 +37,7 @@ explicitly disable it, even if you save and reload your game.
 
 The default priorities for each labor vary (some labors are higher priority by
 default than others). The way the plugin works is that, once it determines how
-many jobs of each labor is needed, it then sorts them by adjusted priority.
+many jobs of each labor are needed, it then sorts them by adjusted priority.
 (Labors other than hauling have a bias added to them based on how long it's been
 since they were last used to prevent job starvation.) The labor with the highest
 priority is selected, the "best fit" dwarf for that labor is assigned to that
@@ -112,7 +112,7 @@ Advanced usage
 ``labormanager priority <labor> <value>``
     Set the priority value for labor <labor> to <value>.
 ``labormanager max <labor> <value>``
-    Set maximum number of dwarves that can be assigned to a labor.
+    Set the maximum number of dwarves that can be assigned to a labor.
 ``labormanager max <labor> none``
     Unrestrict the number of dwarves that can be assigned to a labor.
 ``labormanager max <labor> disable``
diff --git a/docs/plugins/lair.rst b/docs/plugins/lair.rst
index ed2816818..9bded57ab 100644
--- a/docs/plugins/lair.rst
+++ b/docs/plugins/lair.rst
@@ -11,7 +11,7 @@ Usage
 -----
 
 ``lair``
-    Mark the map as monster lair.
+    Mark the map as a monster lair.
 ``lair reset``
     Mark the map as ordinary (not lair).
 
diff --git a/docs/plugins/manipulator.rst b/docs/plugins/manipulator.rst
index 3dc7f35b7..f333f3be0 100644
--- a/docs/plugins/manipulator.rst
+++ b/docs/plugins/manipulator.rst
@@ -102,7 +102,7 @@ and how many you are likely to need in a mature fort. These are just
 approximations. Your playstyle may demand more or fewer of each profession.
 
 - ``Chef`` (needed: 0, 3)
-    Buchery, Tanning, and Cooking. It is important to focus just a few dwarves
+    Butchery, Tanning, and Cooking. It is important to focus just a few dwarves
     on cooking since well-crafted meals make dwarves very happy. They are also
     an excellent trade good.
 - ``Craftsdwarf`` (needed: 0, 4-6)
diff --git a/docs/plugins/map-render.rst b/docs/plugins/map-render.rst
index efe3ed0c6..935fc1010 100644
--- a/docs/plugins/map-render.rst
+++ b/docs/plugins/map-render.rst
@@ -2,7 +2,7 @@ map-render
 ==========
 
 .. dfhack-tool::
-    :summary: Provides a Lua API for rerendering portions of the map.
+    :summary: Provides a Lua API for re-rendering portions of the map.
     :tags: dev graphics
     :no-command:
 
diff --git a/docs/plugins/power-meter.rst b/docs/plugins/power-meter.rst
index 5e608ca46..701a656b5 100644
--- a/docs/plugins/power-meter.rst
+++ b/docs/plugins/power-meter.rst
@@ -2,7 +2,7 @@ power-meter
 ===========
 
 .. dfhack-tool::
-    :summary: Allow presure plates to measure power.
+    :summary: Allow pressure plates to measure power.
     :tags: fort gameplay buildings
     :no-command:
 
diff --git a/docs/plugins/regrass.rst b/docs/plugins/regrass.rst
index 1a3fc7ed9..5512a428b 100644
--- a/docs/plugins/regrass.rst
+++ b/docs/plugins/regrass.rst
@@ -2,7 +2,7 @@ regrass
 =======
 
 .. dfhack-tool::
-    :summary: Regrows all the grass.
+    :summary: Regrow all the grass.
     :tags: adventure fort armok animals map
 
 Use this command if your grazers have eaten everything down to the dirt.
diff --git a/docs/plugins/rendermax.rst b/docs/plugins/rendermax.rst
index 747b74642..ee909fd9a 100644
--- a/docs/plugins/rendermax.rst
+++ b/docs/plugins/rendermax.rst
@@ -12,7 +12,7 @@ Usage
 -----
 
 ``rendermax light``
-    Light the map tiles realisitically. Outside tiles are light during the day
+    Light the map tiles realistically. Outside tiles are light during the day
     and dark at night. Inside tiles are always dark unless a nearby unit is
     lighting it up, as if they were carrying torches.
 ``rendermax light sun <hour>|cycle``
diff --git a/docs/plugins/resume.rst b/docs/plugins/resume.rst
index d6e0b81cb..af3fe161d 100644
--- a/docs/plugins/resume.rst
+++ b/docs/plugins/resume.rst
@@ -12,7 +12,7 @@ resume
 When enabled, this plugin will display a colored 'X' over suspended buildings.
 When run as a command, it can resume all suspended building jobs, allowing you
 to quickly recover if a bunch of jobs were suspended due to the workers getting
-scared off by wildlife or items temporarily blocking buildling sites.
+scared off by wildlife or items temporarily blocking building sites.
 
 Usage
 -----
diff --git a/docs/plugins/search.rst b/docs/plugins/search.rst
index c489b4c40..e588e3196 100644
--- a/docs/plugins/search.rst
+++ b/docs/plugins/search.rst
@@ -9,7 +9,7 @@ search
     :no-command:
 
 Search options are added to the Stocks, Animals, Trading, Stockpile, Noble
-aassignment candidates), Military (position candidates), Burrows (unit list),
+assignment candidates), Military (position candidates), Burrows (unit list),
 Rooms, Announcements, Job List, and Unit List screens all get hotkeys that allow
 you to dynamically filter the displayed lists.
 
diff --git a/docs/plugins/seedwatch.rst b/docs/plugins/seedwatch.rst
index c471f467d..b41f3a977 100644
--- a/docs/plugins/seedwatch.rst
+++ b/docs/plugins/seedwatch.rst
@@ -21,7 +21,7 @@ Usage
     Start managing seed and plant cooking. By default, no types are watched.
     You have to add them with further ``seedwatch`` commands.
 ``seedwatch <type> <target>``
-    Adds the specifiied type to the watchlist (if it's not already there) and
+    Adds the specified type to the watchlist (if it's not already there) and
     sets the target number of seeds to the specified number. You can pass the
     keyword ``all`` instead of a specific type to set the target for all types.
 ``seedwatch <type>``
diff --git a/docs/plugins/stocks.rst b/docs/plugins/stocks.rst
index d8fae9579..03eb3a72c 100644
--- a/docs/plugins/stocks.rst
+++ b/docs/plugins/stocks.rst
@@ -21,4 +21,4 @@ Usage
     stocks show
 
 Running ``stocks show`` will bring you to the fortress-wide stock management
-screen from whereever you are.
+screen from wherever you are.
diff --git a/docs/plugins/tiletypes.rst b/docs/plugins/tiletypes.rst
index 44fba00df..7b93dd6de 100644
--- a/docs/plugins/tiletypes.rst
+++ b/docs/plugins/tiletypes.rst
@@ -58,7 +58,7 @@ Examples
 ``tiletypes-command filter material STONE ; f shape WALL ; paint shape FLOOR``
     Turn all stone walls into floors, preserving the material.
 ``tiletypes-command p any ; p s wall ; p sp normal``
-    Clear the paint specificaiton and set it to unsmoothed walls.
+    Clear the paint specification and set it to unsmoothed walls.
 ``tiletypes-command f any ; p stone marble ; p sh wall ; p sp normal ; r 10 10``
     Prepare to paint a 10x10 area of marble walls, ready for harvesting for
     flux.
diff --git a/docs/plugins/tubefill.rst b/docs/plugins/tubefill.rst
index 1085897c8..80282f6d9 100644
--- a/docs/plugins/tubefill.rst
+++ b/docs/plugins/tubefill.rst
@@ -2,7 +2,7 @@ tubefill
 ========
 
 .. dfhack-tool::
-    :summary: Replentishes mined-out adamantine.
+    :summary: Replenishes mined-out adamantine.
     :tags: fort armok map
 
 Veins that were originally hollow will be left alone.
diff --git a/docs/plugins/tweak.rst b/docs/plugins/tweak.rst
index bb125fc0d..aa1ad578b 100644
--- a/docs/plugins/tweak.rst
+++ b/docs/plugins/tweak.rst
@@ -66,7 +66,7 @@ Commands that persist until disabled or DF quits:
 ``civ-view-agreement``
     Fixes overlapping text on the "view agreement" screen.
 ``condition-material``
-    Fixes a crash in the work order contition material list (:bug:`9905`).
+    Fixes a crash in the work order condition material list (:bug:`9905`).
 ``craft-age-wear``
     Fixes crafted items not wearing out over time (:bug:`6003`). With this
     tweak, items made from cloth and leather will gain a level of wear every 20
diff --git a/docs/plugins/workflow.rst b/docs/plugins/workflow.rst
index 9013ba189..f085a40da 100644
--- a/docs/plugins/workflow.rst
+++ b/docs/plugins/workflow.rst
@@ -122,7 +122,7 @@ The constraint spec consists of 4 parts, separated with ``/`` characters::
     ITEM[:SUBTYPE]/[GENERIC_MAT,...]/[SPECIFIC_MAT:...]/[LOCAL,<quality>]
 
 The first part is mandatory and specifies the item type and subtype, using the
-raw tokens for items (the same syntax used custom reaction inputs). For more
+raw tokens for items (the same syntax used for custom reaction inputs). For more
 information, see :wiki:`this wiki page <Material_token>`.
 
 The subsequent parts are optional:
diff --git a/docs/plugins/zone.rst b/docs/plugins/zone.rst
index 93b244399..0f77e1d3e 100644
--- a/docs/plugins/zone.rst
+++ b/docs/plugins/zone.rst
@@ -74,8 +74,8 @@ Filters
 :all:            Process all units.
 :count <n>:      Process only up to n units.
 :unassigned:     Not assigned to zone, chain or built cage.
-:minage <years>: Minimum age. Must be followed by number.
-:maxage <years>: Maximum age. Must be followed by number.
+:minage <years>: Minimum age. Must be followed by a number.
+:maxage <years>: Maximum age. Must be followed by a number.
 :not:            Negates the next filter keyword. All of the keywords documented
                  below are negatable.
 :race:           Must be followed by a race RAW ID (e.g. BIRD_TURKEY, ALPACA,

From 663916b86bbc22ed4885352591c6da32de20c487 Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Wed, 28 Sep 2022 14:56:20 -0700
Subject: [PATCH 729/854] update wording for autolabor

---
 docs/plugins/autolabor.rst | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/docs/plugins/autolabor.rst b/docs/plugins/autolabor.rst
index b39884957..63b830dfe 100644
--- a/docs/plugins/autolabor.rst
+++ b/docs/plugins/autolabor.rst
@@ -46,10 +46,9 @@ Hunting is never assigned without a butchery, and fishing is never assigned
 without a fishery.
 
 For each labor, a preference order is calculated based on skill, excluding those
-who can't do the job. Dwarves who are masters of particular skills are
-deprioritized in the preference list for other skills. The labor is then added
-to the best <minimum> dwarves for that labor, then to additional dwarfs that
-meet any of these conditions:
+who can't do the job. Dwarves who are masters of a skill are deprioritized for
+other skills. The labor is then added to the best <minimum> dwarves for that
+labor, then to additional dwarfs that meet any of these conditions:
 
 * The dwarf is idle and there are no idle dwarves assigned to this labor
 * The dwarf has non-zero skill associated with the labor

From dbeaff7c16e92710b34ee4a5eca2e5f65228dab1 Mon Sep 17 00:00:00 2001
From: DFHack-Urist via GitHub Actions
 <63161697+DFHack-Urist@users.noreply.github.com>
Date: Wed, 28 Sep 2022 21:57:33 +0000
Subject: [PATCH 730/854] Auto-update submodules

scripts: master
---
 scripts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts b/scripts
index 4f568fc83..3da6fa744 160000
--- a/scripts
+++ b/scripts
@@ -1 +1 @@
-Subproject commit 4f568fc8331d62bc6646055c1252bba19b3a526d
+Subproject commit 3da6fa7444ad537e92a6ad2e1cfad964990c87fd

From 95bbdcd93474d1b55816edb2da93a2a543e1749d Mon Sep 17 00:00:00 2001
From: DFHack-Urist via GitHub Actions
 <63161697+DFHack-Urist@users.noreply.github.com>
Date: Thu, 29 Sep 2022 07:37:17 +0000
Subject: [PATCH 731/854] Auto-update submodules

scripts: master
---
 scripts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts b/scripts
index 3da6fa744..cfb11e1d0 160000
--- a/scripts
+++ b/scripts
@@ -1 +1 @@
-Subproject commit 3da6fa7444ad537e92a6ad2e1cfad964990c87fd
+Subproject commit cfb11e1d0cee48f29b4a8323acc7a32787a8ddda

From 8a381ee520d7fa4e17005fc43c1be4403e633141 Mon Sep 17 00:00:00 2001
From: DFHack-Urist via GitHub Actions
 <63161697+DFHack-Urist@users.noreply.github.com>
Date: Fri, 30 Sep 2022 07:42:02 +0000
Subject: [PATCH 732/854] Auto-update submodules

scripts: master
---
 scripts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts b/scripts
index cfb11e1d0..19c0d1d8b 160000
--- a/scripts
+++ b/scripts
@@ -1 +1 @@
-Subproject commit cfb11e1d0cee48f29b4a8323acc7a32787a8ddda
+Subproject commit 19c0d1d8b131446c27513eb85bd27d48e8ea214e

From 3f6e92eda49579a7fa12b589d7a794448c5dc5bd Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Fri, 30 Sep 2022 11:58:22 -0700
Subject: [PATCH 733/854] finalize 0.47.05-r7 release

---
 CMakeLists.txt     |  2 +-
 docs/changelog.txt | 16 ++++++++++++++--
 library/xml        |  2 +-
 scripts            |  2 +-
 4 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8aa57d574..2e6f5c835 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -192,7 +192,7 @@ endif()
 
 # set up versioning.
 set(DF_VERSION "0.47.05")
-set(DFHACK_RELEASE "r6")
+set(DFHACK_RELEASE "r7")
 set(DFHACK_PRERELEASE FALSE)
 
 set(DFHACK_VERSION "${DF_VERSION}-${DFHACK_RELEASE}")
diff --git a/docs/changelog.txt b/docs/changelog.txt
index 52e906486..72fb5906c 100644
--- a/docs/changelog.txt
+++ b/docs/changelog.txt
@@ -33,13 +33,25 @@ changelog.txt uses a syntax similar to RST, with a few special sequences:
 
 # Future
 
+## New Plugins
+
+## Fixes
+
+## Misc Improvements
+
+## Documentation
+
+## API
+
+## Lua
+
+# 0.47.05-r7
+
 ## New Plugins
 - `autonestbox`: split off from `zone` into its own plugin. Note that to enable, the command has changed from ``autonestbox start`` to ``enable autonestbox``.
 - `autobutcher`: split off from `zone` into its own plugin. Note that to enable, the command has changed from ``autobutcher start`` to ``enable autobutcher``.
 - `overlay`: display a "DFHack" button in the lower left corner that you can click to start the new GUI command launcher. The `dwarfmonitor` weather display had to be moved to make room for the button. If you are seeing the weather indicator rendered over the overlay button, please remove the ``dfhack-config/dwarfmonitor.json`` file to fix the weather indicator display offset.
 
-## New Tweaks
-
 ## New Internal Commands
 - `tags`: new built-in command to list the tool category tags and their definitions. tags associated with each tool are visible in the tool help and in the output of `ls`.
 
diff --git a/library/xml b/library/xml
index f5fab13fb..f5019a5c6 160000
--- a/library/xml
+++ b/library/xml
@@ -1 +1 @@
-Subproject commit f5fab13fb652dd953e9d59e8deca032b26131208
+Subproject commit f5019a5c6f19ef05a28bd974c3e8668b78e6e2a4
diff --git a/scripts b/scripts
index 19c0d1d8b..04836f16f 160000
--- a/scripts
+++ b/scripts
@@ -1 +1 @@
-Subproject commit 19c0d1d8b131446c27513eb85bd27d48e8ea214e
+Subproject commit 04836f16f9705bfbb1438fc0870b3e41b6539f75

From 8e9f3e902f889f38764fb5e86950d12fac2badd5 Mon Sep 17 00:00:00 2001
From: Myk <myk002@yahoo.com>
Date: Sat, 1 Oct 2022 16:59:33 -0700
Subject: [PATCH 734/854] Update quickfort-user-guide.rst

Fix typo
---
 docs/guides/quickfort-user-guide.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/guides/quickfort-user-guide.rst b/docs/guides/quickfort-user-guide.rst
index 71a80818c..6f606c43a 100644
--- a/docs/guides/quickfort-user-guide.rst
+++ b/docs/guides/quickfort-user-guide.rst
@@ -190,8 +190,8 @@ dug-out area::
    Cw Cw    Cw #
    #  #  #  #  #
 
-Note my generosity -- in addition to the bed (:kbd:`b`) I've built a chest
-(:kbd:`c`) here for the dwarf as well. You must use the full series of keys
+Note my generosity -- in addition to the bed (:kbd:`b`) I've built a container
+(:kbd:`h`) here for the dwarf as well. You must use the full series of keys
 needed to build something in each cell, e.g. :kbd:`C`:kbd:`w` indicates we
 should enter DF's constructions submenu (:kbd:`C`) and select walls (:kbd:`w`).
 

From 55d2c20307f3faf293362cc12ef808d92b0fe6bd Mon Sep 17 00:00:00 2001
From: "pre-commit-ci[bot]"
 <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Date: Mon, 3 Oct 2022 21:37:36 +0000
Subject: [PATCH 735/854] [pre-commit.ci] pre-commit autoupdate
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

updates:
- [github.com/python-jsonschema/check-jsonschema: 0.18.2 → 0.18.3](https://github.com/python-jsonschema/check-jsonschema/compare/0.18.2...0.18.3)
---
 .pre-commit-config.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 25f043624..00e01ea22 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -20,7 +20,7 @@ repos:
       args: ['--fix=lf']
     - id: trailing-whitespace
 - repo: https://github.com/python-jsonschema/check-jsonschema
-  rev: 0.18.2
+  rev: 0.18.3
   hooks:
     - id: check-github-workflows
 - repo: https://github.com/Lucas-C/pre-commit-hooks

From 739792a59e0978bf39995c543d3bc33cb85d0a69 Mon Sep 17 00:00:00 2001
From: DFHack-Urist via GitHub Actions
 <63161697+DFHack-Urist@users.noreply.github.com>
Date: Tue, 4 Oct 2022 07:30:12 +0000
Subject: [PATCH 736/854] Auto-update submodules

library/xml: master
scripts: master
---
 library/xml | 2 +-
 scripts     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/library/xml b/library/xml
index f5019a5c6..f2b59b8d5 160000
--- a/library/xml
+++ b/library/xml
@@ -1 +1 @@
-Subproject commit f5019a5c6f19ef05a28bd974c3e8668b78e6e2a4
+Subproject commit f2b59b8d5036cca90a88245d0d7c8b2a713f60ee
diff --git a/scripts b/scripts
index 04836f16f..41bfa9005 160000
--- a/scripts
+++ b/scripts
@@ -1 +1 @@
-Subproject commit 04836f16f9705bfbb1438fc0870b3e41b6539f75
+Subproject commit 41bfa9005ec78094388518d40e7aaa43f7d35890

From dc535004e9670db733f6d65f89f20215750c29c4 Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Wed, 5 Oct 2022 12:51:30 -0700
Subject: [PATCH 737/854] better formatting for ls output for tags

---
 docs/changelog.txt      | 1 +
 library/lua/helpdb.lua  | 6 ++++--
 test/library/helpdb.lua | 8 ++++----
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/docs/changelog.txt b/docs/changelog.txt
index 72fb5906c..d00f4c246 100644
--- a/docs/changelog.txt
+++ b/docs/changelog.txt
@@ -38,6 +38,7 @@ changelog.txt uses a syntax similar to RST, with a few special sequences:
 ## Fixes
 
 ## Misc Improvements
+- `ls`: indent tag listings and wrap them in the right column for better readability
 
 ## Documentation
 
diff --git a/library/lua/helpdb.lua b/library/lua/helpdb.lua
index ac6adb55d..d07445399 100644
--- a/library/lua/helpdb.lua
+++ b/library/lua/helpdb.lua
@@ -726,13 +726,15 @@ end
 local function list_entries(skip_tags, include, exclude)
     local entries = search_entries(include, exclude)
     for _,entry in ipairs(entries) do
-        print_columns(entry, get_entry_short_help(entry))
+        local short_help = get_entry_short_help(entry)
         if not skip_tags then
             local tags = set_to_sorted_list(get_entry_tags(entry))
             if #tags > 0 then
-                print(('    tags: %s'):format(table.concat(tags, ', ')))
+                local taglist = table.concat(tags, ', ')
+                short_help = short_help .. NEWLINE .. 'tags: ' .. taglist
             end
         end
+        print_columns(entry, short_help)
     end
     if #entries == 0 then
         print('No matches.')
diff --git a/test/library/helpdb.lua b/test/library/helpdb.lua
index 067f35532..efa9e93d5 100644
--- a/test/library/helpdb.lua
+++ b/test/library/helpdb.lua
@@ -637,7 +637,7 @@ function test.ls()
         expect.eq(5, mock_print.call_count)
         expect.eq('inscript_docs        in-file short description for inscript_docs.',
             mock_print.call_args[1][1])
-        expect.eq('    tags: map', mock_print.call_args[2][1])
+        expect.eq('                      tags: map', mock_print.call_args[2][1])
         expect.eq('nodoc_command        cpp description.',
             mock_print.call_args[3][1])
         expect.eq('nodocs_samename      Nodocs samename.',
@@ -652,15 +652,15 @@ function test.ls()
         expect.eq(6, mock_print.call_count)
         expect.eq('bindboxers           Bind your boxers.',
             mock_print.call_args[1][1])
-        expect.eq('    tags: armok, fort, units',
+        expect.eq('                      tags: armok, fort, units',
             mock_print.call_args[2][1])
         expect.eq('boxbinders           Box your binders.',
             mock_print.call_args[3][1])
-        expect.eq('    tags: armok, fort, units',
+        expect.eq('                      tags: armok, fort, units',
             mock_print.call_args[4][1])
         expect.eq('samename             Samename.',
             mock_print.call_args[5][1])
-        expect.eq('    tags: armok, fort, units',
+        expect.eq('                      tags: armok, fort, units',
             mock_print.call_args[6][1])
     end)
 

From 9817106c30ee63527c22e00833692c5b009dc7d0 Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Wed, 5 Oct 2022 13:30:14 -0700
Subject: [PATCH 738/854] add --exclude option for ls

---
 docs/Lua API.rst        | 11 ++++--
 docs/builtins/ls.rst    |  2 ++
 docs/changelog.txt      |  1 +
 library/Core.cpp        | 13 +++++--
 library/lua/helpdb.lua  | 60 ++++++++++++++++++++++++-------
 test/library/helpdb.lua | 78 ++++++++++++++++++++++++++++++++++-------
 6 files changed, 136 insertions(+), 29 deletions(-)

diff --git a/docs/Lua API.rst b/docs/Lua API.rst
index 4aa8d78cb..d8a76dd28 100644
--- a/docs/Lua API.rst	
+++ b/docs/Lua API.rst	
@@ -3150,8 +3150,8 @@ Each entry has several properties associated with it:
   alphabetized by their last path component, with populated path components
   coming before null path components (e.g. ``autobutcher`` will immediately
   follow ``gui/autobutcher``).
-  The optional ``include`` and ``exclude`` filter params are maps with the
-  following elements:
+  The optional ``include`` and ``exclude`` filter params are maps (or lists of
+  maps) with the following elements:
 
   :str:   if a string, filters by the given substring. if a table of strings,
           includes entry names that match any of the given substrings.
@@ -3160,6 +3160,13 @@ Each entry has several properties associated with it:
   :entry_type: if a string, matches entries of the given type. if a table of
           strings, includes entries that match any of the given types.
 
+  Elements in a map are ANDed together (e.g. if both ``str`` and ``tag`` are
+  specified, the match is on any of the ``str`` elements AND any of the ``tag``
+  elements).
+
+  If lists of filters are passed instead of a single map, the maps are ORed
+  (that is, the match succeeds if any of the filters match).
+
   If ``include`` is ``nil`` or empty, then all entries are included. If
   ``exclude`` is ``nil`` or empty, then no entries are filtered out.
 
diff --git a/docs/builtins/ls.rst b/docs/builtins/ls.rst
index 7305a0256..cd6bc4126 100644
--- a/docs/builtins/ls.rst
+++ b/docs/builtins/ls.rst
@@ -40,3 +40,5 @@ Options
     Don't print out the tags associated with each command.
 ``--dev``
     Include commands intended for developers and modders.
+``--exclude <string>[,<string>...]``
+    Exclude commands that match any of the given strings.
diff --git a/docs/changelog.txt b/docs/changelog.txt
index d00f4c246..fb11def8e 100644
--- a/docs/changelog.txt
+++ b/docs/changelog.txt
@@ -39,6 +39,7 @@ changelog.txt uses a syntax similar to RST, with a few special sequences:
 
 ## Misc Improvements
 - `ls`: indent tag listings and wrap them in the right column for better readability
+- `ls`: new ``--exclude`` option for hiding matched scripts from the output.  this can be especially useful for modders who don't want their mod scripts to be included in ``ls`` output.
 
 ## Documentation
 
diff --git a/library/Core.cpp b/library/Core.cpp
index 87f78f56c..73336b2e7 100644
--- a/library/Core.cpp
+++ b/library/Core.cpp
@@ -622,12 +622,18 @@ void ls_helper(color_ostream &con, const vector<string> &params) {
     vector<string> filter;
     bool skip_tags = false;
     bool show_dev_commands = false;
+    string exclude_strs = "";
 
+    bool in_exclude = false;
     for (auto str : params) {
-        if (str == "--notags")
+        if (in_exclude)
+            exclude_strs = str;
+        else if (str == "--notags")
             skip_tags = true;
         else if (str == "--dev")
             show_dev_commands = true;
+        else if (str == "--exclude")
+            in_exclude = true;
         else
             filter.push_back(str);
     }
@@ -636,7 +642,7 @@ void ls_helper(color_ostream &con, const vector<string> &params) {
     auto L = Lua::Core::State;
     Lua::StackUnwinder top(L);
 
-    if (!lua_checkstack(L, 4) ||
+    if (!lua_checkstack(L, 5) ||
         !Lua::PushModulePublic(con, L, "helpdb", "ls")) {
         con.printerr("Failed to load helpdb Lua code\n");
         return;
@@ -645,8 +651,9 @@ void ls_helper(color_ostream &con, const vector<string> &params) {
     Lua::PushVector(L, filter);
     Lua::Push(L, skip_tags);
     Lua::Push(L, show_dev_commands);
+    Lua::Push(L, exclude_strs);
 
-    if (!Lua::SafeCall(con, L, 3, 0)) {
+    if (!Lua::SafeCall(con, L, 4, 0)) {
         con.printerr("Failed Lua call to helpdb.ls.\n");
     }
 }
diff --git a/library/lua/helpdb.lua b/library/lua/helpdb.lua
index d07445399..5af41c929 100644
--- a/library/lua/helpdb.lua
+++ b/library/lua/helpdb.lua
@@ -14,6 +14,8 @@
 
 local _ENV = mkmodule('helpdb')
 
+local argparse = require('argparse')
+
 local MAX_STALE_MS = 60000
 
 -- paths
@@ -588,6 +590,8 @@ function sort_by_basename(a, b)
     return false
 end
 
+-- returns true if all filter elements are matched (i.e. any of the tags AND
+-- any of the strings AND any of the entry_types)
 local function matches(entry_name, filter)
     if filter.tag then
         local matched = false
@@ -630,9 +634,18 @@ local function matches(entry_name, filter)
     return true
 end
 
+local function matches_any(entry_name, filters)
+    for _,filter in ipairs(filters) do
+        if matches(entry_name, filter) then
+            return true
+        end
+    end
+    return false
+end
+
 -- normalizes the lists in the filter and returns nil if no filter elements are
 -- populated
-local function normalize_filter(f)
+local function normalize_filter_map(f)
     if not f then return nil end
     local filter = {}
     filter.str = normalize_string_list(f.str)
@@ -644,11 +657,21 @@ local function normalize_filter(f)
     return filter
 end
 
+local function normalize_filter_list(fs)
+    if not fs then return nil end
+    local filter_list = {}
+    for _,f in ipairs(#fs > 0 and fs or {fs}) do
+        table.insert(filter_list, normalize_filter_map(f))
+    end
+    if #filter_list == 0 then return nil end
+    return filter_list
+end
+
 -- returns a list of entry names, alphabetized by their last path component,
 -- with populated path components coming before null path components (e.g.
 -- autobutcher will immediately follow gui/autobutcher).
--- the optional include and exclude filter params are maps with the following
--- elements:
+-- the optional include and exclude filter params are maps (or lists of maps)
+-- with the following elements:
 --   str - if a string, filters by the given substring. if a table of strings,
 --         includes entry names that match any of the given substrings.
 --   tag - if a string, filters by the given tag name. if a table of strings,
@@ -658,14 +681,18 @@ end
 --         types are: "builtin", "plugin", "command". note that many plugin
 --         commands have the same name as the plugin, so those entries will
 --         match both "plugin" and "command" types.
+-- filter elements in a map are ANDed together (e.g. if both str and tag are
+-- specified, the match is on any of the str elements AND any of the tag
+-- elements). If lists of maps are passed, the maps are ORed (that is, the match
+-- succeeds if any of the filters match).
 function search_entries(include, exclude)
     ensure_db()
-    include = normalize_filter(include)
-    exclude = normalize_filter(exclude)
+    include = normalize_filter_list(include)
+    exclude = normalize_filter_list(exclude)
     local entries = {}
     for entry in pairs(entrydb) do
-        if (not include or matches(entry, include)) and
-                (not exclude or not matches(entry, exclude)) then
+        if (not include or matches_any(entry, include)) and
+                (not exclude or not matches_any(entry, exclude)) then
             table.insert(entries, entry)
         end
     end
@@ -743,21 +770,30 @@ end
 
 -- wraps the list_entries() API to provide a more convenient interface for Core
 -- to implement the 'ls' builtin command.
---   filter_str - if a tag name, will filter by that tag. otherwise, will filter
---                as a substring
+--   filter_str - if a tag name (or a list of tag names), will filter by that
+--                tag/those tags. otherwise, will filter as a substring/list of
+--                substrings
 --   skip_tags - whether to skip printing tag info
 --   show_dev_commands - if true, will include scripts in the modtools/ and
 --                       devel/ directories. otherwise those scripts will be
 --                       excluded
-function ls(filter_str, skip_tags, show_dev_commands)
+--   exclude_strs - comma-separated list of strings. entries are excluded if
+--                  they match any of the strings.
+function ls(filter_str, skip_tags, show_dev_commands, exclude_strs)
     local include = {entry_type={ENTRY_TYPES.COMMAND}}
     if is_tag(filter_str) then
         include.tag = filter_str
     else
         include.str = filter_str
     end
-    list_entries(skip_tags, include,
-                 show_dev_commands and {} or {tag='dev'})
+    local excludes = {}
+    if exclude_strs and #exclude_strs > 0 then
+        table.insert(excludes, {str=argparse.stringList(exclude_strs)})
+    end
+    if not show_dev_commands then
+        table.insert(excludes, {tag='dev'})
+    end
+    list_entries(skip_tags, include, excludes)
 end
 
 local function list_tags()
diff --git a/test/library/helpdb.lua b/test/library/helpdb.lua
index efa9e93d5..1f1e58ba9 100644
--- a/test/library/helpdb.lua
+++ b/test/library/helpdb.lua
@@ -36,6 +36,7 @@ local mock_script_db = {
     inscript_docs=true,
     inscript_short_only=true,
     nodocs_script=true,
+    dev_script=true,
 }
 
 local files = {
@@ -48,6 +49,8 @@ local files = {
 
 * units: Tools that interact with units.
 
+* dev: Dev tools.
+
 * nomembers: Nothing is tagged with this.
     ]],
     ['hack/docs/docs/tools/hascommands.txt']=[[
@@ -113,6 +116,20 @@ Command: "subdir/scriptname"
   Documented subdir/scriptname.
 
 Documented full help.
+    ]],
+    ['hack/docs/docs/tools/dev_script.txt']=[[
+dev_script
+==========
+
+Tags: dev
+
+Command: "dev_script"
+
+  Short desc.
+
+Full help.
+]====]
+script contents
     ]],
     ['scripts/scriptpath/basic.lua']=[[
 -- in-file short description for basic
@@ -216,6 +233,9 @@ Command: "inscript_docs"
 
 Documented full help.
 ]====]
+script contents
+    ]],
+    ['other/scriptpath/dev_script.lua']=[[
 script contents
     ]],
 }
@@ -495,7 +515,7 @@ function test.is_tag()
 end
 
 function test.get_tags()
-    expect.table_eq({'armok', 'fort', 'map', 'nomembers', 'units'},
+    expect.table_eq({'armok', 'dev', 'fort', 'map', 'nomembers', 'units'},
         h.get_tags())
 end
 
@@ -534,8 +554,8 @@ end
 function test.search_entries()
     -- all entries, in alphabetical order by last path component
     local expected = {'?', 'alias', 'basic', 'bindboxers', 'boxbinders',
-        'clear', 'cls', 'die', 'dir', 'disable', 'devel/dump-rpc', 'enable',
-        'fpause', 'hascommands', 'help', 'hide', 'inscript_docs',
+        'clear', 'cls', 'dev_script', 'die', 'dir', 'disable', 'devel/dump-rpc',
+        'enable', 'fpause', 'hascommands', 'help', 'hide', 'inscript_docs',
         'inscript_short_only', 'keybinding', 'kill-lua', 'load', 'ls', 'man',
         'nocommand', 'nodoc_command', 'nodocs_hascommands', 'nodocs_nocommand',
         'nodocs_samename', 'nodocs_script', 'plug', 'reload', 'samename',
@@ -555,19 +575,26 @@ function test.search_entries()
     expect.table_eq(expected, h.search_entries({str='script',
                                                 entry_type='builtin'}))
 
-    expected = {'inscript_docs', 'inscript_short_only','nodocs_script',
-                'subdir/scriptname'}
+    expected = {'dev_script', 'inscript_docs', 'inscript_short_only',
+                'nodocs_script', 'subdir/scriptname'}
     expect.table_eq(expected, h.search_entries({str='script'},
                                                {entry_type='builtin'}))
 
     expected = {'bindboxers', 'boxbinders'}
     expect.table_eq(expected, h.search_entries({str='box'}))
+
+    expected = {'bindboxers', 'boxbinders', 'inscript_docs',
+                'inscript_short_only', 'nodocs_script', 'subdir/scriptname'}
+    expect.table_eq(expected, h.search_entries({{str='script'}, {str='box'}},
+                                               {{entry_type='builtin'},
+                                                {tag='dev'}}),
+                    'multiple filters for include and exclude')
 end
 
 function test.get_commands()
     local expected = {'?', 'alias', 'basic', 'bindboxers', 'boxbinders',
-        'clear', 'cls', 'die', 'dir', 'disable', 'devel/dump-rpc', 'enable',
-        'fpause', 'help', 'hide', 'inscript_docs', 'inscript_short_only',
+        'clear', 'cls', 'dev_script', 'die', 'dir', 'disable', 'devel/dump-rpc',
+        'enable', 'fpause', 'help', 'hide', 'inscript_docs', 'inscript_short_only',
         'keybinding', 'kill-lua', 'load', 'ls', 'man', 'nodoc_command',
         'nodocs_samename', 'nodocs_script', 'plug', 'reload', 'samename',
         'script', 'subdir/scriptname', 'sc-script', 'show', 'tags', 'type',
@@ -598,21 +625,23 @@ function test.tags()
     local mock_print = mock.func()
     mock.patch(h, 'print', mock_print, function()
         h.tags()
-        expect.eq(7, mock_print.call_count)
+        expect.eq(8, mock_print.call_count)
         expect.eq('armok                Tools that give you complete control over an aspect of the',
             mock_print.call_args[1][1])
         expect.eq('                      game or provide access to information that the game',
             mock_print.call_args[2][1])
         expect.eq('                      intentionally keeps hidden.',
             mock_print.call_args[3][1])
-        expect.eq('fort                 Tools that are useful while in fort mode.',
+        expect.eq('dev                  Dev tools.',
             mock_print.call_args[4][1])
-        expect.eq('map                  Tools that interact with the game map.',
+        expect.eq('fort                 Tools that are useful while in fort mode.',
             mock_print.call_args[5][1])
-        expect.eq('nomembers            Nothing is tagged with this.',
+        expect.eq('map                  Tools that interact with the game map.',
             mock_print.call_args[6][1])
-        expect.eq('units                Tools that interact with units.',
+        expect.eq('nomembers            Nothing is tagged with this.',
             mock_print.call_args[7][1])
+        expect.eq('units                Tools that interact with units.',
+            mock_print.call_args[8][1])
     end)
 end
 
@@ -670,4 +699,29 @@ function test.ls()
         expect.eq(1, mock_print.call_count)
         expect.eq('No matches.', mock_print.call_args[1][1])
     end)
+
+    -- test skipping tags and excluding strings
+    mock_print = mock.func()
+    mock.patch(h, 'print', mock_print, function()
+        h.ls('armok', true, false, 'boxer,binder')
+        expect.eq(1, mock_print.call_count)
+        expect.eq('samename             Samename.', mock_print.call_args[1][1])
+    end)
+
+    -- test excluding dev scripts
+    mock_print = mock.func()
+    mock.patch(h, 'print', mock_print, function()
+        h.ls('_script', true, false, 'inscript,nodocs')
+        expect.eq(1, mock_print.call_count)
+        expect.eq('No matches.', mock_print.call_args[1][1])
+    end)
+
+    -- test including dev scripts
+    mock_print = mock.func()
+    mock.patch(h, 'print', mock_print, function()
+        h.ls('_script', true, true, 'inscript,nodocs')
+        expect.eq(1, mock_print.call_count)
+        expect.eq('dev_script           Short desc.',
+            mock_print.call_args[1][1])
+    end)
 end

From 33816b8bc215dcf7b11c9c6ea1cc98f9e80ce0e0 Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Wed, 5 Oct 2022 14:01:09 -0700
Subject: [PATCH 739/854] optionally process only the cur z-level and below

---
 docs/changelog.txt   |  1 +
 docs/plugins/dig.rst | 12 ++++++++----
 plugins/dig.cpp      | 31 ++++++++++++-------------------
 3 files changed, 21 insertions(+), 23 deletions(-)

diff --git a/docs/changelog.txt b/docs/changelog.txt
index fb11def8e..eba15cfb4 100644
--- a/docs/changelog.txt
+++ b/docs/changelog.txt
@@ -40,6 +40,7 @@ changelog.txt uses a syntax similar to RST, with a few special sequences:
 ## Misc Improvements
 - `ls`: indent tag listings and wrap them in the right column for better readability
 - `ls`: new ``--exclude`` option for hiding matched scripts from the output.  this can be especially useful for modders who don't want their mod scripts to be included in ``ls`` output.
+- `digtype`: new ``-z`` option for digtype to restrict designations to the current z-level and down
 
 ## Documentation
 
diff --git a/docs/plugins/dig.rst b/docs/plugins/dig.rst
index 4384ade65..a10db97df 100644
--- a/docs/plugins/dig.rst
+++ b/docs/plugins/dig.rst
@@ -25,7 +25,7 @@ dig
     :summary: Designate circles.
 
 .. dfhack-command:: digtype
-    :summary: Designate all vein tiles of the selected type.
+    :summary: Designate all vein tiles of the same type as the selected tile.
 
 .. dfhack-command:: digexp
     :summary: Designate dig patterns for exploratory mining.
@@ -50,9 +50,9 @@ Usage
     Designate circles. The diameter is the number of tiles across the center of
     the circle that you want to dig. See the `digcircle`_ section below for
     options.
-``digtype [<designation>] [-p<number>]``
-    Designate all vein tiles of the selected type. See the `digtype`_ section
-    below for options.
+``digtype [<designation>] [-p<number>] [-z]``
+    Designate all vein tiles of the same type as the selected tile. See the
+    `digtype`_ section below for options.
 ``digexp [<pattern>] [<filter>] [-p<number>]``
     Designate dig patterns for exploratory mining. See the `digexp`_ section
     below for options.
@@ -143,6 +143,10 @@ Designation options:
 ``clear``
     Clear any designations.
 
+You can also pass a ``-z`` option, which restricts designations to the current
+z-level and down. This is useful when you don't want to designate tiles on the
+same z-levels as your carefully dug fort above.
+
 digexp
 ------
 
diff --git a/plugins/dig.cpp b/plugins/dig.cpp
index ddc2cd97e..945bf3613 100644
--- a/plugins/dig.cpp
+++ b/plugins/dig.cpp
@@ -35,6 +35,7 @@ command_result digtype (color_ostream &out, vector <string> & parameters);
 DFHACK_PLUGIN("dig");
 REQUIRE_GLOBAL(ui_sidebar_menus);
 REQUIRE_GLOBAL(world);
+REQUIRE_GLOBAL(window_z);
 
 DFhackCExport command_result plugin_init ( color_ostream &out, std::vector <PluginCommand> &commands)
 {
@@ -1417,16 +1418,18 @@ command_result digtype (color_ostream &out, vector <string> & parameters)
     //mostly copy-pasted from digv
     int32_t priority = parse_priority(out, parameters);
     CoreSuspender suspend;
-    if ( parameters.size() > 1 )
+
+    if (!Maps::IsValid())
     {
-        out.printerr("Too many parameters.\n");
+        out.printerr("Map is not available!\n");
         return CR_FAILURE;
     }
 
-    int32_t targetDigType;
-    if ( parameters.size() == 1 )
-    {
-        string parameter = parameters[0];
+    uint32_t xMax,yMax,zMax;
+    Maps::getSize(xMax,yMax,zMax);
+
+    int32_t targetDigType = -1;
+    for (string parameter : parameters) {
         if ( parameter == "clear" )
             targetDigType = tile_dig_designation::No;
         else if ( parameter == "dig" )
@@ -1441,26 +1444,16 @@ command_result digtype (color_ostream &out, vector <string> & parameters)
             targetDigType = tile_dig_designation::DownStair;
         else if ( parameter == "up" )
             targetDigType = tile_dig_designation::UpStair;
+        else if ( parameter == "-z" )
+            zMax = *window_z + 1;
         else
         {
-            out.printerr("Invalid parameter.\n");
+            out.printerr("Invalid parameter: '%s'.\n", parameter.c_str());
             return CR_FAILURE;
         }
     }
-    else
-    {
-        targetDigType = -1;
-    }
-
-    if (!Maps::IsValid())
-    {
-        out.printerr("Map is not available!\n");
-        return CR_FAILURE;
-    }
 
     int32_t cx, cy, cz;
-    uint32_t xMax,yMax,zMax;
-    Maps::getSize(xMax,yMax,zMax);
     uint32_t tileXMax = xMax * 16;
     uint32_t tileYMax = yMax * 16;
     Gui::getCursorCoords(cx,cy,cz);

From 24232e894a17e6b6d293ec8413d37929d266a311 Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Thu, 6 Oct 2022 11:13:16 -0700
Subject: [PATCH 740/854] create Scrollbar widget and integrate with List

---
 docs/Lua API.rst            |  41 ++++++++---
 docs/changelog.txt          |   2 +
 library/lua/gui/widgets.lua | 138 +++++++++++++++++++++++++++++++++---
 3 files changed, 165 insertions(+), 16 deletions(-)

diff --git a/docs/Lua API.rst b/docs/Lua API.rst
index d8a76dd28..b9c09c673 100644
--- a/docs/Lua API.rst	
+++ b/docs/Lua API.rst	
@@ -4032,6 +4032,38 @@ following keyboard hotkeys:
 - Ctrl-Left/Right arrow: move the cursor one word to the left or right.
 - Alt-Left/Right arrow: move the cursor to the beginning/end of the text.
 
+Scrollbar class
+---------------
+
+This Widget subclass implements mouse-interactive scrollbars whose bar sizes
+represent the amount of content currently visible in an associated display
+widget (like a `Label class`_ or a `List class`_). By default they are styled
+like scrollbars used in the vanilla DF help screens, but they are configurable.
+
+Scrollbars have the following attributes:
+
+:fg: Specifies the pen for the scroll icons and the active part of the bar. Default is ``COLOR_LIGHTGREEN``.
+:bg: Specifies the pen for the background part of the scrollbar. Default is ``COLOR_CYAN``.
+:on_scroll: A callback called when the scrollbar is scrolled. It will be called with a single string parameter with a value of "up_large", "down_large", "up_small", or "down_small".
+
+The Scrollbar widget implements the following methods:
+
+* ``scrollbar:update(top_elem, elems_per_page, num_elems)``
+
+  Updates the info about the widget that the scrollbar is paired with.
+  The ``top_elem`` param is the (one-based) index of the first visible element.
+  The ``elems_per_page`` param is the maximum number of elements that can be
+  shown at one time. The ``num_elems`` param is the total number of elements
+  that the paried widget can scroll through. The scrollbar will adjust its
+  scrollbar size and position accordingly.
+
+Clicking on the arrows at the top or the bottom of a scrollbar will scroll an
+associated widget by a small amount. Clicking on the unfilled portion of the
+scrollbar above or below the filled area will scroll by a larger amount in that
+direction. The amount of scrolling done in each case in determined by the
+associated widget, and after scrolling is complete, the associated widget must
+call ``scrollbar:update()`` with updated new display info.
+
 Label class
 -----------
 
@@ -4056,13 +4088,7 @@ It has the following attributes:
     icons next to the text in an additional column (``frame_inset`` is adjusted to have ``.r`` or ``.l`` greater than ``0``),
     ``nil`` same as ``'right'`` but changes ``frame_inset`` only if a scroll icon is actually necessary
     (if ``getTextHeight()`` is greater than ``frame_body.height``). Default is ``nil``.
-:scrollbar_fg: Specifies the pen for the scroll icons and the active part of the bar. Default is ``COLOR_LIGHTGREEN`` (the same as the native DF help screens).
-:scrollbar_bg: Specifies the pen for the background part of the scrollbar. Default is ``COLOR_CYAN`` (the same as the native DF help screens).
-
-If the scrollbar is shown, it will react to mouse clicks on the scrollbar itself.
-Clicking on the arrows at the top or the bottom will scroll by one line, and
-clicking on the unfilled portion of the scrollbar will scroll by a half page in
-that direction.
+:scrollbar: The table of attributes to pass to the `Scrollbar class`_.
 
 The text itself is represented as a complex structure, and passed
 to the object via the ``text`` argument of the constructor, or via
@@ -4283,7 +4309,6 @@ Every list item may be specified either as a string, or as a lua table
 with the following fields:
 
 :text: Specifies the label text in the same format as the Label text.
-:caption, [1]: Deprecated legacy aliases for **text**.
 :text_*: Reserved for internal use.
 :key: Specifies a keybinding that acts as a shortcut for the specified item.
 :icon: Specifies an icon string, or a pen to paint a single character. May be a callback.
diff --git a/docs/changelog.txt b/docs/changelog.txt
index eba15cfb4..b1d5300a9 100644
--- a/docs/changelog.txt
+++ b/docs/changelog.txt
@@ -41,12 +41,14 @@ changelog.txt uses a syntax similar to RST, with a few special sequences:
 - `ls`: indent tag listings and wrap them in the right column for better readability
 - `ls`: new ``--exclude`` option for hiding matched scripts from the output.  this can be especially useful for modders who don't want their mod scripts to be included in ``ls`` output.
 - `digtype`: new ``-z`` option for digtype to restrict designations to the current z-level and down
+- UX: List widgets now have mouse-interactive scrollbars
 
 ## Documentation
 
 ## API
 
 ## Lua
+- ``widgets.Scrollbar``: new scrollbar widget that can be paired with an associated scrollable widget. Integrated with ``widgets.Label`` and ``widgets.List``.
 
 # 0.47.05-r7
 
diff --git a/library/lua/gui/widgets.lua b/library/lua/gui/widgets.lua
index 7076570b9..20aff7aa4 100644
--- a/library/lua/gui/widgets.lua
+++ b/library/lua/gui/widgets.lua
@@ -359,6 +359,96 @@ function EditField:onInput(keys)
     return self.modal
 end
 
+---------------
+-- Scrollbar --
+---------------
+
+Scrollbar = defclass(Scrollbar, Widget)
+
+Scrollbar.ATTRS{
+    fg = COLOR_LIGHTGREEN,
+    bg = COLOR_CYAN,
+    on_scroll = DEFAULT_NIL,
+}
+
+function Scrollbar:preinit(init_table)
+    init_table.frame = init_table.frame or {}
+    init_table.frame.w = init_table.frame.w or 1
+end
+
+function Scrollbar:init()
+    self:update(1, 1, 1)
+end
+
+-- calculate and cache the number of tiles of empty space above the top of the
+-- scrollbar and the number of tiles the scrollbar should occupy to represent
+-- the percentage of text that is on the screen.
+-- if elems_per_page or num_elems are not specified, the last values passed to
+-- Scrollbar:update() are used.
+function Scrollbar:update(top_elem, elems_per_page, num_elems)
+    if not top_elem then error('must specify index of new top element') end
+    elems_per_page = elems_per_page or self.elems_per_page
+    num_elems = num_elems or self.num_elems
+
+    local frame_height = self.frame_body and self.frame_body.height or 3
+    local scrollbar_body_height = frame_height - 2
+    local height = math.max(1, math.floor(
+        (math.min(elems_per_page, num_elems) * scrollbar_body_height) /
+        num_elems))
+
+    local max_pos = scrollbar_body_height - height
+    local pos = math.ceil(((top_elem-1) * max_pos) /
+                          (num_elems - elems_per_page))
+
+    self.top_elem = top_elem
+    self.elems_per_page, self.num_elems = elems_per_page, num_elems
+    self.bar_offset, self.bar_height = pos, height
+end
+
+local UP_ARROW_CHAR = string.char(24)
+local DOWN_ARROW_CHAR = string.char(25)
+local NO_ARROW_CHAR = string.char(32)
+local BAR_CHAR = string.char(7)
+local BAR_BG_CHAR = string.char(179)
+
+function Scrollbar:onRenderBody(dc)
+    -- don't draw if all elements are visible
+    if self.elems_per_page >= self.num_elems then return end
+    -- render up arrow if we're not at the top
+    dc:seek(0, 0):char(
+        self.top_elem == 1 and NO_ARROW_CHAR or UP_ARROW_CHAR, self.fg, self.bg)
+    -- render scrollbar body
+    local starty = self.bar_offset + 1
+    local endy = self.bar_offset + self.bar_height
+    for y=1,dc.height-2 do
+        dc:seek(0, y)
+        if y >= starty and y <= endy then
+            dc:char(BAR_CHAR, self.fg)
+        else
+            dc:char(BAR_BG_CHAR, self.bg)
+        end
+    end
+    -- render down arrow if we're not at the bottom
+    local last_visible_el = self.top_elem + self.elems_per_page - 1
+    dc:seek(0, dc.height-1):char(
+        last_visible_el >= self.num_elems and NO_ARROW_CHAR or DOWN_ARROW_CHAR,
+        self.fg, self.bg)
+end
+
+function Scrollbar:onInput(keys)
+    if not keys._MOUSE_L_DOWN or not self.on_scroll then return false end
+    local _,y = self:getMousePos()
+    if not y then return false end
+    local scroll = nil
+    if y == 0 then scroll = 'up_small'
+    elseif y == self.frame_body.height - 1 then scroll = 'down_small'
+    elseif y <= self.bar_offset then scroll = 'up_large'
+    elseif y > self.bar_offset + self.bar_height then scroll = 'down_large'
+    end
+    if scroll then self.on_scroll(scroll) end
+    return true
+end
+
 -----------
 -- Label --
 -----------
@@ -610,12 +700,6 @@ local function get_scrollbar_pos_and_height(label)
     return pos, height
 end
 
-local UP_ARROW_CHAR = string.char(24)
-local DOWN_ARROW_CHAR = string.char(25)
-local NO_ARROW_CHAR = string.char(32)
-local BAR_CHAR = string.char(7)
-local BAR_BG_CHAR = string.char(179)
-
 function Label:render_scrollbar(dc, x, y1, y2)
     -- render up arrow if we're not at the top
     dc:seek(x, y1):char(
@@ -953,6 +1037,11 @@ List.ATTRS{
 function List:init(info)
     self.page_top = 1
     self.page_size = 1
+    self.scrollbar = Scrollbar{
+        frame={r=0},
+        on_scroll=self:callback('on_scrollbar')}
+
+    self:addviews{self.scrollbar}
 
     if info.choices then
         self:setChoices(info.choices, info.selected)
@@ -1017,13 +1106,17 @@ function List:postComputeFrame(body)
     self:moveCursor(0)
 end
 
+local function update_list_scrollbar(list)
+    self.scrollbar:update(list.page_top, list.page_size, #list.choices)
+end
+
 function List:moveCursor(delta, force_cb)
-    local page = math.max(1, self.page_size)
     local cnt = #self.choices
 
     if cnt < 1 then
         self.page_top = 1
         self.selected = 1
+        update_list_scrollbar(self)
         if force_cb and self.on_select then
             self.on_select(nil,nil)
         end
@@ -1046,14 +1139,40 @@ function List:moveCursor(delta, force_cb)
         end
     end
 
+    local buffer = 1 + math.min(4, math.floor(self.page_size/10))
+
     self.selected = 1 + off % cnt
-    self.page_top = 1 + page * math.floor((self.selected-1) / page)
+    if (self.selected - buffer) < self.page_top then
+        self.page_top = math.max(1, self.selected - buffer)
+    elseif (self.selected + buffer + 1) > (self.page_top + self.page_size) then
+        local max_page_top = cnt - self.page_size + 1
+        self.page_top = math.max(1,
+            math.min(max_page_top, self.selected - self.page_size + buffer + 1))
+    end
+    update_list_scrollbar(self)
 
     if (force_cb or delta ~= 0) and self.on_select then
         self.on_select(self:getSelected())
     end
 end
 
+function List:on_scrollbar(scroll_spec)
+    local v = 0
+    if scroll_spec == 'down_large' then
+        v = math.floor(self.page_size / 2)
+    elseif scroll_spec == 'up_large' then
+        v = -math.floor(self.page_size / 2)
+    elseif scroll_spec == 'down_small' then
+        v = 1
+    elseif scroll_spec == 'up_small' then
+        v = -1
+    end
+
+    local max_page_top = math.max(1, #self.choices - self.page_size + 1)
+    self.page_top = math.max(1, math.min(max_page_top, self.page_top + v))
+    update_list_scrollbar(self)
+end
+
 function List:onRenderBody(dc)
     local choices = self.choices
     local top = self.page_top
@@ -1122,6 +1241,9 @@ function List:submit2()
 end
 
 function List:onInput(keys)
+    if self:inputToSubviews(keys) then
+        return true
+    end
     if self.on_submit and keys.SELECT then
         self:submit()
         return true

From 5722d6914b2ee080890ce44b095806d11b7223d8 Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Fri, 7 Oct 2022 12:45:43 -0700
Subject: [PATCH 741/854] transition Label to use the new generic Scrollbar

---
 docs/Lua API.rst                   |   8 +-
 library/lua/gui/widgets.lua        | 171 ++++++++---------------------
 test/library/gui/widgets.Label.lua |  64 -----------
 3 files changed, 49 insertions(+), 194 deletions(-)

diff --git a/docs/Lua API.rst b/docs/Lua API.rst
index b9c09c673..ddb00c61a 100644
--- a/docs/Lua API.rst	
+++ b/docs/Lua API.rst	
@@ -4084,11 +4084,6 @@ It has the following attributes:
     keys to the number of lines to scroll as positive or negative integers or one of the keywords
     supported by the ``scroll`` method. The default is up/down arrows scrolling by one line and page
     up/down scrolling by one page.
-:show_scrollbar: Controls scrollbar display: ``false`` for no scrollbar, ``'right'`` or ``'left'`` for
-    icons next to the text in an additional column (``frame_inset`` is adjusted to have ``.r`` or ``.l`` greater than ``0``),
-    ``nil`` same as ``'right'`` but changes ``frame_inset`` only if a scroll icon is actually necessary
-    (if ``getTextHeight()`` is greater than ``frame_body.height``). Default is ``nil``.
-:scrollbar: The table of attributes to pass to the `Scrollbar class`_.
 
 The text itself is represented as a complex structure, and passed
 to the object via the ``text`` argument of the constructor, or via
@@ -4181,7 +4176,8 @@ The Label widget implements the following methods:
 
   This method takes the number of lines to scroll as positive or negative
   integers or one of the following keywords: ``+page``, ``-page``,
-  ``+halfpage``, or ``-halfpage``.
+  ``+halfpage``, or ``-halfpage``. It returns the number of lines that were
+  actually scrolled (negative for scrolling up).
 
 WrappedLabel class
 ------------------
diff --git a/library/lua/gui/widgets.lua b/library/lua/gui/widgets.lua
index 20aff7aa4..3ac9d3c8b 100644
--- a/library/lua/gui/widgets.lua
+++ b/library/lua/gui/widgets.lua
@@ -636,12 +636,15 @@ Label.ATTRS{
     on_click = DEFAULT_NIL,
     on_rclick = DEFAULT_NIL,
     scroll_keys = STANDARDSCROLL,
-    show_scrollbar = DEFAULT_NIL, -- DEFAULT_NIL, 'right', 'left', false
-    scrollbar_fg = COLOR_LIGHTGREEN,
-    scrollbar_bg = COLOR_CYAN
 }
 
 function Label:init(args)
+    self.scrollbar = Scrollbar{
+        frame={r=0},
+        on_scroll=self:callback('on_scrollbar')}
+
+    self:addviews{self.scrollbar}
+
     -- use existing saved text if no explicit text was specified. this avoids
     -- overwriting pre-formatted text that subclasses may have already set
     self:setText(args.text or self.text)
@@ -650,6 +653,12 @@ function Label:init(args)
     end
 end
 
+local function update_label_scrollbar(label)
+    local body_height = label.frame_body and label.frame_body.height or 1
+    label.scrollbar:update(label.start_line_num, body_height,
+                           label:getTextHeight())
+end
+
 function Label:setText(text)
     self.start_line_num = 1
     self.text = text
@@ -659,81 +668,8 @@ function Label:setText(text)
         self.frame = self.frame or {}
         self.frame.h = self:getTextHeight()
     end
-end
 
-function Label:update_scroll_inset()
-    if self.show_scrollbar == nil then
-        self._show_scrollbar = self:getTextHeight() > self.frame_body.height and 'right' or false
-    else
-        self._show_scrollbar = self.show_scrollbar
-    end
-    if self._show_scrollbar then
-        -- here self._show_scrollbar can only be either
-        -- 'left' or any true value which we interpret as right
-        local l,t,r,b = gui.parse_inset(self.frame_inset)
-        if self._show_scrollbar == 'left' and l <= 0 then
-            l = 1
-        elseif r <= 0 then
-            r = 1
-        end
-        self.frame_inset = {l=l,t=t,r=r,b=b}
-    end
-end
-
--- the position is the number of tiles of empty space above the top of the
--- scrollbar, and the height is the number of tiles the scrollbar should occupy
--- to represent the percentage of text that is on the screen.
-local function get_scrollbar_pos_and_height(label)
-    local first_visible_line = label.start_line_num
-    local text_height = label:getTextHeight()
-    local last_visible_line = first_visible_line + label.frame_body.height - 1
-    local scrollbar_body_height = label.frame_body.height - 2
-    local displayed_lines = last_visible_line - first_visible_line
-
-    local height = math.floor(((displayed_lines-1) * scrollbar_body_height) /
-                              text_height)
-
-    local max_pos = scrollbar_body_height - height
-    local pos = math.ceil(((first_visible_line-1) * max_pos) /
-                          (text_height - label.frame_body.height))
-
-    return pos, height
-end
-
-function Label:render_scrollbar(dc, x, y1, y2)
-    -- render up arrow if we're not at the top
-    dc:seek(x, y1):char(
-        self.start_line_num == 1 and NO_ARROW_CHAR or UP_ARROW_CHAR,
-        self.scrollbar_fg, self.scrollbar_bg)
-    -- render scrollbar body
-    local pos, height = get_scrollbar_pos_and_height(self)
-    local starty = y1 + pos + 1
-    local endy = y1 + pos + height
-    for y=y1+1,y2-1 do
-        if y >= starty and y <= endy then
-            dc:seek(x, y):char(BAR_CHAR, self.scrollbar_fg)
-        else
-            dc:seek(x, y):char(BAR_BG_CHAR, self.scrollbar_bg)
-        end
-    end
-    -- render down arrow if we're not at the bottom
-    local last_visible_line = self.start_line_num + self.frame_body.height - 1
-    dc:seek(x, y2):char(
-        last_visible_line >= self:getTextHeight() and
-            NO_ARROW_CHAR or DOWN_ARROW_CHAR,
-        self.scrollbar_fg, self.scrollbar_bg)
-end
-
-function Label:computeFrame(parent_rect)
-    local frame_rect,body_rect = Label.super.computeFrame(self, parent_rect)
-
-    self.frame_rect = frame_rect
-    self.frame_body = parent_rect:viewport(body_rect or frame_rect)
-
-    self:update_scroll_inset() -- frame_body is now set
-
-    -- recalc with updated frame_inset
-    return Label.super.computeFrame(self, parent_rect)
+    update_label_scrollbar(self)
 end
 
 function Label:preUpdateLayout()
@@ -743,6 +679,10 @@ function Label:preUpdateLayout()
     end
 end
 
+function Label:postUpdateLayout()
+    update_label_scrollbar(self)
+end
+
 function Label:itemById(id)
     if self.text_ids then
         return self.text_ids[id]
@@ -766,44 +706,19 @@ function Label:onRenderBody(dc)
     render_text(self,dc,0,0,text_pen,self.text_dpen,is_disabled(self))
 end
 
-function Label:onRenderFrame(dc, rect)
-    if self._show_scrollbar then
-        local x = self._show_scrollbar == 'left'
-                and self.frame_body.x1-dc.x1-1
-                or  self.frame_body.x2-dc.x1+1
-        self:render_scrollbar(dc,
-            x,
-            self.frame_body.y1-dc.y1,
-            self.frame_body.y2-dc.y1
-        )
-    end
-end
-
-function Label:click_scrollbar()
-    if not self._show_scrollbar then return end
-    local rect = self.frame_body
-    local x, y = dscreen.getMousePos()
-
-    if self._show_scrollbar == 'left' and x ~= rect.x1-1 or x ~= rect.x2+1 then
-        return
-    end
-    if y < rect.y1 or y > rect.y2 then
-        return
+function Label:on_scrollbar(scroll_spec)
+    local v = 0
+    if scroll_spec == 'down_large' then
+        v = '+halfpage'
+    elseif scroll_spec == 'up_large' then
+        v = '-halfpage'
+    elseif scroll_spec == 'down_small' then
+        v = 1
+    elseif scroll_spec == 'up_small' then
+        v = -1
     end
 
-    if y == rect.y1 then
-        return -1
-    elseif y == rect.y2 then
-        return 1
-    else
-        local pos, height = get_scrollbar_pos_and_height(self)
-        if y <= rect.y1 + pos then
-            return '-halfpage'
-        elseif y > rect.y1 + pos + height then
-            return '+halfpage'
-        end
-    end
-    return nil
+    self:scroll(v)
 end
 
 function Label:scroll(nlines)
@@ -824,24 +739,28 @@ function Label:scroll(nlines)
     local n = self.start_line_num + nlines
     n = math.min(n, self:getTextHeight() - self.frame_body.height + 1)
     n = math.max(n, 1)
+    nlines = n - self.start_line_num
     self.start_line_num = n
+    update_label_scrollbar(self)
     return nlines
 end
 
 function Label:onInput(keys)
     if is_disabled(self) then return false end
-    if keys._MOUSE_L_DOWN then
-        if not self:scroll(self:click_scrollbar()) and
-                self:getMousePos() and self.on_click then
-            self:on_click()
-        end
+    if self:inputToSubviews(keys) then
+        return true
+    end
+    if keys._MOUSE_L_DOWN and self:getMousePos() and self.on_click then
+        self:on_click()
+        return true
     end
     if keys._MOUSE_R_DOWN and self:getMousePos() and self.on_rclick then
         self:on_rclick()
+        return true
     end
     for k,v in pairs(self.scroll_keys) do
-        if keys[k] then
-            self:scroll(v)
+        if keys[k] and 0 ~= self:scroll(v) then
+            return true
         end
     end
     return check_text_keys(self, keys)
@@ -871,7 +790,7 @@ end
 -- we can't set the text in init() since we may not yet have a frame that we
 -- can get wrapping bounds from.
 function WrappedLabel:postComputeFrame()
-    local wrapped_text = self:getWrappedText(self.frame_body.width)
+    local wrapped_text = self:getWrappedText(self.frame_body.width-1)
     if not wrapped_text then return end
     local text = {}
     for _,line in ipairs(wrapped_text:split(NEWLINE)) do
@@ -1107,7 +1026,11 @@ function List:postComputeFrame(body)
 end
 
 local function update_list_scrollbar(list)
-    self.scrollbar:update(list.page_top, list.page_size, #list.choices)
+    list.scrollbar:update(list.page_top, list.page_size, #list.choices)
+end
+
+function List:postUpdateLayout()
+    update_list_scrollbar(self)
 end
 
 function List:moveCursor(delta, force_cb)
@@ -1159,9 +1082,9 @@ end
 function List:on_scrollbar(scroll_spec)
     local v = 0
     if scroll_spec == 'down_large' then
-        v = math.floor(self.page_size / 2)
+        v = math.ceil(self.page_size / 2)
     elseif scroll_spec == 'up_large' then
-        v = -math.floor(self.page_size / 2)
+        v = -math.ceil(self.page_size / 2)
     elseif scroll_spec == 'down_small' then
         v = 1
     elseif scroll_spec == 'up_small' then
diff --git a/test/library/gui/widgets.Label.lua b/test/library/gui/widgets.Label.lua
index c43b5e886..4693d3d0d 100644
--- a/test/library/gui/widgets.Label.lua
+++ b/test/library/gui/widgets.Label.lua
@@ -11,70 +11,6 @@ fs.ATTRS = {
     focus_path = 'test-framed-screen',
 }
 
-function test.correct_frame_body_with_scroll_icons()
-    local t = {}
-    for i = 1, 12 do
-        t[#t+1] = tostring(i)
-        t[#t+1] = NEWLINE
-    end
-
-    function fs:init()
-        self:addviews{
-            widgets.Label{
-                view_id = 'text',
-                frame_inset = 0,
-                text = t,
-            },
-        }
-    end
-
-    local o = fs{}
-    expect.eq(o.subviews.text.frame_body.width, 9, "Label's frame_body.x2 and .width should be one smaller because of show_scrollbar.")
-end
-
-function test.correct_frame_body_with_few_text_lines()
-    local t = {}
-    for i = 1, 10 do
-        t[#t+1] = tostring(i)
-        t[#t+1] = NEWLINE
-    end
-
-    function fs:init()
-        self:addviews{
-            widgets.Label{
-                view_id = 'text',
-                frame_inset = 0,
-                text = t,
-            },
-        }
-    end
-
-    local o = fs{}
-    expect.eq(o.subviews.text.frame_body.width, 10, "Label's frame_body.x2 and .width should not change with show_scrollbar = false.")
-end
-
-function test.correct_frame_body_without_show_scrollbar()
-    local t = {}
-    for i = 1, 12 do
-        t[#t+1] = tostring(i)
-        t[#t+1] = NEWLINE
-    end
-
-    function fs:init()
-        self:addviews{
-            widgets.Label{
-                view_id = 'text',
-                frame_inset = 0,
-                text = t,
-                show_scrollbar = false,
-            },
-        }
-    end
-
-    local o = fs{}
-    expect.eq(o.subviews.text.frame_body.width, 10, "Label's frame_body.x2 and .width should not change with show_scrollbar = false.")
-end
-
 function test.scroll()
     local t = {}
     for i = 1, 12 do

From 2bff70a2905c211133e2150885f43aed47ffbc78 Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Fri, 7 Oct 2022 13:14:52 -0700
Subject: [PATCH 742/854] add unit tests for widgets.Scrollbar

---
 library/lua/gui/widgets.lua            |  5 +-
 test/library/gui/widgets.Scrollbar.lua | 93 ++++++++++++++++++++++++++
 2 files changed, 96 insertions(+), 2 deletions(-)
 create mode 100644 test/library/gui/widgets.Scrollbar.lua

diff --git a/library/lua/gui/widgets.lua b/library/lua/gui/widgets.lua
index 3ac9d3c8b..2eaf80577 100644
--- a/library/lua/gui/widgets.lua
+++ b/library/lua/gui/widgets.lua
@@ -397,8 +397,9 @@ function Scrollbar:update(top_elem, elems_per_page, num_elems)
         num_elems))
 
     local max_pos = scrollbar_body_height - height
-    local pos = math.ceil(((top_elem-1) * max_pos) /
-                          (num_elems - elems_per_page))
+    local pos = (num_elems == elems_per_page) and 0 or
+            math.ceil(((top_elem-1) * max_pos) /
+                      (num_elems - elems_per_page))
 
     self.top_elem = top_elem
     self.elems_per_page, self.num_elems = elems_per_page, num_elems
diff --git a/test/library/gui/widgets.Scrollbar.lua b/test/library/gui/widgets.Scrollbar.lua
new file mode 100644
index 000000000..dbe033ba4
--- /dev/null
+++ b/test/library/gui/widgets.Scrollbar.lua
@@ -0,0 +1,93 @@
+local gui = require('gui')
+local widgets = require('gui.widgets')
+
+function test.update()
+    local s = widgets.Scrollbar{}
+    s.frame_body = {height=100} -- give us some space to work with
+
+    -- initial defaults
+    expect.eq(1, s.top_elem)
+    expect.eq(1, s.elems_per_page)
+    expect.eq(1, s.num_elems)
+    expect.eq(0, s.bar_offset)
+    expect.eq(1, s.bar_height)
+
+    -- top_elem, elems_per_page, num_elems
+    s:update(1, 10, 0)
+    expect.eq(1, s.top_elem)
+    expect.eq(10, s.elems_per_page)
+    expect.eq(0, s.num_elems)
+    expect.eq(0, s.bar_offset)
+    expect.eq(1, s.bar_height)
+
+    -- first 10 of 50 shown
+    s:update(1, 10, 50)
+    expect.eq(1, s.top_elem)
+    expect.eq(10, s.elems_per_page)
+    expect.eq(50, s.num_elems)
+    expect.eq(0, s.bar_offset)
+    expect.eq(19, s.bar_height)
+
+    -- bottom 10 of 50 shown
+    s:update(41, 10, 50)
+    expect.eq(41, s.top_elem)
+    expect.eq(10, s.elems_per_page)
+    expect.eq(50, s.num_elems)
+    expect.eq(79, s.bar_offset)
+    expect.eq(19, s.bar_height)
+
+    -- ~middle 10 of 50 shown
+    s:update(23, 10, 50)
+    expect.eq(23, s.top_elem)
+    expect.eq(10, s.elems_per_page)
+    expect.eq(50, s.num_elems)
+    expect.eq(44, s.bar_offset)
+    expect.eq(19, s.bar_height)
+end
+
+function test.onInput()
+    local spec = nil
+    local mock_on_scroll = function(scroll_spec) spec = scroll_spec end
+    local s = widgets.Scrollbar{on_scroll=mock_on_scroll}
+    s.frame_body = {height=100} -- give us some space to work with
+    local y = nil
+    s.getMousePos = function() return 0, y end
+
+    -- put scrollbar somewhere in the middle so we can click above and below it
+    s:update(23, 10, 50)
+
+    expect.false_(s:onInput{}, 'no mouse down')
+    expect.false_(s:onInput{_MOUSE_L_DOWN=true}, 'no y coord')
+
+    spec, y = nil, 0
+    expect.true_(s:onInput{_MOUSE_L_DOWN=true})
+    expect.eq('up_small', spec, 'on up arrow')
+
+    spec, y = nil, 1
+    expect.true_(s:onInput{_MOUSE_L_DOWN=true})
+    expect.eq('up_large', spec, 'on body above bar')
+
+    spec, y = nil, 44
+    expect.true_(s:onInput{_MOUSE_L_DOWN=true})
+    expect.eq('up_large', spec, 'on body just above bar')
+
+    spec, y = nil, 45
+    expect.true_(s:onInput{_MOUSE_L_DOWN=true})
+    expect.nil_(spec, 'on top of bar')
+
+    spec, y = nil, 63
+    expect.true_(s:onInput{_MOUSE_L_DOWN=true})
+    expect.nil_(spec, 'on bottom of bar')
+
+    spec, y = nil, 64
+    expect.true_(s:onInput{_MOUSE_L_DOWN=true})
+    expect.eq('down_large', spec, 'on body just below bar')
+
+    spec, y = nil, 98
+    expect.true_(s:onInput{_MOUSE_L_DOWN=true})
+    expect.eq('down_large', spec, 'on body below bar')
+
+    spec, y = nil, 99
+    expect.true_(s:onInput{_MOUSE_L_DOWN=true})
+    expect.eq('down_small', spec, 'on down arrow')
+end

From 35eb4e08dd53133abc14fdb189bfc9dd8fa848b7 Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Fri, 7 Oct 2022 15:40:05 -0700
Subject: [PATCH 743/854] hold down the mouse button to continue scrolling

---
 docs/Lua API.rst            | 12 +++++++++++
 docs/changelog.txt          |  1 +
 library/lua/gui/widgets.lua | 41 ++++++++++++++++++++++++++++++-------
 3 files changed, 47 insertions(+), 7 deletions(-)

diff --git a/docs/Lua API.rst b/docs/Lua API.rst
index ddb00c61a..8960cb15c 100644
--- a/docs/Lua API.rst	
+++ b/docs/Lua API.rst	
@@ -4064,6 +4064,18 @@ direction. The amount of scrolling done in each case in determined by the
 associated widget, and after scrolling is complete, the associated widget must
 call ``scrollbar:update()`` with updated new display info.
 
+You can hold down the mouse button to scroll multiple times, just like in a
+normal browser scrollbar. The speed of scroll events when the mouse button is
+held down is controlled by two global variables:
+
+:``SCROLL_INITIAL_DELAY_MS``: The delay before the second scroll event.
+:``SCROLL_DELAY_MS``: The delay between further scroll events.
+
+The defaults are 300 and 20, respectively, but they can be overridden by the
+user in their :file:`dfhack-config/init/dfhack.init` file, for example::
+
+  :lua require('gui.widgets').SCROLL_DELAY_MS = 100
+
 Label class
 -----------
 
diff --git a/docs/changelog.txt b/docs/changelog.txt
index b1d5300a9..1669ea9dd 100644
--- a/docs/changelog.txt
+++ b/docs/changelog.txt
@@ -42,6 +42,7 @@ changelog.txt uses a syntax similar to RST, with a few special sequences:
 - `ls`: new ``--exclude`` option for hiding matched scripts from the output.  this can be especially useful for modders who don't want their mod scripts to be included in ``ls`` output.
 - `digtype`: new ``-z`` option for digtype to restrict designations to the current z-level and down
 - UX: List widgets now have mouse-interactive scrollbars
+- UX: You can now hold down the mouse button on a scrollbar to make it scroll multiple times.
 
 ## Documentation
 
diff --git a/library/lua/gui/widgets.lua b/library/lua/gui/widgets.lua
index 2eaf80577..e5b7e9bfd 100644
--- a/library/lua/gui/widgets.lua
+++ b/library/lua/gui/widgets.lua
@@ -363,6 +363,11 @@ end
 -- Scrollbar --
 ---------------
 
+-- these can be overridden by the user, e.g.:
+--   require('gui.widgets').SCROLL_DELAY_MS = 100
+SCROLL_INITIAL_DELAY_MS = 300
+SCROLL_DELAY_MS = 20
+
 Scrollbar = defclass(Scrollbar, Widget)
 
 Scrollbar.ATTRS{
@@ -377,6 +382,9 @@ function Scrollbar:preinit(init_table)
 end
 
 function Scrollbar:init()
+    self.last_scroll_ms = 0
+    self.is_first_click = false
+    self.scroll_spec = nil
     self:update(1, 1, 1)
 end
 
@@ -434,19 +442,38 @@ function Scrollbar:onRenderBody(dc)
     dc:seek(0, dc.height-1):char(
         last_visible_el >= self.num_elems and NO_ARROW_CHAR or DOWN_ARROW_CHAR,
         self.fg, self.bg)
+    -- manage state for continuous scrolling
+    if self.last_scroll_ms == 0 or not self.on_scroll then return end
+    if df.global.enabler.mouse_lbut_down == 0 then
+        self.last_scroll_ms = 0
+        self.scroll_spec = nil
+        return
+    end
+    local now = dfhack.getTickCount()
+    local delay = self.is_first_click and
+            SCROLL_INITIAL_DELAY_MS or SCROLL_DELAY_MS
+    if now - self.last_scroll_ms >= delay then
+        self.is_first_click = false
+        self.on_scroll(self.scroll_spec)
+        self.last_scroll_ms = now
+    end
 end
 
 function Scrollbar:onInput(keys)
     if not keys._MOUSE_L_DOWN or not self.on_scroll then return false end
     local _,y = self:getMousePos()
     if not y then return false end
-    local scroll = nil
-    if y == 0 then scroll = 'up_small'
-    elseif y == self.frame_body.height - 1 then scroll = 'down_small'
-    elseif y <= self.bar_offset then scroll = 'up_large'
-    elseif y > self.bar_offset + self.bar_height then scroll = 'down_large'
-    end
-    if scroll then self.on_scroll(scroll) end
+    local scroll_spec = nil
+    if y == 0 then scroll_spec = 'up_small'
+    elseif y == self.frame_body.height - 1 then scroll_spec = 'down_small'
+    elseif y <= self.bar_offset then scroll_spec = 'up_large'
+    elseif y > self.bar_offset + self.bar_height then scroll_spec = 'down_large'
+    end
+    self.scroll_spec = scroll_spec
+    if scroll_spec then self.on_scroll(scroll_spec) end
+    -- reset continuous scroll state
+    self.is_first_click = true
+    self.last_scroll_ms = dfhack.getTickCount()
     return true
 end
 

From ba36e72b3328e3cb00aebe6590d96f66234896ec Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Fri, 7 Oct 2022 16:27:19 -0700
Subject: [PATCH 744/854] support click and drag for scrollbars

---
 docs/changelog.txt          |  1 +
 library/lua/gui/widgets.lua | 31 ++++++++++++++++++++++++++++---
 2 files changed, 29 insertions(+), 3 deletions(-)

diff --git a/docs/changelog.txt b/docs/changelog.txt
index 1669ea9dd..f9b7accc5 100644
--- a/docs/changelog.txt
+++ b/docs/changelog.txt
@@ -43,6 +43,7 @@ changelog.txt uses a syntax similar to RST, with a few special sequences:
 - `digtype`: new ``-z`` option for digtype to restrict designations to the current z-level and down
 - UX: List widgets now have mouse-interactive scrollbars
 - UX: You can now hold down the mouse button on a scrollbar to make it scroll multiple times.
+- UX: You can now drag the scrollbar to scroll to a specific spot
 
 ## Documentation
 
diff --git a/library/lua/gui/widgets.lua b/library/lua/gui/widgets.lua
index e5b7e9bfd..f63b708cf 100644
--- a/library/lua/gui/widgets.lua
+++ b/library/lua/gui/widgets.lua
@@ -385,6 +385,7 @@ function Scrollbar:init()
     self.last_scroll_ms = 0
     self.is_first_click = false
     self.scroll_spec = nil
+    self.is_dragging = false -- index of the scrollbar tile that we're dragging
     self:update(1, 1, 1)
 end
 
@@ -414,6 +415,22 @@ function Scrollbar:update(top_elem, elems_per_page, num_elems)
     self.bar_offset, self.bar_height = pos, height
 end
 
+local function scrollbar_do_drag(scrollbar)
+    local x,y = dfhack.screen.getMousePos()
+    x,y = scrollbar.frame_body:localXY(x,y)
+    local bar_idx = y - scrollbar.bar_offset
+    local delta = bar_idx - scrollbar.is_dragging
+    if delta < -2 then
+        scrollbar.on_scroll('up_large')
+    elseif delta < 0 then
+        scrollbar.on_scroll('up_small')
+    elseif delta > 2 then
+        scrollbar.on_scroll('down_large')
+    elseif delta > 0 then
+        scrollbar.on_scroll('down_small')
+    end
+end
+
 local UP_ARROW_CHAR = string.char(24)
 local DOWN_ARROW_CHAR = string.char(25)
 local NO_ARROW_CHAR = string.char(32)
@@ -442,13 +459,18 @@ function Scrollbar:onRenderBody(dc)
     dc:seek(0, dc.height-1):char(
         last_visible_el >= self.num_elems and NO_ARROW_CHAR or DOWN_ARROW_CHAR,
         self.fg, self.bg)
-    -- manage state for continuous scrolling
-    if self.last_scroll_ms == 0 or not self.on_scroll then return end
+    if not self.on_scroll then return end
+    -- manage state for dragging and continuous scrolling
+    if self.is_dragging then
+        scrollbar_do_drag(self)
+    end
     if df.global.enabler.mouse_lbut_down == 0 then
         self.last_scroll_ms = 0
+        self.is_dragging = false
         self.scroll_spec = nil
         return
     end
+    if self.last_scroll_ms == 0 then return end
     local now = dfhack.getTickCount()
     local delay = self.is_first_click and
             SCROLL_INITIAL_DELAY_MS or SCROLL_DELAY_MS
@@ -468,9 +490,12 @@ function Scrollbar:onInput(keys)
     elseif y == self.frame_body.height - 1 then scroll_spec = 'down_small'
     elseif y <= self.bar_offset then scroll_spec = 'up_large'
     elseif y > self.bar_offset + self.bar_height then scroll_spec = 'down_large'
+    else
+        self.is_dragging = y - self.bar_offset
+        return true
     end
     self.scroll_spec = scroll_spec
-    if scroll_spec then self.on_scroll(scroll_spec) end
+    self.on_scroll(scroll_spec)
     -- reset continuous scroll state
     self.is_first_click = true
     self.last_scroll_ms = dfhack.getTickCount()

From 31efd4177f05f328c108c127acf74d0977227231 Mon Sep 17 00:00:00 2001
From: DFHack-Urist via GitHub Actions
 <63161697+DFHack-Urist@users.noreply.github.com>
Date: Fri, 7 Oct 2022 23:33:28 +0000
Subject: [PATCH 745/854] Auto-update submodules

scripts: master
---
 scripts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts b/scripts
index 41bfa9005..f38299b76 160000
--- a/scripts
+++ b/scripts
@@ -1 +1 @@
-Subproject commit 41bfa9005ec78094388518d40e7aaa43f7d35890
+Subproject commit f38299b764f3947a2ebf2bc112b82467bd47b19b

From 9a0f9f210b2e2604c8fe7739350af1bbafd1d7c4 Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Fri, 7 Oct 2022 16:38:44 -0700
Subject: [PATCH 746/854] update docs for clicking and dragging scrollbars

---
 docs/Lua API.rst | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/docs/Lua API.rst b/docs/Lua API.rst
index 8960cb15c..c2b84f0f0 100644
--- a/docs/Lua API.rst	
+++ b/docs/Lua API.rst	
@@ -4064,9 +4064,11 @@ direction. The amount of scrolling done in each case in determined by the
 associated widget, and after scrolling is complete, the associated widget must
 call ``scrollbar:update()`` with updated new display info.
 
-You can hold down the mouse button to scroll multiple times, just like in a
-normal browser scrollbar. The speed of scroll events when the mouse button is
-held down is controlled by two global variables:
+You can click and drag the scrollbar to scroll to a specific spot, or you can
+click and hold on the end arrows or in the unfilled portion of the scrollbar to
+scroll multiple times, just like in a normal browser scrollbar. The speed of
+scroll events when the mouse button is held down is controlled by two global
+variables:
 
 :``SCROLL_INITIAL_DELAY_MS``: The delay before the second scroll event.
 :``SCROLL_DELAY_MS``: The delay between further scroll events.

From 0dad512b5a1fcd40d93539260602fb3caf309955 Mon Sep 17 00:00:00 2001
From: DFHack-Urist via GitHub Actions
 <63161697+DFHack-Urist@users.noreply.github.com>
Date: Sat, 8 Oct 2022 07:22:44 +0000
Subject: [PATCH 747/854] Auto-update submodules

scripts: master
---
 scripts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts b/scripts
index f38299b76..3c27569e6 160000
--- a/scripts
+++ b/scripts
@@ -1 +1 @@
-Subproject commit f38299b764f3947a2ebf2bc112b82467bd47b19b
+Subproject commit 3c27569e6834151abe4586dc0437d4efad3c7dcd

From d650ba23777726899b56e2a4ebc29c790a56de5b Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Mon, 10 Oct 2022 16:42:32 -0700
Subject: [PATCH 748/854] ensure scrollbar can never get ahead of the cursor

---
 library/lua/gui/widgets.lua | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/library/lua/gui/widgets.lua b/library/lua/gui/widgets.lua
index f63b708cf..eb8d92244 100644
--- a/library/lua/gui/widgets.lua
+++ b/library/lua/gui/widgets.lua
@@ -420,11 +420,11 @@ local function scrollbar_do_drag(scrollbar)
     x,y = scrollbar.frame_body:localXY(x,y)
     local bar_idx = y - scrollbar.bar_offset
     local delta = bar_idx - scrollbar.is_dragging
-    if delta < -2 then
+    if delta < -scrollbar.bar_height then
         scrollbar.on_scroll('up_large')
     elseif delta < 0 then
         scrollbar.on_scroll('up_small')
-    elseif delta > 2 then
+    elseif delta > scrollbar.bar_height then
         scrollbar.on_scroll('down_large')
     elseif delta > 0 then
         scrollbar.on_scroll('down_small')

From cc61d4a82aad31277c7ba663644357d8e88bdc69 Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Mon, 10 Oct 2022 17:03:57 -0700
Subject: [PATCH 749/854] use rendered help instead of hard-coded

---
 plugins/blueprint.cpp     | 37 ++++++++++++-------------------------
 plugins/lua/blueprint.lua | 31 -------------------------------
 2 files changed, 12 insertions(+), 56 deletions(-)

diff --git a/plugins/blueprint.cpp b/plugins/blueprint.cpp
index 3a0cb60b4..7919c4c5c 100644
--- a/plugins/blueprint.cpp
+++ b/plugins/blueprint.cpp
@@ -1187,23 +1187,11 @@ static bool get_options(color_ostream &out,
     return true;
 }
 
-static void print_help(color_ostream &out) {
-    auto L = Lua::Core::State;
-    Lua::StackUnwinder top(L);
-
-    if (!lua_checkstack(L, 1) ||
-        !Lua::PushModulePublic(out, L, "plugins.blueprint", "print_help") ||
-        !Lua::SafeCall(out, L, 0, 0))
-    {
-        out.printerr("Failed to load blueprint Lua code\n");
-    }
-}
-
 // returns whether blueprint generation was successful. populates files with the
 // names of the files that were generated
-static bool do_blueprint(color_ostream &out,
-                         const vector<string> &parameters,
-                         vector<string> &files) {
+static command_result do_blueprint(color_ostream &out,
+                                   const vector<string> &parameters,
+                                   vector<string> &files) {
     CoreSuspender suspend;
 
     if (parameters.size() >= 1 && parameters[0] == "gui") {
@@ -1221,13 +1209,12 @@ static bool do_blueprint(color_ostream &out,
 
     blueprint_options options;
     if (!get_options(out, options, parameters) || options.help) {
-        print_help(out);
-        return options.help;
+        return CR_WRONG_USAGE;
     }
 
     if (!Maps::IsValid()) {
         out.printerr("Map is not available!\n");
-        return false;
+        return CR_FAILURE;
     }
 
     // start coordinates can come from either the commandline or the map cursor
@@ -1236,13 +1223,13 @@ static bool do_blueprint(color_ostream &out,
         if (!Gui::getCursorCoords(start)) {
             out.printerr("Can't get cursor coords! Make sure you specify the"
                     " --cursor parameter or have an active cursor in DF.\n");
-            return false;
+            return CR_FAILURE;
         }
     }
     if (!Maps::isValidTilePos(start)) {
         out.printerr("Invalid start position: %d,%d,%d\n",
                      start.x, start.y, start.z);
-        return false;
+        return CR_FAILURE;
     }
 
     // end coords are one beyond the last processed coordinate. note that
@@ -1265,7 +1252,7 @@ static bool do_blueprint(color_ostream &out,
 
     bool ok = do_transform(out, start, end, options, files);
     cache(NULL);
-    return ok;
+    return ok ? CR_OK : CR_FAILURE;
 }
 
 // entrypoint when called from Lua. returns the names of the generated files
@@ -1284,7 +1271,7 @@ static int run(lua_State *L) {
     color_ostream *out = Lua::GetOutput(L);
     if (!out)
         out = &Core::getInstance().getConsole();
-    if (do_blueprint(*out, argv, files)) {
+    if (CR_OK == do_blueprint(*out, argv, files)) {
         Lua::PushVector(L, files);
         return 1;
     }
@@ -1294,13 +1281,13 @@ static int run(lua_State *L) {
 
 command_result blueprint(color_ostream &out, vector<string> &parameters) {
     vector<string> files;
-    if (do_blueprint(out, parameters, files)) {
+    command_result cr = do_blueprint(out, parameters, files);
+    if (cr == CR_OK) {
         out.print("Generated blueprint file(s):\n");
         for (string &fname : files)
             out.print("  %s\n", fname.c_str());
-        return CR_OK;
     }
-    return CR_FAILURE;
+    return cr;
 }
 
 DFHACK_PLUGIN_LUA_COMMANDS {
diff --git a/plugins/lua/blueprint.lua b/plugins/lua/blueprint.lua
index 7b0076e14..4cc866650 100644
--- a/plugins/lua/blueprint.lua
+++ b/plugins/lua/blueprint.lua
@@ -3,37 +3,6 @@ local _ENV = mkmodule('plugins.blueprint')
 local argparse = require('argparse')
 local utils = require('utils')
 
--- the info here is very basic and minimal, so hopefully we won't need to change
--- it when features are added and the full blueprint docs in Plugins.rst are
--- updated.
-local help_text = [=[
-
-blueprint
-=========
-
-Records the structure of a portion of your fortress in quickfort blueprints.
-
-Usage:
-
-    blueprint <width> <height> [<depth>] [<name> [<phases>]] [<options>]
-    blueprint gui [<name> [<phases>]] [<options>]
-
-Examples:
-
-blueprint gui
-    Runs gui/blueprint, the interactive blueprint frontend, where all
-    configuration can be set visually and interactively.
-
-blueprint 30 40 bedrooms
-    Generates blueprints for an area 30 tiles wide by 40 tiles tall, starting
-    from the active cursor on the current z-level. Output files are written to
-    the "blueprints" directory.
-
-See the online DFHack documentation for more examples and details.
-]=]
-
-function print_help() print(help_text) end
-
 local valid_phase_list = {
     'dig',
     'carve',

From 8f024216b833301706685dc0954f0ad90ca7fc63 Mon Sep 17 00:00:00 2001
From: DFHack-Urist via GitHub Actions
 <63161697+DFHack-Urist@users.noreply.github.com>
Date: Tue, 11 Oct 2022 07:40:53 +0000
Subject: [PATCH 750/854] Auto-update submodules

scripts: master
---
 scripts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts b/scripts
index 3c27569e6..937cf27f9 160000
--- a/scripts
+++ b/scripts
@@ -1 +1 @@
-Subproject commit 3c27569e6834151abe4586dc0437d4efad3c7dcd
+Subproject commit 937cf27f9b41301be6df0fe1d75d77b6f089f688

From 598f2c4b120d53b79dbd376b806120ede4bdf15d Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Wed, 12 Oct 2022 10:10:53 -0700
Subject: [PATCH 751/854] support --smooth option for blueprints

---
 docs/plugins/blueprint.rst |  4 ++++
 plugins/blueprint.cpp      | 37 ++++++++++++++++++++++++++++++++++---
 plugins/lua/blueprint.lua  |  1 +
 test/plugins/blueprint.lua |  6 ++++++
 4 files changed, 45 insertions(+), 3 deletions(-)

diff --git a/docs/plugins/blueprint.rst b/docs/plugins/blueprint.rst
index 9d7d7ef8d..b999c0e99 100644
--- a/docs/plugins/blueprint.rst
+++ b/docs/plugins/blueprint.rst
@@ -103,6 +103,10 @@ Options
     to surround the parameter string in double quotes:
     ``"-s10,10,central stairs"`` or ``--playback-start "10,10,central stairs"``
     or ``"--playback-start=10,10,central stairs"``.
+``--smooth``
+    Record all smooth tiles in the ``smooth`` phase. If this parameter is not
+    specified, only tiles that will later be carved into fortifications or
+    engraved will be smoothed.
 ``-t``, ``--splitby <strategy>``
     Split blueprints into multiple files. See the `Splitting output into
     multiple files`_ section below for details. If not specified, defaults to
diff --git a/plugins/blueprint.cpp b/plugins/blueprint.cpp
index 7919c4c5c..20aa1aa99 100644
--- a/plugins/blueprint.cpp
+++ b/plugins/blueprint.cpp
@@ -76,6 +76,8 @@ struct blueprint_options {
     // base name to use for generated files
     string name;
 
+    // whether to capture all smoothed tiles
+    bool smooth = false;
     // whether to capture engravings and smooth the tiles that will be engraved
     bool engrave = false;
 
@@ -103,6 +105,7 @@ static const struct_field_info blueprint_options_fields[] = {
     { struct_field_info::PRIMITIVE, "height",                 offsetof(blueprint_options, height),                &df::identity_traits<int32_t>::identity, 0, 0 },
     { struct_field_info::PRIMITIVE, "depth",                  offsetof(blueprint_options, depth),                 &df::identity_traits<int32_t>::identity, 0, 0 },
     { struct_field_info::PRIMITIVE, "name",                   offsetof(blueprint_options, name),                   df::identity_traits<string>::get(),     0, 0 },
+    { struct_field_info::PRIMITIVE, "smooth",                 offsetof(blueprint_options, smooth),                &df::identity_traits<bool>::identity,    0, 0 },
     { struct_field_info::PRIMITIVE, "engrave",                offsetof(blueprint_options, engrave),               &df::identity_traits<bool>::identity,    0, 0 },
     { struct_field_info::PRIMITIVE, "auto_phase",             offsetof(blueprint_options, auto_phase),            &df::identity_traits<bool>::identity,    0, 0 },
     { struct_field_info::PRIMITIVE, "dig",                    offsetof(blueprint_options, dig),                   &df::identity_traits<bool>::identity,    0, 0 },
@@ -219,8 +222,8 @@ static const char * get_tile_smooth_minimal(const df::coord &pos,
     return NULL;
 }
 
-static const char * get_tile_smooth(const df::coord &pos,
-                                    const tile_context &tc) {
+static const char * get_tile_smooth_with_engravings(const df::coord &pos,
+                                                    const tile_context &tc) {
     const char * smooth_minimal = get_tile_smooth_minimal(pos, tc);
     if (smooth_minimal)
         return smooth_minimal;
@@ -244,6 +247,30 @@ static const char * get_tile_smooth(const df::coord &pos,
     return NULL;
 }
 
+static const char * get_tile_smooth_all(const df::coord &pos,
+                                        const tile_context &tc) {
+    const char * smooth_minimal = get_tile_smooth_minimal(pos, tc);
+    if (smooth_minimal)
+        return smooth_minimal;
+
+    df::tiletype *tt = Maps::getTileType(pos);
+    if (!tt)
+        return NULL;
+
+    switch (tileShape(*tt))
+    {
+    case tiletype_shape::FLOOR:
+    case tiletype_shape::WALL:
+        if (tileSpecial(*tt) == tiletype_special::SMOOTH)
+            return "s";
+        break;
+    default:
+        break;
+    }
+
+    return NULL;
+}
+
 static const char * get_track_str(const char *prefix, df::tiletype tt) {
     TileDirection tdir = tileDirection(tt);
 
@@ -1096,9 +1123,13 @@ static bool do_transform(color_ostream &out,
 
     vector<blueprint_processor> processors;
 
+    get_tile_fn* smooth_get_tile_fn = get_tile_smooth_minimal;
+    if (opts.engrave) smooth_get_tile_fn = get_tile_smooth_with_engravings;
+    if (opts.smooth) smooth_get_tile_fn = get_tile_smooth_all;
+
     add_processor(processors, opts, "dig", "dig", opts.dig, get_tile_dig);
     add_processor(processors, opts, "dig", "smooth", opts.carve,
-                  opts.engrave ? get_tile_smooth : get_tile_smooth_minimal);
+                  smooth_get_tile_fn);
     add_processor(processors, opts, "dig", "carve", opts.carve,
                   opts.engrave ? get_tile_carve : get_tile_carve_minimal);
     add_processor(processors, opts, "build", "build", opts.build,
diff --git a/plugins/lua/blueprint.lua b/plugins/lua/blueprint.lua
index 4cc866650..5c73be7c0 100644
--- a/plugins/lua/blueprint.lua
+++ b/plugins/lua/blueprint.lua
@@ -123,6 +123,7 @@ local function process_args(opts, args)
             {'h', 'help', handler=function() opts.help = true end},
             {'s', 'playback-start', hasArg=true,
              handler=function(optarg) parse_start(opts, optarg) end},
+            {nil, 'smooth', handler=function() opts.smooth = true end},
             {'t', 'splitby', hasArg=true,
              handler=function(optarg) parse_split_strategy(opts, optarg) end},
         })
diff --git a/test/plugins/blueprint.lua b/test/plugins/blueprint.lua
index 27a2634b4..a19d519b8 100644
--- a/test/plugins/blueprint.lua
+++ b/test/plugins/blueprint.lua
@@ -35,6 +35,12 @@ function test.parse_gui_commandline()
                      name='blueprint', engrave=true,},
                     opts)
 
+    opts = {}
+    b.parse_gui_commandline(opts, {'--smooth'})
+    expect.table_eq({auto_phase=true, format='minimal', split_strategy='none',
+                     name='blueprint', smooth=true,},
+                    opts)
+
     opts = {}
     b.parse_gui_commandline(opts, {'--engrave'})
     expect.table_eq({auto_phase=true, format='minimal', split_strategy='none',

From a49538695d8a239ea31ae1299e9e15a65b7487fb Mon Sep 17 00:00:00 2001
From: Josh Cooper <cooper.s.josh@outlook.com>
Date: Wed, 12 Oct 2022 11:21:59 -0700
Subject: [PATCH 752/854] Ensures consistent formatting and improves some
 comments

---
 plugins/spectate.cpp | 52 +++++++++++++++++++++++---------------------
 1 file changed, 27 insertions(+), 25 deletions(-)

diff --git a/plugins/spectate.cpp b/plugins/spectate.cpp
index b0bd190d9..2cf23df1d 100644
--- a/plugins/spectate.cpp
+++ b/plugins/spectate.cpp
@@ -147,7 +147,7 @@ DFhackCExport command_result plugin_onupdate(color_ostream &out) {
         if (unpause_enabled) {
             // player asked for auto-unpause enabled
             World::SaveAnnouncementSettings();
-            if (World::DisableAnnouncementPausing()){
+            if (World::DisableAnnouncementPausing()) {
                 // now that we've got what we want, we can lock it down
                 lock_collision = false;
                 pause_lock->lock();
@@ -163,25 +163,25 @@ DFhackCExport command_result plugin_onupdate(color_ostream &out) {
         Gui::getCurViewscreen(true)->feed_key(interface_key::CLOSE_MEGA_ANNOUNCEMENT);
     }
     if (disengage_enabled) {
-        if (our_dorf && our_dorf->id != df::global::ui->follow_unit){
+        if (our_dorf && our_dorf->id != df::global::ui->follow_unit) {
             plugin_enable(out, false);
         }
     }
     return DFHack::CR_OK;
 }
 
-void enable_auto_unpause(color_ostream &out, bool state){
-    if(unpause_enabled != state && lock_collision) {
-        // when enabled, lock collision means announcements haven't been disabled
-        // when disabled, lock collision means announcement are still disabled
-        // the only state left to consider here is what the lock should be set to
+void enable_auto_unpause(color_ostream &out, bool state) {
+    // lock_collision == true means: enable_auto_unpause() was already invoked and didn't complete
+    // The onupdate function above ensure the procedure properly completes, thus we only care about
+    // state reversal here ergo `enabled != state`
+    if (lock_collision && unpause_enabled != state) {
+        // if unpaused_enabled is true, then a lock collision means: we couldn't save/disable the pause settings,
+        // therefore nothing to revert and the lock won't even be engaged (nothing to unlock)
         lock_collision = false;
         unpause_enabled = state;
         if (unpause_enabled) {
+            // a collision means we couldn't restore the pause settings, therefore we only need re-engage the lock
             pause_lock->lock();
-        } else {
-            // this one should be redundant, the lock should already be unlocked right now
-            pause_lock->unlock();
         }
         return;
     }
@@ -201,37 +201,39 @@ void enable_auto_unpause(color_ostream &out, bool state){
             lock_collision = true;
         }
     }
-    if (lock_collision){
-        out.printerr("auto-unpause: must wait for another Pausing::AnnouncementLock to be lifted. This setting will complete when the lock lifts.\n");
+    if (lock_collision) {
+        out.printerr(
+                "auto-unpause: must wait for another Pausing::AnnouncementLock to be lifted."
+                " This setting will complete when the lock lifts.\n");
     }
 }
 
 command_result spectate (color_ostream &out, std::vector <std::string> & parameters) {
-    if(!parameters.empty()) {
+    if (!parameters.empty()) {
         if (parameters.size() % 2 != 0) {
             return DFHack::CR_WRONG_USAGE;
         }
-        for (size_t i = 0; i+1 < parameters.size(); i += 2) {
+        for (size_t i = 0; i + 1 < parameters.size(); i += 2) {
             if (parameters[i] == "auto-unpause") {
-                if (parameters[i+1] == "0") {
+                if (parameters[i + 1] == "0") {
                     enable_auto_unpause(out, false);
-                } else if (parameters[i+1] == "1") {
+                } else if (parameters[i + 1] == "1") {
                     enable_auto_unpause(out, true);
                 } else {
                     return DFHack::CR_WRONG_USAGE;
                 }
             } else if (parameters[i] == "auto-disengage") {
-                if (parameters[i+1] == "0") {
+                if (parameters[i + 1] == "0") {
                     disengage_enabled = false;
-                } else if (parameters[i+1] == "1") {
+                } else if (parameters[i + 1] == "1") {
                     disengage_enabled = true;
                 } else {
                     return DFHack::CR_WRONG_USAGE;
                 }
             } else if (parameters[i] == "focus-jobs") {
-                if (parameters[i+1] == "0") {
+                if (parameters[i + 1] == "0") {
                     focus_jobs_enabled = false;
-                } else if (parameters[i+1] == "1") {
+                } else if (parameters[i + 1] == "1") {
                     focus_jobs_enabled = true;
                 } else {
                     return DFHack::CR_WRONG_USAGE;
@@ -261,13 +263,13 @@ command_result spectate (color_ostream &out, std::vector <std::string> & paramet
 void onTick(color_ostream& out, void* ptr) {
     if (!df::global::ui) return;
     int32_t tick = df::global::world->frame_counter;
-    if(our_dorf){
-        if(!Units::isAlive(our_dorf)){
+    if (our_dorf) {
+        if (!Units::isAlive(our_dorf)) {
             following_dwarf = false;
             df::global::ui->follow_unit = -1;
         }
     }
-    if (!following_dwarf || (focus_jobs_enabled && !job_watched) || (tick - timestamp) > (int32_t)tick_threshold) {
+    if (!following_dwarf || (focus_jobs_enabled && !job_watched) || (tick - timestamp) > (int32_t) tick_threshold) {
         std::vector<df::unit*> dwarves;
         for (auto unit: df::global::world->units.active) {
             if (!Units::isCitizen(unit)) {
@@ -298,7 +300,7 @@ void onJobStart(color_ostream& out, void* job_ptr) {
     int zcount = ++freq[job->pos.z];
     job_tracker.emplace(job->id);
     // if we're not doing anything~ then let's pick something
-    if ((focus_jobs_enabled && !job_watched) || (tick - timestamp) > (int32_t)tick_threshold) {
+    if ((focus_jobs_enabled && !job_watched) || (tick - timestamp) > (int32_t) tick_threshold) {
         following_dwarf = true;
         // todo: allow the user to configure b, and also revise the math
         const double b = base;
@@ -330,7 +332,7 @@ void onJobStart(color_ostream& out, void* job_ptr) {
 
 // every job completed can be forgotten about
 void onJobCompletion(color_ostream &out, void* job_ptr) {
-    auto job = (df::job*)job_ptr;
+    auto job = (df::job*) job_ptr;
     // forget about it
     freq[job->pos.z]--;
     freq[job->pos.z] = freq[job->pos.z] < 0 ? 0 : freq[job->pos.z];

From 1cf96883490050a2ad89a61b0518764f57df427c Mon Sep 17 00:00:00 2001
From: Tachytaenius <henryfthomson@gmail.com>
Date: Wed, 12 Oct 2022 21:10:22 +0100
Subject: [PATCH 753/854] Implement/change/expose constructions findAtTile &
 insert (not building)

---
 docs/Lua API.rst                  |  7 +++++++
 library/LuaApi.cpp                |  9 +++++++++
 library/modules/Constructions.cpp | 15 +++++++++++----
 3 files changed, 27 insertions(+), 4 deletions(-)

diff --git a/docs/Lua API.rst b/docs/Lua API.rst
index c2b84f0f0..75196e7b9 100644
--- a/docs/Lua API.rst	
+++ b/docs/Lua API.rst	
@@ -1906,6 +1906,13 @@ Constructions module
   coordinates, designates it for removal, or instantly cancels the planned one.
   Returns *true, was_only_planned* if removed; or *false* if none found.
 
+* ``dfhack.constructions.findAtTile(pos)``, or ``findAtTile(x,y,z)``
+
+  Returns the construction at the given position, or ``nil`` if there isn't one.
+
+* ``dfhack.constructions.insert(construction)``
+
+  Properly inserts the given construction into the game.
 
 Kitchen module
 --------------
diff --git a/library/LuaApi.cpp b/library/LuaApi.cpp
index 3a83f7aef..463cf3fcc 100644
--- a/library/LuaApi.cpp
+++ b/library/LuaApi.cpp
@@ -2276,8 +2276,17 @@ static int constructions_designateRemove(lua_State *L)
     return 2;
 }
 
+static int constructions_findAtTile(lua_State *L)
+{
+    auto pos = CheckCoordXYZ(L, 1, true);
+    Lua::PushDFObject(L, Constructions::findAtTile(pos));
+    return 1;
+}
+
 static const luaL_Reg dfhack_constructions_funcs[] = {
     { "designateRemove", constructions_designateRemove },
+    { "findAtTile", constructions_findAtTile },
+    WRAPM(Constructions, insert),
     { NULL, NULL }
 };
 
diff --git a/library/modules/Constructions.cpp b/library/modules/Constructions.cpp
index 5fc632500..407e95f76 100644
--- a/library/modules/Constructions.cpp
+++ b/library/modules/Constructions.cpp
@@ -54,11 +54,18 @@ using df::global::world;
 
 df::construction * Constructions::findAtTile(df::coord pos)
 {
-    for (auto it = world->constructions.begin(); it != world->constructions.end(); ++it) {
-        if ((*it)->pos == pos)
-            return *it;
+    int index = binsearch_index(world->constructions, pos);
+    if (index == -1) {
+        return NULL;
     }
-    return NULL;
+    return world->constructions[index];
+}
+
+bool Constructions::insert(df::construction * constr)
+{
+    bool toInsert;
+    insert_into_vector(world->constructions, &df::construction::pos, constr, &toInsert);
+    return toInsert;
 }
 
 bool Constructions::designateNew(df::coord pos, df::construction_type type,

From b78af724031723b7436ae122e0fb22e498769a5c Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Wed, 12 Oct 2022 13:31:46 -0700
Subject: [PATCH 754/854] record built constructions in blueprint

---
 docs/plugins/blueprint.rst  |  18 ++--
 library/include/TileTypes.h |   2 +-
 plugins/blueprint.cpp       | 163 ++++++++++++++++++++++++------------
 plugins/lua/blueprint.lua   |   1 +
 4 files changed, 122 insertions(+), 62 deletions(-)

diff --git a/docs/plugins/blueprint.rst b/docs/plugins/blueprint.rst
index b999c0e99..bde5bb77e 100644
--- a/docs/plugins/blueprint.rst
+++ b/docs/plugins/blueprint.rst
@@ -7,11 +7,11 @@ blueprint
 
 With ``blueprint``, you can export the structure of a portion of your fortress
 in a blueprint file that you (or anyone else) can later play back with
-`quickfort`.
+`gui/quickfort`.
 
 Blueprints are ``.csv`` or ``.xlsx`` files created in the ``blueprints``
 subdirectory of your DF folder. The map area to turn into a blueprint is either
-selected interactively with the ``blueprint gui`` command or, if the GUI is not
+selected interactively with the ``gui/blueprint`` command or, if the GUI is not
 used, starts at the active cursor location and extends right and down for the
 requested width and height.
 
@@ -27,16 +27,16 @@ Examples
 --------
 
 ``blueprint gui``
-    Runs `gui/blueprint`, the interactive frontend, where all configuration for
-    a ``blueprint`` command can be set visually and interactively.
+    Runs `gui/blueprint`, the GUI frontend, where all configuration for a
+    ``blueprint`` command can be set visually and interactively.
 ``blueprint 30 40 bedrooms``
     Generates blueprints for an area 30 tiles wide by 40 tiles tall, starting
     from the active cursor on the current z-level. Blueprints are written to
     ``bedrooms.csv`` in the ``blueprints`` directory.
 ``blueprint 30 40 bedrooms dig --cursor 108,100,150``
     Generates only the ``#dig`` blueprint in the ``bedrooms.csv`` file, and
-    the start of the blueprint area is set to a specific value instead of using
-    the in-game cursor position.
+    the start of the blueprint area is set to a specific coordinate instead of
+    using the in-game cursor position.
 
 Positional parameters
 ---------------------
@@ -66,8 +66,12 @@ phases; just separate them with a space.
     Generate quickfort ``#dig`` blueprints for digging natural stone.
 ``carve``
     Generate quickfort ``#dig`` blueprints for smoothing and carving.
+``construct``
+    Generate quickfort ``#build`` blueprints for constructions (e.g. flooring
+    and walls).
 ``build``
-    Generate quickfort ``#build`` blueprints for constructions and buildings.
+    Generate quickfort ``#build`` blueprints for buildings (including
+    furniture).
 ``place``
     Generate quickfort ``#place`` blueprints for placing stockpiles.
 ``zone``
diff --git a/library/include/TileTypes.h b/library/include/TileTypes.h
index 5dbc81d0d..8e5c82cb2 100644
--- a/library/include/TileTypes.h
+++ b/library/include/TileTypes.h
@@ -116,7 +116,7 @@ namespace DFHack
         //This is a static string, overwritten with every call!
         //Support values > 2 even though they should never happen.
         //Copy string if it will be used.
-        inline char * getStr() const
+        inline const char * getStr() const
         {
             static char str[16];
 
diff --git a/plugins/blueprint.cpp b/plugins/blueprint.cpp
index 20aa1aa99..3dd912d28 100644
--- a/plugins/blueprint.cpp
+++ b/plugins/blueprint.cpp
@@ -85,11 +85,12 @@ struct blueprint_options {
     bool auto_phase = false;
 
     // if not autodetecting, which phases to output
-    bool dig   = false;
+    bool dig = false;
     bool carve = false;
+    bool construct = false;
     bool build = false;
     bool place = false;
-    bool zone  = false;
+    bool zone = false;
     bool query = false;
 
     static struct_identity _identity;
@@ -110,6 +111,7 @@ static const struct_field_info blueprint_options_fields[] = {
     { struct_field_info::PRIMITIVE, "auto_phase",             offsetof(blueprint_options, auto_phase),            &df::identity_traits<bool>::identity,    0, 0 },
     { struct_field_info::PRIMITIVE, "dig",                    offsetof(blueprint_options, dig),                   &df::identity_traits<bool>::identity,    0, 0 },
     { struct_field_info::PRIMITIVE, "carve",                  offsetof(blueprint_options, carve),                 &df::identity_traits<bool>::identity,    0, 0 },
+    { struct_field_info::PRIMITIVE, "construct",              offsetof(blueprint_options, construct),             &df::identity_traits<bool>::identity,    0, 0 },
     { struct_field_info::PRIMITIVE, "build",                  offsetof(blueprint_options, build),                 &df::identity_traits<bool>::identity,    0, 0 },
     { struct_field_info::PRIMITIVE, "place",                  offsetof(blueprint_options, place),                 &df::identity_traits<bool>::identity,    0, 0 },
     { struct_field_info::PRIMITIVE, "zone",                   offsetof(blueprint_options, zone),                  &df::identity_traits<bool>::identity,    0, 0 },
@@ -332,6 +334,108 @@ static const char * get_tile_carve(const df::coord &pos, const tile_context &tc)
     return NULL;
 }
 
+static const char * get_construction_str(df::building *b) {
+    df::building_constructionst *cons =
+            virtual_cast<df::building_constructionst>(b);
+    if (!cons)
+        return "~";
+
+    switch (cons->type) {
+    case construction_type::Fortification: return "CF";
+    case construction_type::Wall:          return "Cw";
+    case construction_type::Floor:         return "Cf";
+    case construction_type::UpStair:       return "Cu";
+    case construction_type::DownStair:     return "Cd";
+    case construction_type::UpDownStair:   return "Cx";
+    case construction_type::Ramp:          return "Cr";
+    case construction_type::TrackN:        return "trackN";
+    case construction_type::TrackS:        return "trackS";
+    case construction_type::TrackE:        return "trackE";
+    case construction_type::TrackW:        return "trackW";
+    case construction_type::TrackNS:       return "trackNS";
+    case construction_type::TrackNE:       return "trackNE";
+    case construction_type::TrackNW:       return "trackNW";
+    case construction_type::TrackSE:       return "trackSE";
+    case construction_type::TrackSW:       return "trackSW";
+    case construction_type::TrackEW:       return "trackEW";
+    case construction_type::TrackNSE:      return "trackNSE";
+    case construction_type::TrackNSW:      return "trackNSW";
+    case construction_type::TrackNEW:      return "trackNEW";
+    case construction_type::TrackSEW:      return "trackSEW";
+    case construction_type::TrackNSEW:     return "trackNSEW";
+    case construction_type::TrackRampN:    return "trackrampN";
+    case construction_type::TrackRampS:    return "trackrampS";
+    case construction_type::TrackRampE:    return "trackrampE";
+    case construction_type::TrackRampW:    return "trackrampW";
+    case construction_type::TrackRampNS:   return "trackrampNS";
+    case construction_type::TrackRampNE:   return "trackrampNE";
+    case construction_type::TrackRampNW:   return "trackrampNW";
+    case construction_type::TrackRampSE:   return "trackrampSE";
+    case construction_type::TrackRampSW:   return "trackrampSW";
+    case construction_type::TrackRampEW:   return "trackrampEW";
+    case construction_type::TrackRampNSE:  return "trackrampNSE";
+    case construction_type::TrackRampNSW:  return "trackrampNSW";
+    case construction_type::TrackRampNEW:  return "trackrampNEW";
+    case construction_type::TrackRampSEW:  return "trackrampSEW";
+    case construction_type::TrackRampNSEW: return "trackrampNSEW";
+    case construction_type::NONE:
+    default:
+        return "~";
+    }
+}
+
+static const char * get_constructed_track_str(df::tiletype *tt,
+                                              const char * base) {
+    TileDirection dir = tileDirection(*tt);
+    if (!dir.whole)
+        return "~";
+
+    std::ostringstream str;
+    str << base;
+    if (dir.north) str << "N";
+    if (dir.south) str << "S";
+    if (dir.east) str << "E";
+    if (dir.west) str << "W";
+
+    return cache(str);
+}
+
+static const char * get_constructed_floor_str(df::tiletype *tt) {
+    if (tileSpecial(*tt) != df::tiletype_special::TRACK)
+        return "Cf";
+    return get_constructed_track_str(tt, "track");
+}
+
+static const char * get_constructed_ramp_str(df::tiletype *tt) {
+    if (tileSpecial(*tt) != df::tiletype_special::TRACK)
+        return "Cr";
+    return get_constructed_track_str(tt, "trackramp");
+}
+
+static const char * get_tile_construct(const df::coord &pos,
+                                   const tile_context &ctx) {
+    if (ctx.b && ctx.b->getType() == building_type::Construction)
+        return get_construction_str(ctx.b);
+
+    df::tiletype *tt = Maps::getTileType(pos);
+    if (!tt || tileMaterial(*tt) != df::tiletype_material::CONSTRUCTION)
+        return NULL;
+
+    switch (tileShape(*tt)) {
+    case tiletype_shape::WALL:          return "Cw";
+    case tiletype_shape::FLOOR:         return get_constructed_floor_str(tt);
+    case tiletype_shape::RAMP:          return get_constructed_ramp_str(tt);
+    case tiletype_shape::FORTIFICATION: return "CF";
+    case tiletype_shape::STAIR_UP:      return "Cu";
+    case tiletype_shape::STAIR_DOWN:    return "Cd";
+    case tiletype_shape::STAIR_UPDOWN:  return "Cx";
+    default:
+        return "~";
+    }
+
+    return NULL;
+}
+
 static pair<uint32_t, uint32_t> get_building_size(const df::building *b) {
     return pair<uint32_t, uint32_t>(b->x2 - b->x1 + 1, b->y2 - b->y1 + 1);
 }
@@ -461,56 +565,6 @@ static const char * get_furnace_str(df::building *b) {
     }
 }
 
-static const char * get_construction_str(df::building *b) {
-    df::building_constructionst *cons =
-            virtual_cast<df::building_constructionst>(b);
-    if (!cons)
-        return "~";
-
-    switch (cons->type) {
-    case construction_type::Fortification: return "CF";
-    case construction_type::Wall:          return "Cw";
-    case construction_type::Floor:         return "Cf";
-    case construction_type::UpStair:       return "Cu";
-    case construction_type::DownStair:     return "Cd";
-    case construction_type::UpDownStair:   return "Cx";
-    case construction_type::Ramp:          return "Cr";
-    case construction_type::TrackN:        return "trackN";
-    case construction_type::TrackS:        return "trackS";
-    case construction_type::TrackE:        return "trackE";
-    case construction_type::TrackW:        return "trackW";
-    case construction_type::TrackNS:       return "trackNS";
-    case construction_type::TrackNE:       return "trackNE";
-    case construction_type::TrackNW:       return "trackNW";
-    case construction_type::TrackSE:       return "trackSE";
-    case construction_type::TrackSW:       return "trackSW";
-    case construction_type::TrackEW:       return "trackEW";
-    case construction_type::TrackNSE:      return "trackNSE";
-    case construction_type::TrackNSW:      return "trackNSW";
-    case construction_type::TrackNEW:      return "trackNEW";
-    case construction_type::TrackSEW:      return "trackSEW";
-    case construction_type::TrackNSEW:     return "trackNSEW";
-    case construction_type::TrackRampN:    return "trackrampN";
-    case construction_type::TrackRampS:    return "trackrampS";
-    case construction_type::TrackRampE:    return "trackrampE";
-    case construction_type::TrackRampW:    return "trackrampW";
-    case construction_type::TrackRampNS:   return "trackrampNS";
-    case construction_type::TrackRampNE:   return "trackrampNE";
-    case construction_type::TrackRampNW:   return "trackrampNW";
-    case construction_type::TrackRampSE:   return "trackrampSE";
-    case construction_type::TrackRampSW:   return "trackrampSW";
-    case construction_type::TrackRampEW:   return "trackrampEW";
-    case construction_type::TrackRampNSE:  return "trackrampNSE";
-    case construction_type::TrackRampNSW:  return "trackrampNSW";
-    case construction_type::TrackRampNEW:  return "trackrampNEW";
-    case construction_type::TrackRampSEW:  return "trackrampSEW";
-    case construction_type::TrackRampNSEW: return "trackrampNSEW";
-    case construction_type::NONE:
-    default:
-        return "~";
-    }
-}
-
 static const char * get_trap_str(df::building *b) {
     df::building_trapst *trap = virtual_cast<df::building_trapst>(b);
     if (!trap)
@@ -622,6 +676,7 @@ static const char * get_build_keys(const df::coord &pos,
     bool at_center = static_cast<int32_t>(pos.x) == ctx.b->centerx
                             && static_cast<int32_t>(pos.y) == ctx.b->centery;
 
+    // building_type::Construction is handled by the construction phase
     switch(ctx.b->getType()) {
     case building_type::Armorstand:
         return "a";
@@ -666,8 +721,6 @@ static const char * get_build_keys(const df::coord &pos,
         return "y";
     case building_type::WindowGem:
         return "Y";
-    case building_type::Construction:
-        return get_construction_str(ctx.b);
     case building_type::Shop:
         return do_block_building(ctx, "z", at_center);
     case building_type::AnimalTrap:
@@ -1132,6 +1185,8 @@ static bool do_transform(color_ostream &out,
                   smooth_get_tile_fn);
     add_processor(processors, opts, "dig", "carve", opts.carve,
                   opts.engrave ? get_tile_carve : get_tile_carve_minimal);
+    add_processor(processors, opts, "build", "construct", opts.construct,
+                  get_tile_construct, ensure_building);
     add_processor(processors, opts, "build", "build", opts.build,
                   get_tile_build, ensure_building);
     add_processor(processors, opts, "place", "place", opts.place,
diff --git a/plugins/lua/blueprint.lua b/plugins/lua/blueprint.lua
index 5c73be7c0..564962448 100644
--- a/plugins/lua/blueprint.lua
+++ b/plugins/lua/blueprint.lua
@@ -6,6 +6,7 @@ local utils = require('utils')
 local valid_phase_list = {
     'dig',
     'carve',
+    'construct',
     'build',
     'place',
     'zone',

From ded5f483d664fc9f804a7f3ca40f04032fcb7793 Mon Sep 17 00:00:00 2001
From: Tachytaenius <henryfthomson@gmail.com>
Date: Wed, 12 Oct 2022 21:32:27 +0100
Subject: [PATCH 755/854] Fix issues in construction module

---
 docs/Lua API.rst                        | 3 ++-
 library/LuaApi.cpp                      | 2 +-
 library/include/modules/Constructions.h | 2 ++
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/docs/Lua API.rst b/docs/Lua API.rst
index 75196e7b9..5cfd8cf09 100644
--- a/docs/Lua API.rst	
+++ b/docs/Lua API.rst	
@@ -1912,7 +1912,8 @@ Constructions module
 
 * ``dfhack.constructions.insert(construction)``
 
-  Properly inserts the given construction into the game.
+  Properly inserts the given construction into the game. Returns false and fails to
+  insert if there was already a construction at the position.
 
 Kitchen module
 --------------
diff --git a/library/LuaApi.cpp b/library/LuaApi.cpp
index 463cf3fcc..4a97a0502 100644
--- a/library/LuaApi.cpp
+++ b/library/LuaApi.cpp
@@ -2264,6 +2264,7 @@ static const luaL_Reg dfhack_buildings_funcs[] = {
 
 static const LuaWrapper::FunctionReg dfhack_constructions_module[] = {
     WRAPM(Constructions, designateNew),
+    WRAPM(Constructions, insert),
     { NULL, NULL }
 };
 
@@ -2286,7 +2287,6 @@ static int constructions_findAtTile(lua_State *L)
 static const luaL_Reg dfhack_constructions_funcs[] = {
     { "designateRemove", constructions_designateRemove },
     { "findAtTile", constructions_findAtTile },
-    WRAPM(Constructions, insert),
     { NULL, NULL }
 };
 
diff --git a/library/include/modules/Constructions.h b/library/include/modules/Constructions.h
index c7a1c048b..b152381c4 100644
--- a/library/include/modules/Constructions.h
+++ b/library/include/modules/Constructions.h
@@ -45,6 +45,8 @@ namespace Constructions
 
 DFHACK_EXPORT df::construction * findAtTile(df::coord pos);
 
+DFHACK_EXPORT bool insert(df::construction * constr);
+
 DFHACK_EXPORT bool designateNew(df::coord pos, df::construction_type type,
                                 df::item_type item = df::item_type::NONE, int mat_index = -1);
 

From 754f1a2598167722c16e162026953e1ef10e5433 Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Wed, 12 Oct 2022 13:33:29 -0700
Subject: [PATCH 756/854] update changelog

---
 docs/changelog.txt | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docs/changelog.txt b/docs/changelog.txt
index f9b7accc5..37f3a1dd1 100644
--- a/docs/changelog.txt
+++ b/docs/changelog.txt
@@ -38,6 +38,8 @@ changelog.txt uses a syntax similar to RST, with a few special sequences:
 ## Fixes
 
 ## Misc Improvements
+- `blueprint`: new ``--smooth`` option for recording all smoothed floors and walls instead of just the ones that require smoothing for later carving
+- `blueprint`: record built constructions in blueprints
 - `ls`: indent tag listings and wrap them in the right column for better readability
 - `ls`: new ``--exclude`` option for hiding matched scripts from the output.  this can be especially useful for modders who don't want their mod scripts to be included in ``ls`` output.
 - `digtype`: new ``-z`` option for digtype to restrict designations to the current z-level and down

From 63e9192367c9b4b42c72cbff408c80a766df1d15 Mon Sep 17 00:00:00 2001
From: Josh Cooper <cooper.s.josh@outlook.com>
Date: Wed, 12 Oct 2022 14:13:09 -0700
Subject: [PATCH 757/854] Moves specate and pause-api to plugins/spectate/

---
 plugins/CMakeLists.txt              |   2 +-
 plugins/spectate/CMakeLists.txt     |   8 ++
 plugins/spectate/pause.cpp          | 160 ++++++++++++++++++++++++++++
 plugins/spectate/pause.h            |  58 ++++++++++
 plugins/{ => spectate}/spectate.cpp |  10 +-
 5 files changed, 235 insertions(+), 3 deletions(-)
 create mode 100644 plugins/spectate/CMakeLists.txt
 create mode 100644 plugins/spectate/pause.cpp
 create mode 100644 plugins/spectate/pause.h
 rename plugins/{ => spectate}/spectate.cpp (99%)

diff --git a/plugins/CMakeLists.txt b/plugins/CMakeLists.txt
index dc341b39d..c9438e04e 100644
--- a/plugins/CMakeLists.txt
+++ b/plugins/CMakeLists.txt
@@ -163,7 +163,7 @@ if(BUILD_SUPPORTED)
     dfhack_plugin(siege-engine siege-engine.cpp LINK_LIBRARIES lua)
     dfhack_plugin(sort sort.cpp LINK_LIBRARIES lua)
     dfhack_plugin(steam-engine steam-engine.cpp)
-    dfhack_plugin(spectate spectate.cpp)
+    add_subdirectory(spectate)
     dfhack_plugin(stockflow stockflow.cpp LINK_LIBRARIES lua)
     add_subdirectory(stockpiles)
     dfhack_plugin(stocks stocks.cpp)
diff --git a/plugins/spectate/CMakeLists.txt b/plugins/spectate/CMakeLists.txt
new file mode 100644
index 000000000..000291d34
--- /dev/null
+++ b/plugins/spectate/CMakeLists.txt
@@ -0,0 +1,8 @@
+
+project(spectate)
+
+SET(SOURCES
+        spectate.cpp
+        pause.cpp)
+
+dfhack_plugin(${PROJECT_NAME} ${SOURCES} LINK_LIBRARIES lua)
\ No newline at end of file
diff --git a/plugins/spectate/pause.cpp b/plugins/spectate/pause.cpp
new file mode 100644
index 000000000..bac3c1654
--- /dev/null
+++ b/plugins/spectate/pause.cpp
@@ -0,0 +1,160 @@
+#include "pause.h"
+#include <VTableInterpose.h>
+#include <df/global_objects.h>
+#include <df/viewscreen_dwarfmodest.h>
+#include <df/announcements.h>
+#include <df/d_init.h>
+#include <df/ui.h>
+
+#include <algorithm>
+
+using namespace DFHack;
+using namespace Pausing;
+using namespace df::enums;
+
+namespace pausing {
+    AnnouncementLock announcementLock("monitor");
+    PlayerLock playerLock("monitor");
+
+    const size_t announcement_flag_arr_size = sizeof(decltype(df::announcements::flags)) / sizeof(df::announcement_flags);
+    bool state_saved = false; // indicates whether a restore state is ok
+    bool announcements_disabled = false; // indicates whether disable or restore was last enacted, could use a better name
+    bool saved_states[announcement_flag_arr_size]; // state to restore
+    bool locked_states[announcement_flag_arr_size]; // locked state (re-applied each frame)
+    bool allow_player_pause = true; // toggles player pause ability
+
+    using df::global::ui;
+    using namespace df::enums;
+    struct player_pause_hook : df::viewscreen_dwarfmodest {
+        typedef df::viewscreen_dwarfmodest interpose_base;
+        DEFINE_VMETHOD_INTERPOSE(void, feed, (std::set<df::interface_key>* input)) {
+            if ((ui->main.mode == ui_sidebar_mode::Default) && !allow_player_pause) {
+                input->erase(interface_key::D_PAUSE);
+            }
+            INTERPOSE_NEXT(feed)(input);
+        }
+    };
+
+    IMPLEMENT_VMETHOD_INTERPOSE(player_pause_hook, feed);
+}
+using namespace pausing;
+
+std::unordered_set<Lock*> PlayerLock::locks;
+std::unordered_set<Lock*> AnnouncementLock::locks;
+
+template<typename Locks>
+inline bool any_lock(Locks locks) {
+    return std::any_of(locks.begin(), locks.end(), [](Lock* lock) { return lock->isLocked(); });
+}
+
+template<typename Locks, typename LockT>
+inline bool only_lock(Locks locks, LockT* this_lock) {
+    return std::all_of(locks.begin(), locks.end(), [&](Lock* lock) {
+        if (lock == this_lock) {
+            return lock->isLocked();
+        }
+        return !lock->isLocked();
+    });
+}
+
+template<typename Locks, typename LockT>
+inline bool only_or_none_locked(Locks locks, LockT* this_lock) {
+    for (auto &L: locks) {
+        if (L == this_lock) {
+            continue;
+        }
+        if (L->isLocked()) {
+            return false;
+        }
+    }
+    return true;
+}
+
+bool AnnouncementLock::captureState() {
+    if (only_or_none_locked(locks, this)) {
+        for (size_t i = 0; i < announcement_flag_arr_size; ++i) {
+            locked_states[i] = df::global::d_init->announcements.flags[i].bits.PAUSE;
+        }
+        return true;
+    }
+    return false;
+}
+
+void AnnouncementLock::lock() {
+    Lock::lock();
+    captureState();
+}
+
+bool AnnouncementLock::isAnyLocked() const {
+    return any_lock(locks);
+}
+
+bool AnnouncementLock::isOnlyLocked() const {
+    return only_lock(locks, this);
+}
+
+bool PlayerLock::isAnyLocked() const {
+    return any_lock(locks);
+}
+
+bool PlayerLock::isOnlyLocked() const {
+    return only_lock(locks, this);
+}
+
+bool World::DisableAnnouncementPausing() {
+    if (!announcementLock.isAnyLocked()) {
+        for (auto& flag : df::global::d_init->announcements.flags) {
+            flag.bits.PAUSE = false;
+        }
+        announcements_disabled = true;
+    }
+    return announcements_disabled;
+}
+
+bool World::SaveAnnouncementSettings() {
+    if (!announcementLock.isAnyLocked()) {
+        for (size_t i = 0; i < announcement_flag_arr_size; ++i) {
+            saved_states[i] = df::global::d_init->announcements.flags[i].bits.PAUSE;
+        }
+        return true;
+    }
+    return false;
+}
+
+bool World::RestoreAnnouncementSettings() {
+    if (!announcementLock.isAnyLocked() && state_saved) {
+        for (size_t i = 0; i < announcement_flag_arr_size; ++i) {
+            df::global::d_init->announcements.flags[i].bits.PAUSE = saved_states[i];
+        }
+        announcements_disabled = false;
+        return true;
+    }
+    return false;
+}
+
+bool World::EnablePlayerPausing() {
+    if (!playerLock.isAnyLocked()) {
+        allow_player_pause = true;
+    }
+    return allow_player_pause;
+}
+
+bool World::DisablePlayerPausing() {
+    if (!playerLock.isAnyLocked()) {
+        allow_player_pause = false;
+    }
+    return !allow_player_pause;
+}
+
+void World::Update() {
+    static bool did_once = false;
+    if (!did_once) {
+        did_once = true;
+        INTERPOSE_HOOK(player_pause_hook, feed).apply();
+    }
+    if (announcementLock.isAnyLocked()) {
+        for (size_t i = 0; i < announcement_flag_arr_size; ++i) {
+            df::global::d_init->announcements.flags[i].bits.PAUSE = locked_states[i];
+        }
+    }
+}
\ No newline at end of file
diff --git a/plugins/spectate/pause.h b/plugins/spectate/pause.h
new file mode 100644
index 000000000..dafc259d1
--- /dev/null
+++ b/plugins/spectate/pause.h
@@ -0,0 +1,58 @@
+#pragma once
+#include <unordered_set>
+#include <string>
+
+namespace DFHack {
+    ////////////
+    // Locking mechanisms for control over pausing
+    namespace Pausing
+    {
+        class Lock
+        {
+            bool locked = false;
+            std::string name;
+        public:
+            explicit Lock(const char* name) { this->name = name;};
+            virtual ~Lock()= default;
+            virtual bool isAnyLocked() const = 0;
+            virtual bool isOnlyLocked() const = 0;
+            bool isLocked() const   { return locked; }
+            virtual void lock()     { locked = true; }; //simply locks the lock
+            void unlock()           { locked = false; };
+        };
+
+        // non-blocking lock resource used in conjunction with the announcement functions in World
+        class AnnouncementLock : public Lock
+        {
+            static std::unordered_set<Lock*> locks;
+        public:
+            explicit AnnouncementLock(const char* name): Lock(name) { locks.emplace(this); }
+            ~AnnouncementLock() override { locks.erase(this); }
+            bool captureState(); // captures the state of announcement settings, iff this is the only locked lock (note it does nothing if 0 locks are engaged)
+            void lock() override; // locks and attempts to capture state
+            bool isAnyLocked() const override; // returns true if any instance of AnnouncementLock is locked
+            bool isOnlyLocked() const override; // returns true if locked and no other instance is locked
+        };
+
+        // non-blocking lock resource used in conjunction with the Player pause functions in World
+        class PlayerLock : public Lock
+        {
+            static std::unordered_set<Lock*> locks;
+        public:
+            explicit PlayerLock(const char* name): Lock(name) { locks.emplace(this); }
+            ~PlayerLock() override { locks.erase(this); }
+            bool isAnyLocked() const override; // returns true if any instance of PlayerLock is locked
+            bool isOnlyLocked() const override; // returns true if locked and no other instance is locked
+        };
+    }
+    namespace World {
+        bool DisableAnnouncementPausing(); // disable announcement pausing if all locks are open
+        bool SaveAnnouncementSettings(); // save current announcement pause settings if all locks are open
+        bool RestoreAnnouncementSettings(); // restore saved announcement pause settings if all locks are open
+
+        bool EnablePlayerPausing(); // enable player pausing if all locks are open
+        bool DisablePlayerPausing(); // disable player pausing if all locks are open
+
+        void Update();
+    }
+}
\ No newline at end of file
diff --git a/plugins/spectate.cpp b/plugins/spectate/spectate.cpp
similarity index 99%
rename from plugins/spectate.cpp
rename to plugins/spectate/spectate.cpp
index 2cf23df1d..fc305d33e 100644
--- a/plugins/spectate.cpp
+++ b/plugins/spectate/spectate.cpp
@@ -2,6 +2,8 @@
 // Created by josh on 7/28/21.
 //
 
+#include "pause.h"
+
 #include "Core.h"
 #include <modules/Gui.h>
 #include <Console.h>
@@ -31,6 +33,7 @@ REQUIRE_GLOBAL(pause_state);
 REQUIRE_GLOBAL(d_init);
 
 using namespace DFHack;
+using namespace Pausing;
 using namespace df::enums;
 
 void onTick(color_ostream& out, void* tick);
@@ -53,6 +56,9 @@ std::set<int32_t> job_tracker;
 std::map<uint16_t,uint16_t> freq;
 std::default_random_engine RNG;
 
+
+
+
 #define base 0.99
 
 static const std::string CONFIG_KEY = std::string(plugin_name) + "/config";
@@ -80,12 +86,12 @@ DFhackCExport command_result plugin_init (color_ostream &out, std::vector <Plugi
                                      "Automated spectator mode.",
                                      spectate,
                                      false));
-    pause_lock = World::AcquireAnnouncementPauseLock("spectate");
+    pause_lock = new AnnouncementLock("spectate");
     return CR_OK;
 }
 
 DFhackCExport command_result plugin_shutdown (color_ostream &out) {
-    World::ReleasePauseLock(pause_lock);
+    delete pause_lock;
     return CR_OK;
 }
 

From 303599222c107d829d60f10588ee89c3f04017fe Mon Sep 17 00:00:00 2001
From: Josh Cooper <cooper.s.josh@outlook.com>
Date: Wed, 12 Oct 2022 14:15:11 -0700
Subject: [PATCH 758/854] Revert "Revises nopause in reveal with pause API in
 World module"

This reverts commit 318dd4c7db33229a3517048967b3cee560aeb347.
---
 plugins/reveal.cpp | 26 +++++---------------------
 1 file changed, 5 insertions(+), 21 deletions(-)

diff --git a/plugins/reveal.cpp b/plugins/reveal.cpp
index 3aba37b95..8d76bd54b 100644
--- a/plugins/reveal.cpp
+++ b/plugins/reveal.cpp
@@ -62,7 +62,6 @@ struct hideblock
 uint32_t x_max, y_max, z_max;
 vector <hideblock> hidesaved;
 bool nopause_state = false;
-Pausing::PlayerLock* pause_lock = nullptr;
 
 enum revealstate
 {
@@ -107,7 +106,6 @@ DFhackCExport command_result plugin_init ( color_ostream &out, vector <PluginCom
         "nopause",
         "Disable manual and automatic pausing.",
         nopause));
-    pause_lock = World::AcquirePlayerPauseLock("reveal::nopause");
     return CR_OK;
 }
 
@@ -132,7 +130,6 @@ DFhackCExport command_result plugin_onupdate ( color_ostream &out )
 
 DFhackCExport command_result plugin_shutdown ( color_ostream &out )
 {
-    World::ReleasePauseLock(pause_lock);
     return CR_OK;
 }
 
@@ -140,23 +137,10 @@ command_result nopause (color_ostream &out, vector <string> & parameters)
 {
     if (parameters.size() == 1 && (parameters[0] == "0" || parameters[0] == "1"))
     {
-        if (parameters[0] == "0") {
-            if (nopause_state) {
-                pause_lock->unlock();
-                if (!World::EnablePlayerPausing()) {
-                    out.printerr("reveal/nopause: Player pausing is currently locked by another plugin / script. Unable to re-enable.\n");
-                }
-            }
+        if (parameters[0] == "0")
             nopause_state = 0;
-        } else {
-            if (!nopause_state) {
-                pause_lock->unlock();
-                if (!World::DisablePlayerPausing()) {
-                    out.printerr("reveal/nopause: Player pausing is currently locked by another plugin / script. Unable to disable.\n");
-                }
-            }
+        else
             nopause_state = 1;
-        }
         is_active = nopause_state || (revealed == REVEALED);
         out.print("nopause %sactivated.\n", (nopause_state ? "" : "de"));
     }
@@ -490,7 +474,7 @@ command_result revflood(color_ostream &out, vector<string> & params)
             return CR_WRONG_USAGE;
     }
     CoreSuspender suspend;
-    uint32_t xmax,ymax,zmax;
+    uint32_t x_max,y_max,z_max;
     if (!Maps::IsValid())
     {
         out.printerr("Map is not available!\n");
@@ -509,7 +493,7 @@ command_result revflood(color_ostream &out, vector<string> & params)
         return CR_FAILURE;
     }
     int32_t cx, cy, cz;
-    Maps::getSize(xmax, ymax, zmax);
+    Maps::getSize(x_max,y_max,z_max);
 
     Gui::getCursorCoords(cx,cy,cz);
     if(cx == -30000)
@@ -527,7 +511,7 @@ command_result revflood(color_ostream &out, vector<string> & params)
         return CR_FAILURE;
     }
     // hide all tiles, flush cache
-    Maps::getSize(xmax, ymax, zmax);
+    Maps::getSize(x_max,y_max,z_max);
 
     for(size_t i = 0; i < world->map.map_blocks.size(); i++)
     {

From d6752889692756aa7d0971b1eb9fbf786867700b Mon Sep 17 00:00:00 2001
From: Josh Cooper <cooper.s.josh@outlook.com>
Date: Wed, 12 Oct 2022 14:18:32 -0700
Subject: [PATCH 759/854] Manually reverts Pause-api implementation in
 core/modules

---
 library/Core.cpp                |   3 -
 library/include/modules/World.h |  56 --------------
 library/modules/World.cpp       | 133 --------------------------------
 3 files changed, 192 deletions(-)

diff --git a/library/Core.cpp b/library/Core.cpp
index cf47e4ec1..87f78f56c 100644
--- a/library/Core.cpp
+++ b/library/Core.cpp
@@ -1913,9 +1913,6 @@ void Core::doUpdate(color_ostream &out, bool first_update)
     // Execute per-frame handlers
     onUpdate(out);
 
-    // Execute per-frame World module maintenance, after plugins and lua timers
-    World::Update();
-
     d->last_autosave_request = df::global::ui->main.autosave_request;
     d->was_load_save = is_load_save;
 
diff --git a/library/include/modules/World.h b/library/include/modules/World.h
index 5b87dd4cf..4cba97692 100644
--- a/library/include/modules/World.h
+++ b/library/include/modules/World.h
@@ -62,47 +62,6 @@ namespace DFHack
     };
     class DFContextShared;
 
-    ////////////
-    // Locking mechanisms for control over pausing
-    namespace Pausing
-    {
-        class Lock
-        {
-            bool locked = false;
-            std::string name;
-        public:
-            explicit Lock(const char* name) { this->name = name;};
-            virtual ~Lock()= default;
-            virtual bool isAnyLocked() const = 0;
-            virtual bool isOnlyLocked() const = 0;
-            bool isLocked() const   { return locked; }
-            void lock()             { locked = true; };
-            void unlock()           { locked = false; };
-        };
-
-        // non-blocking lock resource used in conjunction with the announcement functions in World
-        class AnnouncementLock : public Lock
-        {
-            static std::unordered_set<Lock*> locks;
-        public:
-            explicit AnnouncementLock(const char* name): Lock(name) { locks.emplace(this); }
-            ~AnnouncementLock() override { locks.erase(this); }
-            bool isAnyLocked() const override; // returns true if any instance of AnnouncementLock is locked
-            bool isOnlyLocked() const override; // returns true if locked and no other instance is locked
-        };
-
-        // non-blocking lock resource used in conjunction with the Player pause functions in World
-        class PlayerLock : public Lock
-        {
-            static std::unordered_set<Lock*> locks;
-        public:
-            explicit PlayerLock(const char* name): Lock(name) { locks.emplace(this); }
-            ~PlayerLock() override { locks.erase(this); }
-            bool isAnyLocked() const override; // returns true if any instance of PlayerLock is locked
-            bool isOnlyLocked() const override; // returns true if locked and no other instance is locked
-        };
-    }
-
     /**
      * The World module
      * \ingroup grp_modules
@@ -115,21 +74,6 @@ namespace DFHack
         ///true if paused, false if not
         DFHACK_EXPORT void SetPauseState(bool paused);
 
-        // todo: prevent anything else from allocating/deleting?
-        // Acquire & Release pause locks controlling player pausing and announcement pause settings
-        DFHACK_EXPORT Pausing::AnnouncementLock* AcquireAnnouncementPauseLock(const char*);
-        DFHACK_EXPORT Pausing::PlayerLock* AcquirePlayerPauseLock(const char*);
-        DFHACK_EXPORT void ReleasePauseLock(Pausing::Lock*);
-
-        DFHACK_EXPORT bool DisableAnnouncementPausing(); // disable announcement pausing if all locks are open
-        DFHACK_EXPORT bool SaveAnnouncementSettings(); // save current announcement pause settings if all locks are open
-        DFHACK_EXPORT bool RestoreAnnouncementSettings(); // restore saved announcement pause settings if all locks are open
-
-        DFHACK_EXPORT bool EnablePlayerPausing(); // enable player pausing if all locks are open
-        DFHACK_EXPORT bool DisablePlayerPausing(); // disable player pausing if all locks are open
-
-        void Update();
-
         DFHACK_EXPORT uint32_t ReadCurrentTick();
         DFHACK_EXPORT uint32_t ReadCurrentYear();
         DFHACK_EXPORT uint32_t ReadCurrentMonth();
diff --git a/library/modules/World.cpp b/library/modules/World.cpp
index ae959039c..3f6ccb2c7 100644
--- a/library/modules/World.cpp
+++ b/library/modules/World.cpp
@@ -59,7 +59,6 @@ using namespace std;
 #include "PluginManager.h"
 
 using namespace DFHack;
-using namespace Pausing;
 using namespace df::enums;
 
 using df::global::world;
@@ -75,138 +74,6 @@ void World::SetPauseState(bool paused)
     DF_GLOBAL_VALUE(pause_state, dummy) = paused;
 }
 
-std::unordered_set<Lock*> PlayerLock::locks;
-std::unordered_set<Lock*> AnnouncementLock::locks;
-
-template<typename Locks>
-inline bool any_lock(Locks locks) {
-    return std::any_of(locks.begin(), locks.end(), [](Lock* lock) { return lock->isLocked(); });
-}
-
-template<typename Locks, typename LockT>
-inline bool only_lock(Locks locks, LockT* this_lock) {
-    return std::all_of(locks.begin(), locks.end(), [&](Lock* lock) {
-        if (lock == this_lock) {
-            return lock->isLocked();
-        }
-        return !lock->isLocked();
-    });
-}
-
-bool AnnouncementLock::isAnyLocked() const {
-    return any_lock(locks);
-}
-
-bool AnnouncementLock::isOnlyLocked() const {
-    return only_lock(locks, this);
-}
-
-bool PlayerLock::isAnyLocked() const {
-    return any_lock(locks);
-}
-
-bool PlayerLock::isOnlyLocked() const {
-    return only_lock(locks, this);
-}
-
-namespace pausing {
-    AnnouncementLock announcementLock("monitor");
-    PlayerLock playerLock("monitor");
-
-    const size_t array_size = sizeof(decltype(df::announcements::flags)) / sizeof(df::announcement_flags);
-    bool state_saved = false; // indicates whether a restore state is ok
-    bool announcements_disabled = false; // indicates whether disable or restore was last enacted, could use a better name
-    bool saved_states[array_size]; // state to restore
-    bool locked_states[array_size]; // locked state (re-applied each frame)
-    bool allow_player_pause = true; // toggles player pause ability
-
-    using df::global::ui;
-    using namespace df::enums;
-    struct player_pause_hook : df::viewscreen_dwarfmodest {
-        typedef df::viewscreen_dwarfmodest interpose_base;
-        DEFINE_VMETHOD_INTERPOSE(void, feed, (std::set<df::interface_key>* input)) {
-            if ((ui->main.mode == ui_sidebar_mode::Default) && !allow_player_pause) {
-                input->erase(interface_key::D_PAUSE);
-            }
-            INTERPOSE_NEXT(feed)(input);
-        }
-    };
-
-    IMPLEMENT_VMETHOD_INTERPOSE(player_pause_hook, feed);
-}
-using namespace pausing;
-
-AnnouncementLock* World::AcquireAnnouncementPauseLock(const char* name) {
-    return new AnnouncementLock(name);
-}
-
-PlayerLock* World::AcquirePlayerPauseLock(const char* name) {
-    return new PlayerLock(name);
-}
-
-void World::ReleasePauseLock(Lock* lock){
-    delete lock;
-}
-
-bool World::DisableAnnouncementPausing() {
-    if (!announcementLock.isAnyLocked()) {
-        for (auto& flag : df::global::d_init->announcements.flags) {
-            flag.bits.PAUSE = false;
-        }
-        announcements_disabled = true;
-    }
-    return announcements_disabled;
-}
-
-bool World::SaveAnnouncementSettings() {
-    if (!announcementLock.isAnyLocked()) {
-        for (size_t i = 0; i < array_size; ++i) {
-            saved_states[i] = df::global::d_init->announcements.flags[i].bits.PAUSE;
-        }
-        return true;
-    }
-    return false;
-}
-
-bool World::RestoreAnnouncementSettings() {
-    if (!announcementLock.isAnyLocked() && state_saved) {
-        for (size_t i = 0; i < array_size; ++i) {
-            df::global::d_init->announcements.flags[i].bits.PAUSE = saved_states[i];
-        }
-        announcements_disabled = false;
-        return true;
-    }
-    return false;
-}
-
-bool World::EnablePlayerPausing() {
-    if (!playerLock.isAnyLocked()) {
-        allow_player_pause = true;
-    }
-    return allow_player_pause;
-}
-
-bool World::DisablePlayerPausing() {
-    if (!playerLock.isAnyLocked()) {
-        allow_player_pause = false;
-    }
-    return !allow_player_pause;
-}
-
-void World::Update() {
-    static bool did_once = false;
-    if (!did_once) {
-        did_once = true;
-        INTERPOSE_HOOK(player_pause_hook, feed).apply();
-    }
-    if (announcementLock.isAnyLocked()) {
-        for (size_t i = 0; i < array_size; ++i) {
-            df::global::d_init->announcements.flags[i].bits.PAUSE = locked_states[i];
-        }
-    }
-}
-
-
 uint32_t World::ReadCurrentYear()
 {
     return DF_GLOBAL_VALUE(cur_year, 0);

From cd4c6489dcf9399182080e3b8f7696e0950a2618 Mon Sep 17 00:00:00 2001
From: Josh Cooper <cooper.s.josh@outlook.com>
Date: Wed, 12 Oct 2022 14:39:49 -0700
Subject: [PATCH 760/854] Changed spectate auto-disengage to only trigger when
 unpaused

---
 plugins/spectate/spectate.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/spectate/spectate.cpp b/plugins/spectate/spectate.cpp
index fc305d33e..1148e26a4 100644
--- a/plugins/spectate/spectate.cpp
+++ b/plugins/spectate/spectate.cpp
@@ -168,7 +168,7 @@ DFhackCExport command_result plugin_onupdate(color_ostream &out) {
         // dismiss announcement popup(s)
         Gui::getCurViewscreen(true)->feed_key(interface_key::CLOSE_MEGA_ANNOUNCEMENT);
     }
-    if (disengage_enabled) {
+    if (disengage_enabled && !World::ReadPauseState()) {
         if (our_dorf && our_dorf->id != df::global::ui->follow_unit) {
             plugin_enable(out, false);
         }

From 23c2d14b4ab4968fa82b21d55c795a567f97fab9 Mon Sep 17 00:00:00 2001
From: Josh Cooper <cooper.s.josh@outlook.com>
Date: Wed, 12 Oct 2022 14:40:21 -0700
Subject: [PATCH 761/854] Updated documentation/changelog

---
 docs/changelog.txt        | 13 +++++--------
 docs/plugins/spectate.rst | 11 +++++++----
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/docs/changelog.txt b/docs/changelog.txt
index e1a53fe3c..e4166c8e6 100644
--- a/docs/changelog.txt
+++ b/docs/changelog.txt
@@ -64,12 +64,17 @@ changelog.txt uses a syntax similar to RST, with a few special sequences:
 - `prospect`: add new ``--show`` option to give the player control over which report sections are shown. e.g. ``prospect all --show ores`` will just show information on ores.
 - `seedwatch`: ``seedwatch all`` now adds all plants with seeds to the watchlist, not just the "basic" crops.
 - `spectate`: ``spectate auto-unpause`` is a new feature that will auto-dismiss pause events when enabled. This does not affect the player's ability to pause at a whim.
+- `spectate`: ``spectate auto-disengage`` is a new feature that will auto-disengage the plugin when the player interacts with the game while unpaused
+- `spectate`: ``spectate focus-jobs`` is a new feature that allows the plugin to not always follow a job, so it can trail a dwarf after they finish a job
+- `spectate`: ``spectate tick-threshold`` is a new feature that allows the player to change how long to follow a dwarf
+- `spectate`: added persistent configuration of the plugin settings
 - UX: You can now move the cursor around in DFHack text fields in ``gui/`` scripts (e.g. `gui/blueprint`, `gui/quickfort`, or `gui/gm-editor`). You can move the cursor by clicking where you want it to go with the mouse or using the Left/Right arrow keys.  Ctrl+Left/Right will move one word at a time, and Alt+Left/Right will move to the beginning/end of the text.
 - UX: You can now click on the hotkey hint text in many ``gui/`` script windows to activate the hotkey, like a button. Not all scripts have been updated to use the clickable widget yet, but you can try it in `gui/blueprint` or `gui/quickfort`.
 - UX: Label widget scroll icons are replaced with scrollbars that represent the percentage of text on the screen and move with the position of the visible text, just like web browser scrollbars.
 - `quickfort`: `Dreamfort <quickfort-blueprint-guide>` blueprint set improvements: set traffic designations to encourage dwarves to eat cooked food instead of raw ingredients
 
 ## Documentation
+- `spectate`: improved documentation of features and functionality
 - Added `modding-guide`
 - Update all DFHack tool documentation (300+ pages) with standard syntax formatting, usage examples, and overall clarified text.
 - Group DFHack tools by `tag <tools>` so similar tools are grouped and easy to find
@@ -81,14 +86,6 @@ changelog.txt uses a syntax similar to RST, with a few special sequences:
 - Removed ``Windows`` module (C++-only) - unused.
 - ``Constructions`` module (C++-only): removed ``t_construction``, ``isValid()``, ``getCount()``, ``getConstruction()``, and ``copyConstruction()``. Access ``world.constructions`` directly instead.
 - ``Gui::getSelectedItem()``, ``Gui::getAnyItem()``: added support for the artifacts screen
-- Added functions for manipulating pause abilities, to the World module.
-  - Added ``World::AcquireAnnouncementPauseLock()`` acquires a lock object to lock Announcement pause API calls
-  - Added ``World::AcquirePlayerPauseLock()`` acquires a lock object to lock Player pause API calls
-  - Added ``World::ReleasePauseLock()`` to release acquired locks on plugin shutdown
-  - Added ``World::DisableAnnouncementPausing()`` sets all announcement pause settings to off
-  - Added ``World::SaveAnnouncementSettings()`` and ``World::RestoreAnnouncementSettings()`` saves/restores the announcement pause settings
-  - Added ``World::DisablePlayerPausing()`` and ``World::EnablePlayerPausing()`` disables/enables the player's ability to pause the game
-
 
 ## Lua
 - History: added ``dfhack.getCommandHistory(history_id, history_filename)`` and ``dfhack.addCommandToHistory(history_id, history_filename, command)`` so gui scripts can access a commandline history without requiring a terminal.
diff --git a/docs/plugins/spectate.rst b/docs/plugins/spectate.rst
index 48bdd90bd..eea85d3da 100644
--- a/docs/plugins/spectate.rst
+++ b/docs/plugins/spectate.rst
@@ -23,6 +23,9 @@ To set features that toggle between two states, use {0,1} to specify
 which state the feature should be in. Anything else will take any positive
 value.
 
+Changes to plugin settings will be saved per world. Whether the plugin itself
+is enabled or not is not saved.
+
 Examples
 --------
 
@@ -42,7 +45,7 @@ Options
 
 :no option:      Show plugin status.
 :tick-threshold: Set the plugin's tick interval for changing the followed dwarf.
-                 Acts as a maximum wait time when used with focus-jobs.
-:focus-jobs:     Toggle whether the plugin should always be following a job.
-:auto-unpause:   Toggle auto-dismissal of game pause events.
-:auto-disengage: Toggle auto-disengagement of plugin through player intervention.
+                 Acts as a maximum follow time when used with focus-jobs enabled. (default: 50)
+:focus-jobs:     Toggle whether the plugin should always be following a job. (default: 0)
+:auto-unpause:   Toggle auto-dismissal of game pause events. (default: 0)
+:auto-disengage: Toggle auto-disengagement of plugin through player intervention while unpaused. (default: 0)

From f54d37c8e7b5623fed5c3eb0db4757bf163ff09c Mon Sep 17 00:00:00 2001
From: Josh Cooper <cooper.s.josh@outlook.com>
Date: Wed, 12 Oct 2022 14:42:04 -0700
Subject: [PATCH 762/854] Moved spectate changelog entries to new section

---
 docs/changelog.txt | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/docs/changelog.txt b/docs/changelog.txt
index ae97bd203..7bb4bd9c7 100644
--- a/docs/changelog.txt
+++ b/docs/changelog.txt
@@ -44,8 +44,14 @@ changelog.txt uses a syntax similar to RST, with a few special sequences:
 - UX: List widgets now have mouse-interactive scrollbars
 - UX: You can now hold down the mouse button on a scrollbar to make it scroll multiple times.
 - UX: You can now drag the scrollbar to scroll to a specific spot
+- `spectate`: ``spectate auto-unpause`` is a new feature that will auto-dismiss pause events when enabled. This does not affect the player's ability to pause at a whim.
+- `spectate`: ``spectate auto-disengage`` is a new feature that will auto-disengage the plugin when the player interacts with the game while unpaused
+- `spectate`: ``spectate focus-jobs`` is a new feature that allows the plugin to not always follow a job, so it can trail a dwarf after they finish a job
+- `spectate`: ``spectate tick-threshold`` is a new feature that allows the player to change how long to follow a dwarf
+- `spectate`: added persistent configuration of the plugin settings
 
 ## Documentation
+- `spectate`: improved documentation of features and functionality
 
 ## API
 
@@ -83,18 +89,12 @@ changelog.txt uses a syntax similar to RST, with a few special sequences:
 - `orders`: added useful library of manager orders. see them with ``orders list`` and import them with, for example, ``orders import library/basic``
 - `prospect`: add new ``--show`` option to give the player control over which report sections are shown. e.g. ``prospect all --show ores`` will just show information on ores.
 - `seedwatch`: ``seedwatch all`` now adds all plants with seeds to the watchlist, not just the "basic" crops.
-- `spectate`: ``spectate auto-unpause`` is a new feature that will auto-dismiss pause events when enabled. This does not affect the player's ability to pause at a whim.
-- `spectate`: ``spectate auto-disengage`` is a new feature that will auto-disengage the plugin when the player interacts with the game while unpaused
-- `spectate`: ``spectate focus-jobs`` is a new feature that allows the plugin to not always follow a job, so it can trail a dwarf after they finish a job
-- `spectate`: ``spectate tick-threshold`` is a new feature that allows the player to change how long to follow a dwarf
-- `spectate`: added persistent configuration of the plugin settings
 - UX: You can now move the cursor around in DFHack text fields in ``gui/`` scripts (e.g. `gui/blueprint`, `gui/quickfort`, or `gui/gm-editor`). You can move the cursor by clicking where you want it to go with the mouse or using the Left/Right arrow keys.  Ctrl+Left/Right will move one word at a time, and Alt+Left/Right will move to the beginning/end of the text.
 - UX: You can now click on the hotkey hint text in many ``gui/`` script windows to activate the hotkey, like a button. Not all scripts have been updated to use the clickable widget yet, but you can try it in `gui/blueprint` or `gui/quickfort`.
 - UX: Label widget scroll icons are replaced with scrollbars that represent the percentage of text on the screen and move with the position of the visible text, just like web browser scrollbars.
 - `quickfort`: `Dreamfort <quickfort-blueprint-guide>` blueprint set improvements: set traffic designations to encourage dwarves to eat cooked food instead of raw ingredients
 
 ## Documentation
-- `spectate`: improved documentation of features and functionality
 - Added `modding-guide`
 - Update all DFHack tool documentation (300+ pages) with standard syntax formatting, usage examples, and overall clarified text.
 - Group DFHack tools by `tag <tools>` so similar tools are grouped and easy to find

From e5b8de55efc2ae4d780cbf357952996df0d8f900 Mon Sep 17 00:00:00 2001
From: Josh Cooper <cooper.s.josh@outlook.com>
Date: Wed, 12 Oct 2022 14:44:51 -0700
Subject: [PATCH 763/854] Adds missing newlines

---
 plugins/spectate/CMakeLists.txt | 2 +-
 plugins/spectate/pause.cpp      | 2 +-
 plugins/spectate/pause.h        | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/plugins/spectate/CMakeLists.txt b/plugins/spectate/CMakeLists.txt
index 000291d34..5ba1ed9cf 100644
--- a/plugins/spectate/CMakeLists.txt
+++ b/plugins/spectate/CMakeLists.txt
@@ -5,4 +5,4 @@ SET(SOURCES
         spectate.cpp
         pause.cpp)
 
-dfhack_plugin(${PROJECT_NAME} ${SOURCES} LINK_LIBRARIES lua)
\ No newline at end of file
+dfhack_plugin(${PROJECT_NAME} ${SOURCES} LINK_LIBRARIES lua)
diff --git a/plugins/spectate/pause.cpp b/plugins/spectate/pause.cpp
index bac3c1654..bb3e90ee0 100644
--- a/plugins/spectate/pause.cpp
+++ b/plugins/spectate/pause.cpp
@@ -157,4 +157,4 @@ void World::Update() {
             df::global::d_init->announcements.flags[i].bits.PAUSE = locked_states[i];
         }
     }
-}
\ No newline at end of file
+}
diff --git a/plugins/spectate/pause.h b/plugins/spectate/pause.h
index dafc259d1..98d703998 100644
--- a/plugins/spectate/pause.h
+++ b/plugins/spectate/pause.h
@@ -55,4 +55,4 @@ namespace DFHack {
 
         void Update();
     }
-}
\ No newline at end of file
+}

From aa83aa4e7161bf349dfb71131bdbe5d94108a01f Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Wed, 12 Oct 2022 14:51:36 -0700
Subject: [PATCH 764/854] handle construct phase in ecosystem tests

---
 .../test/ecosystem/golden/transform-build.csv | 40 ++++++-------
 .../ecosystem/golden/transform-construct.csv  | 28 +++++++++
 .../test/ecosystem/in/buildings-build.csv     | 60 +++++++++----------
 .../test/ecosystem/in/buildings-construct.csv | 21 +++++++
 .../test/ecosystem/in/transform-build.csv     | 13 ----
 .../test/ecosystem/in/transform-construct.csv | 23 +++++++
 test/quickfort/ecosystem.lua                  |  1 +
 7 files changed, 123 insertions(+), 63 deletions(-)
 create mode 100644 data/blueprints/library/test/ecosystem/golden/transform-construct.csv
 create mode 100644 data/blueprints/library/test/ecosystem/in/buildings-construct.csv
 create mode 100644 data/blueprints/library/test/ecosystem/in/transform-construct.csv

diff --git a/data/blueprints/library/test/ecosystem/golden/transform-build.csv b/data/blueprints/library/test/ecosystem/golden/transform-build.csv
index 2cab6e804..74434544a 100644
--- a/data/blueprints/library/test/ecosystem/golden/transform-build.csv
+++ b/data/blueprints/library/test/ecosystem/golden/transform-build.csv
@@ -1,28 +1,28 @@
 #build label(build) start(14;14)
-,trackNS,trackE,,trackW,trackS,trackN,,gs(1x2),ga(2x1),,gx(1x2),gw(1x2),,gw(1x2),gx(1x2),gd(2x1),,gs(1x2),,trackN,trackS,trackE,,trackW,trackNS
-trackEW,,trackSE,,trackSW,trackNE,trackNW,,,gd(2x1),,,,,,,ga(2x1),,,,trackNE,trackNW,trackSE,,trackSW,,trackEW
-trackS,trackSE,,,trackNSE,trackNSW,trackEW,,Mrsssqq(2x1),,,Msh,,,,,Msk,Mrsqq(2x1),,,trackEW,trackNSE,trackNSW,,,trackSW,trackS
+,~,~,,~,~,~,,gs(1x2),ga(2x1),,gx(1x2),gw(1x2),,gw(1x2),gx(1x2),gd(2x1),,gs(1x2),,~,~,~,,~,~
+~,,~,,~,~,~,,,gd(2x1),,,,,,,ga(2x1),,,,~,~,~,,~,,~
+~,~,,,~,~,~,,Mrsssqq(2x1),,,Msh,,,,,Msk,Mrsqq(2x1),,,~,~,~,,,~,~
 ,,,,,,,,CSdddaaaa,,Msk,,Mw,,Mw,,,Msh,CSddddaaaa
-trackN,trackNE,trackSEW,,,trackSEW,trackNEW,,CSa,,Mrss(1x2),Mw,,,,Mw,Mrss(1x2),,CSa,,trackNEW,trackSEW,,,trackSEW,trackNW,trackN
-trackE,trackSW,trackNEW,,trackNSE,,trackNSEW,,,Msm,,,Mhs(1x2),,Mhs(1x2),,,Msm,,,trackNSEW,,trackNSW,,trackNEW,trackSE,trackW
-trackW,trackNW,trackNS,,trackNSW,trackNSEW,,,Msu,,Mws,,,,,,Mws,,Msu,,,trackNSEW,trackNSE,,trackNS,trackNE,trackE
+~,~,~,,,~,~,,CSa,,Mrss(1x2),Mw,,,,Mw,Mrss(1x2),,CSa,,~,~,,,~,~,~
+~,~,~,,~,,~,,,Msm,,,Mhs(1x2),,Mhs(1x2),,,Msm,,,~,,~,,~,~,~
+~,~,~,,~,~,,,Msu,,Mws,,,,,,Mws,,Msu,,,~,~,,~,~,~
 ,,,,,,,,,Mws,,Mh(2x1),,,Mh(2x1),,,Mws
 gs(2x1),,Mrqq(1x2),CSddaaaa,CSa,,Msh,,,,,,,,,,,,,,,Msk,CSa,CSddaaaa,Mrqq(1x2),gs(2x1)
-gw(1x2),gx(1x2),,,,Msk,,Mw,,,trackrampNW,trackrampNS,trackrampN,,trackrampN,trackrampNS,trackrampNE,,,Mw,,,Msh,,,gx(1x2),gw(1x2)
-,,,Msm,Mrs(2x1),,Mw,,,trackrampNW,,trackrampNSE,trackrampNSW,,trackrampNSE,trackrampNSW,,trackrampNE,,,Mw,Mrsss(2x1),,Msm
-gd(2x1),,Msu,,Mws,,,Mhs(1x2),,trackrampEW,trackrampSEW,,trackrampNSEW,,trackrampNSEW,,trackrampSEW,trackrampEW,,Mhs(1x2),,,Mws,,Msu,ga(2x1)
-ga(2x1),,,Mws,,Mh(2x1),,,,trackrampW,trackrampNEW,trackrampNSEW,,,,trackrampNSEW,trackrampNEW,trackrampE,,,Mh(2x1),,,Mws,,gd(2x1)
+gw(1x2),gx(1x2),,,,Msk,,Mw,,,~,~,~,,~,~,~,,,Mw,,,Msh,,,gx(1x2),gw(1x2)
+,,,Msm,Mrs(2x1),,Mw,,,~,,~,~,,~,~,,~,,,Mw,Mrsss(2x1),,Msm
+gd(2x1),,Msu,,Mws,,,Mhs(1x2),,~,~,,~,,~,,~,~,,Mhs(1x2),,,Mws,,Msu,ga(2x1)
+ga(2x1),,,Mws,,Mh(2x1),,,,~,~,~,,,,~,~,~,,,Mh(2x1),,,Mws,,gd(2x1)
 
-ga(2x1),,,Mws,,Mh(2x1),,Mhs(1x2),,trackrampW,trackrampSEW,trackrampNSEW,,,,trackrampNSEW,trackrampSEW,trackrampE,,Mhs(1x2),Mh(2x1),,,Mws,,gd(2x1)
-gd(2x1),,,,Mws,,,,,trackrampEW,trackrampNEW,,trackrampNSEW,,trackrampNSEW,,trackrampNEW,trackrampEW,,,,,Mws,,,ga(2x1)
-gx(1x2),gw(1x2),Msm,,Mrs(2x1),,Mw,,,trackrampSW,,trackrampNSE,trackrampNSW,,trackrampNSE,trackrampNSW,,trackrampSE,,,Mw,Mrsss(2x1),,,Msm,gw(1x2),gx(1x2)
-,,Mrssqq(1x2),Msu,,Msk,,Mw,,,trackrampSW,trackrampNS,trackrampS,,trackrampS,trackrampNS,trackrampSE,,,Mw,,,Msh,Msu,Mrssqq(1x2)
+ga(2x1),,,Mws,,Mh(2x1),,Mhs(1x2),,~,~,~,,,,~,~,~,,Mhs(1x2),Mh(2x1),,,Mws,,gd(2x1)
+gd(2x1),,,,Mws,,,,,~,~,,~,,~,,~,~,,,,,Mws,,,ga(2x1)
+gx(1x2),gw(1x2),Msm,,Mrs(2x1),,Mw,,,~,,~,~,,~,~,,~,,,Mw,Mrsss(2x1),,,Msm,gw(1x2),gx(1x2)
+,,Mrssqq(1x2),Msu,,Msk,,Mw,,,~,~,~,,~,~,~,,,Mw,,,Msh,Msu,Mrssqq(1x2)
 gs(2x1),,,CSdaaaa,CSa,,Msh,,,,,,,,,,,,,,,Msk,CSa,CSdaaaa,,gs(2x1)
 ,,,,,,,,,Mws,,Mh(2x1),,,Mh(2x1),,,Mws
-trackW,trackSW,trackNS,,trackNSW,trackNSEW,,,,,Mws,,Mhs(1x2),,Mhs(1x2),,Mws,,,,,trackNSEW,trackNSE,,trackNS,trackSE,trackE
-trackE,trackNW,trackSEW,,trackNSE,,trackNSEW,,Msm,,Mr(1x2),,,,,,Mr(1x2),,Msm,,trackNSEW,,trackNSW,,trackSEW,trackNE,trackW
-trackS,trackSE,trackNEW,,,trackNEW,trackSEW,,CSa,Msu,,Mw,,,,Mw,,Msu,CSa,,trackSEW,trackNEW,,,trackNEW,trackSW,trackS
+~,~,~,,~,~,,,,,Mws,,Mhs(1x2),,Mhs(1x2),,Mws,,,,,~,~,,~,~,~
+~,~,~,,~,,~,,Msm,,Mr(1x2),,,,,,Mr(1x2),,Msm,,~,,~,,~,~,~
+~,~,~,,,~,~,,CSa,Msu,,Mw,,,,Mw,,Msu,CSa,,~,~,,,~,~,~
 ,,,,,,,,CSdddaaaa,,Msk,,Mw,,Mw,,,Msh,CSddddaaaa
-trackN,trackNE,,,trackNSE,trackNSW,trackEW,,Mrsssqq(2x1),,,Msh,,,,,Msk,Mrsqq(2x1),,,trackEW,trackNSE,trackNSW,,,trackNW,trackN
-trackEW,,trackNE,,trackNW,trackSE,trackSW,,gs(1x2),gd(2x1),,gw(1x2),gx(1x2),,gx(1x2),gw(1x2),ga(2x1),,gs(1x2),,trackSE,trackSW,trackNE,,trackNW,,trackEW
-,trackNS,trackE,,trackW,trackN,trackS,,,ga(2x1),,,,,,,gd(2x1),,,,trackS,trackN,trackE,,trackW,trackNS
+~,~,,,~,~,~,,Mrsssqq(2x1),,,Msh,,,,,Msk,Mrsqq(2x1),,,~,~,~,,,~,~
+~,,~,,~,~,~,,gs(1x2),gd(2x1),,gw(1x2),gx(1x2),,gx(1x2),gw(1x2),ga(2x1),,gs(1x2),,~,~,~,,~,,~
+,~,~,,~,~,~,,,ga(2x1),,,,,,,gd(2x1),,,,~,~,~,,~,~
diff --git a/data/blueprints/library/test/ecosystem/golden/transform-construct.csv b/data/blueprints/library/test/ecosystem/golden/transform-construct.csv
new file mode 100644
index 000000000..9620c96c1
--- /dev/null
+++ b/data/blueprints/library/test/ecosystem/golden/transform-construct.csv
@@ -0,0 +1,28 @@
+#build label(construct) start(14;14)
+,trackNS,trackE,,trackW,trackS,trackN,,,,,,,,,,,,,,trackN,trackS,trackE,,trackW,trackNS
+trackEW,,trackSE,,trackSW,trackNE,trackNW,,,,,,,,,,,,,,trackNE,trackNW,trackSE,,trackSW,,trackEW
+trackS,trackSE,,,trackNSE,trackNSW,trackEW,,,,,,,,,,,,,,trackEW,trackNSE,trackNSW,,,trackSW,trackS
+
+trackN,trackNE,trackSEW,,,trackSEW,trackNEW,,,,,,,,,,,,,,trackNEW,trackSEW,,,trackSEW,trackNW,trackN
+trackE,trackSW,trackNEW,,trackNSE,,trackNSEW,,,,,,,,,,,,,,trackNSEW,,trackNSW,,trackNEW,trackSE,trackW
+trackW,trackNW,trackNS,,trackNSW,trackNSEW,,,,,,,,,,,,,,,,trackNSEW,trackNSE,,trackNS,trackNE,trackE
+
+
+,,,,,,,,,,trackrampNW,trackrampNS,trackrampN,,trackrampN,trackrampNS,trackrampNE
+,,,,,,,,,trackrampNW,,trackrampNSE,trackrampNSW,,trackrampNSE,trackrampNSW,,trackrampNE
+,,,,,,,,,trackrampEW,trackrampSEW,,trackrampNSEW,,trackrampNSEW,,trackrampSEW,trackrampEW
+,,,,,,,,,trackrampW,trackrampNEW,trackrampNSEW,,,,trackrampNSEW,trackrampNEW,trackrampE
+
+,,,,,,,,,trackrampW,trackrampSEW,trackrampNSEW,,,,trackrampNSEW,trackrampSEW,trackrampE
+,,,,,,,,,trackrampEW,trackrampNEW,,trackrampNSEW,,trackrampNSEW,,trackrampNEW,trackrampEW
+,,,,,,,,,trackrampSW,,trackrampNSE,trackrampNSW,,trackrampNSE,trackrampNSW,,trackrampSE
+,,,,,,,,,,trackrampSW,trackrampNS,trackrampS,,trackrampS,trackrampNS,trackrampSE
+
+
+trackW,trackSW,trackNS,,trackNSW,trackNSEW,,,,,,,,,,,,,,,,trackNSEW,trackNSE,,trackNS,trackSE,trackE
+trackE,trackNW,trackSEW,,trackNSE,,trackNSEW,,,,,,,,,,,,,,trackNSEW,,trackNSW,,trackSEW,trackNE,trackW
+trackS,trackSE,trackNEW,,,trackNEW,trackSEW,,,,,,,,,,,,,,trackSEW,trackNEW,,,trackNEW,trackSW,trackS
+
+trackN,trackNE,,,trackNSE,trackNSW,trackEW,,,,,,,,,,,,,,trackEW,trackNSE,trackNSW,,,trackNW,trackN
+trackEW,,trackNE,,trackNW,trackSE,trackSW,,,,,,,,,,,,,,trackSE,trackSW,trackNE,,trackNW,,trackEW
+,trackNS,trackE,,trackW,trackN,trackS,,,,,,,,,,,,,,trackS,trackN,trackE,,trackW,trackNS
diff --git a/data/blueprints/library/test/ecosystem/in/buildings-build.csv b/data/blueprints/library/test/ecosystem/in/buildings-build.csv
index 89e066e80..f48457c0a 100644
--- a/data/blueprints/library/test/ecosystem/in/buildings-build.csv
+++ b/data/blueprints/library/test/ecosystem/in/buildings-build.csv
@@ -1,33 +1,33 @@
 #build label(build)
-a,Mg,,CS,trackN
-b,Mh(1x1),S,CSa,trackS,,,,,,Mw,,,wm,,,wp
-c,Mhs(1x1),m,CSaa,trackE,,,,,,,,,,,,,,,,,D
-n,Mv,v,CSaaa,trackW,,Msu
-,Mr(1x1),j,CSaaaa,trackNS,,,,,,Mws,,,wu,,,ew
-d,Mrq(1x1),A,CSd,trackNE,,,Msk
-,Mrqq(1x1),R,CSda,trackNW
-l,Mrqqq(1x1),N,CSdaa,trackSE,,Msm,,,,we,,,wn,,,es,,,,,k
-x,Mrqqqq(1x1),~h,CSdaaa,trackSW
-H,Mrs(1x1),~a,CSdaaaa,trackEW,,,Msh
-W,Mrsq(1x1),~c,CSdd,trackNSE,,,,,,wq,,,wr,,,el
-G,Mrsqq(1x1),F,CSdda,trackNSW
-B,Mrsqqq(1x1),o(1x1),CSddaa,trackNEW,,,,,,,,,,,,,,,,,ws
-~b,Mrsqqqq(1x1),Cw,CSddaaa,trackSEW,,,,,,wM,,,wt,,,eg
-f,Mrss(1x1),Cf,CSddaaaa,trackNSEW
-h,Mrssq(1x1),Cr,CSddd,trackrampN
-r,Mrssqq(1x1),Cu,CSddda,trackrampS,,,,,,wo,,,wl,,,ea,,,,gx(1x2),gx(1x2)
-s,Mrssqqq(1x1),Cd,CSdddaa,trackrampE
-~s,Mrssqqqq(1x1),Cx,CSdddaaa,trackrampW,,,,,,,,,,,,,,gd(2x1),,gs(2x1),,ga(2x1)
-t,Mrsss(1x1),CF,CSdddaaaa,trackrampNS,,,,,,wk,,,ww,,,ek,,gd(2x1),,gs(2x1),,ga(2x1)
-gs(1x1),Mrsssq(1x1),,CSdddd,trackrampNE,,,,,,,,,,,,,,,,gw(1x2),gw(1x2)
-ga(1x1),Mrsssqq(1x1),,CSdddda,trackrampNW
-gd(1x1),Mrsssqqq(1x1),,CSddddaa,trackrampSE,,,,,,wb,,,wz,,,en
-gw(1x1),Mrsssqqqq(1x1),,CSddddaaa,trackrampSW,,,,,,,,,,,,,,Mh(2x1),,Mh(2x1),,Mhs(1x2),Mhs(1x2)
-gx(1x1),,,CSddddaaaa,trackrampEW,,,,,,,,,,,,,,Mh(2x1),,Mh(2x1)
-,,,Ts,trackrampNSE,,,,,,wc,,,wh,,,ib,,Mr(1x2),Mr(1x2),Mrs(2x1),,Mhs(1x2),Mhs(1x2)
-y,,,Tw,trackrampNSW,,,,,,,,,,,,,,,,Mrs(2x1)
-Y,,,Tl,trackrampNEW,,,,,,,,,,,,,,Mr(1x2),Mr(1x2),Mrsq(2x1),,Mrsq(2x1)
-,,,Tp,trackrampSEW,,,,,,wf,,,wy,,,ic,,,,Mrsssqqqq(2x1),,Mrsssqqqq(2x1)
-,,,Tc,trackrampNSEW
+a,Mg,,CS
+b,Mh(1x1),S,CSa,,,,,,Mw,,,wm,,,wp
+c,Mhs(1x1),m,CSaa,,,,,,,,,,,,,,,,,D
+n,Mv,v,CSaaa,,Msu
+,Mr(1x1),j,CSaaaa,,,,,,Mws,,,wu,,,ew
+d,Mrq(1x1),A,CSd,,,Msk
+,Mrqq(1x1),R,CSda
+l,Mrqqq(1x1),N,CSdaa,,Msm,,,,we,,,wn,,,es,,,,,k
+x,Mrqqqq(1x1),~h,CSdaaa
+H,Mrs(1x1),~a,CSdaaaa,,,Msh
+W,Mrsq(1x1),~c,CSdd,,,,,,wq,,,wr,,,el
+G,Mrsqq(1x1),F,CSdda
+B,Mrsqqq(1x1),o(1x1),CSddaa,,,,,,,,,,,,,,,,,ws
+~,~b,Mrsqqqq(1x1),CSddaaa,,,,,,wM,,,wt,,,eg
+~,f,Mrss(1x1),CSddaaaa
+~,h,Mrssq(1x1),CSddd
+~,r,Mrssqq(1x1),CSddda,,,,,,wo,,,wl,,,ea,,,,gx(1x2),gx(1x2)
+~,s,Mrssqqq(1x1),CSdddaa
+~,~s,Mrssqqqq(1x1),CSdddaaa,,,,,,,,,,,,,,gd(2x1),,gs(2x1),,ga(2x1)
+~,t,Mrsss(1x1),CSdddaaaa,,,,,,wk,,,ww,,,ek,,gd(2x1),,gs(2x1),,ga(2x1)
+gs(1x1),Mrsssq(1x1),,CSdddd,,,,,,,,,,,,,,,,gw(1x2),gw(1x2)
+ga(1x1),Mrsssqq(1x1),,CSdddda
+gd(1x1),Mrsssqqq(1x1),,CSddddaa,,,,,,wb,,,wz,,,en
+gw(1x1),Mrsssqqqq(1x1),,CSddddaaa,,,,,,,,,,,,,,Mh(2x1),,Mh(2x1),,Mhs(1x2),Mhs(1x2)
+gx(1x1),,,CSddddaaaa,,,,,,,,,,,,,,Mh(2x1),,Mh(2x1)
+,,,Ts,,,,,,wc,,,wh,,,ib,,Mr(1x2),Mr(1x2),Mrs(2x1),,Mhs(1x2),Mhs(1x2)
+y,,,Tw,,,,,,,,,,,,,,,,Mrs(2x1)
+Y,,,Tl,,,,,,,,,,,,,,Mr(1x2),Mr(1x2),Mrsq(2x1),,Mrsq(2x1)
+,,,Tp,,,,,,wf,,,wy,,,ic,,,,Mrsssqqqq(2x1),,Mrsssqqqq(2x1)
+,,,Tc
 ,,,TS
 ,,,,,,,,,,wv,,,wd,,,wj,,,wS
diff --git a/data/blueprints/library/test/ecosystem/in/buildings-construct.csv b/data/blueprints/library/test/ecosystem/in/buildings-construct.csv
new file mode 100644
index 000000000..e7e1d12bb
--- /dev/null
+++ b/data/blueprints/library/test/ecosystem/in/buildings-construct.csv
@@ -0,0 +1,21 @@
+#build label(construct)
+
+
+
+
+
+
+
+
+
+
+
+
+
+Cw
+Cf
+Cr
+Cu
+Cd
+Cx
+CF
diff --git a/data/blueprints/library/test/ecosystem/in/transform-build.csv b/data/blueprints/library/test/ecosystem/in/transform-build.csv
index fdc2e18ce..7907220e7 100644
--- a/data/blueprints/library/test/ecosystem/in/transform-build.csv
+++ b/data/blueprints/library/test/ecosystem/in/transform-build.csv
@@ -7,21 +7,8 @@ Mw,,,Msh,CSddddaaaa
 Mhs(1x2),,,Msm
 ,,Mws,,Msu
 Mh(2x1),,,Mws
-#build label(outer) hidden()
-trackN,trackS,trackE,,trackW,trackNS
-trackNE,trackNW,trackSE,,trackSW
-trackEW,trackNSE,trackNSW
-
-trackNEW,trackSEW
-trackNSEW
-#build label(inner) hidden()
-trackrampN,trackrampNS,trackrampNE
-trackrampNSE,trackrampNSW
-trackrampNSEW
 #meta label(chunk) hidden()
 /big shift(1 -13)
-/outer shift(7 -13)
-/inner shift(1 -4)
 #meta label(build)
 /chunk
 /chunk transform(cw)
diff --git a/data/blueprints/library/test/ecosystem/in/transform-construct.csv b/data/blueprints/library/test/ecosystem/in/transform-construct.csv
new file mode 100644
index 000000000..95717afa8
--- /dev/null
+++ b/data/blueprints/library/test/ecosystem/in/transform-construct.csv
@@ -0,0 +1,23 @@
+#build label(outer) hidden()
+trackN,trackS,trackE,,trackW,trackNS
+trackNE,trackNW,trackSE,,trackSW
+trackEW,trackNSE,trackNSW
+
+trackNEW,trackSEW
+trackNSEW
+#build label(inner) hidden()
+trackrampN,trackrampNS,trackrampNE
+trackrampNSE,trackrampNSW
+trackrampNSEW
+#meta label(chunk) hidden()
+/outer shift(7 -13)
+/inner shift(1 -4)
+#meta label(construct)
+/chunk
+/chunk transform(cw)
+/chunk transform(cw cw)
+/chunk transform(ccw)
+/chunk transform(fliph)
+/chunk transform(flipv)
+/chunk transform(cw flipv)
+/chunk transform(ccw flipv)
diff --git a/test/quickfort/ecosystem.lua b/test/quickfort/ecosystem.lua
index d55bc2389..b59b8909d 100644
--- a/test/quickfort/ecosystem.lua
+++ b/test/quickfort/ecosystem.lua
@@ -327,6 +327,7 @@ function test.end_to_end()
         do_dig_phase(phases.dig, area, spec)
         if phases.smooth then do_dig_phase(phases.smooth, area, spec) end
         if phases.carve then do_dig_phase(phases.carve, area, spec) end
+        if phases.construct then do_phase(phases.construct, area, spec) end
         if phases.build then do_phase(phases.build, area, spec) end
         if phases.place then do_phase(phases.place, area, spec) end
         if phases.zone then do_phase(phases.zone, area, spec) end

From d887bee0a4e4f1358df34beac488706a065e0c5f Mon Sep 17 00:00:00 2001
From: Josh Cooper <cooper.s.josh@outlook.com>
Date: Wed, 12 Oct 2022 15:46:11 -0700
Subject: [PATCH 765/854] Removes lingering diffs from World module

---
 library/include/modules/World.h | 1 -
 library/modules/World.cpp       | 6 ------
 2 files changed, 7 deletions(-)

diff --git a/library/include/modules/World.h b/library/include/modules/World.h
index 4cba97692..659786ff5 100644
--- a/library/include/modules/World.h
+++ b/library/include/modules/World.h
@@ -35,7 +35,6 @@ distribution.
 #include "Module.h"
 #include "modules/Persistence.h"
 #include <ostream>
-#include <unordered_set>
 
 #include "DataDefs.h"
 
diff --git a/library/modules/World.cpp b/library/modules/World.cpp
index 3f6ccb2c7..12b339e95 100644
--- a/library/modules/World.cpp
+++ b/library/modules/World.cpp
@@ -28,7 +28,6 @@ distribution.
 #include <string>
 #include <vector>
 #include <map>
-#include <unordered_set>
 #include <cstring>
 using namespace std;
 
@@ -52,11 +51,6 @@ using namespace std;
 #include "df/map_block.h"
 #include "df/block_square_event_world_constructionst.h"
 #include "df/viewscreen_legendsst.h"
-#include "df/d_init.h"
-#include "df/viewscreen_dwarfmodest.h"
-#include "df/ui.h"
-#include "VTableInterpose.h"
-#include "PluginManager.h"
 
 using namespace DFHack;
 using namespace df::enums;

From 80d993e7343a2b4fd6d714bedcdfd895811963cc Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Wed, 12 Oct 2022 16:01:54 -0700
Subject: [PATCH 766/854] split rooms phase from query and record names

---
 docs/plugins/blueprint.rst   |  5 +-
 plugins/blueprint.cpp        | 93 +++++++++++++++++++++++++++---------
 plugins/lua/blueprint.lua    |  1 +
 test/quickfort/ecosystem.lua |  1 +
 4 files changed, 76 insertions(+), 24 deletions(-)

diff --git a/docs/plugins/blueprint.rst b/docs/plugins/blueprint.rst
index bde5bb77e..262a3bd5b 100644
--- a/docs/plugins/blueprint.rst
+++ b/docs/plugins/blueprint.rst
@@ -77,7 +77,10 @@ phases; just separate them with a space.
 ``zone``
     Generate quickfort ``#zone`` blueprints for designating zones.
 ``query``
-    Generate quickfort ``#query`` blueprints for configuring rooms.
+    Generate quickfort ``#query`` blueprints for configuring stockpiles and
+    naming buildings.
+``rooms``
+    Generate quickfort ``#query`` blueprints for defining rooms.
 
 If no phases are specified, phases are autodetected. For example, a ``#place``
 blueprint will be created only if there are stockpiles in the blueprint area.
diff --git a/plugins/blueprint.cpp b/plugins/blueprint.cpp
index 3dd912d28..bb4d03d32 100644
--- a/plugins/blueprint.cpp
+++ b/plugins/blueprint.cpp
@@ -6,6 +6,7 @@
  */
 
 #include <algorithm>
+#include <regex>
 #include <sstream>
 #include <unordered_map>
 
@@ -92,6 +93,7 @@ struct blueprint_options {
     bool place = false;
     bool zone = false;
     bool query = false;
+    bool rooms = false;
 
     static struct_identity _identity;
 };
@@ -116,6 +118,7 @@ static const struct_field_info blueprint_options_fields[] = {
     { struct_field_info::PRIMITIVE, "place",                  offsetof(blueprint_options, place),                 &df::identity_traits<bool>::identity,    0, 0 },
     { struct_field_info::PRIMITIVE, "zone",                   offsetof(blueprint_options, zone),                  &df::identity_traits<bool>::identity,    0, 0 },
     { struct_field_info::PRIMITIVE, "query",                  offsetof(blueprint_options, query),                 &df::identity_traits<bool>::identity,    0, 0 },
+    { struct_field_info::PRIMITIVE, "rooms",                  offsetof(blueprint_options, rooms),                 &df::identity_traits<bool>::identity,    0, 0 },
     { struct_field_info::END }
 };
 struct_identity blueprint_options::_identity(sizeof(blueprint_options), &df::allocator_fn<blueprint_options>, NULL, "blueprint_options", NULL, blueprint_options_fields);
@@ -134,11 +137,36 @@ DFhackCExport command_result plugin_shutdown(color_ostream &) {
     return CR_OK;
 }
 
+struct blueprint_processor;
 struct tile_context {
+    blueprint_processor *processor;
     bool pretty = false;
     df::building* b = NULL;
 };
 
+typedef vector<const char *> bp_row;     // index is x coordinate
+typedef map<int16_t, bp_row> bp_area;    // key is y coordinate
+typedef map<int16_t, bp_area> bp_volume; // key is z coordinate
+
+typedef const char * (get_tile_fn)(const df::coord &pos,
+                                   const tile_context &ctx);
+typedef void (init_ctx_fn)(const df::coord &pos, tile_context &ctx);
+
+struct blueprint_processor {
+    bp_volume mapdata;
+    const string mode;
+    const string phase;
+    const bool force_create;
+    get_tile_fn * const get_tile;
+    init_ctx_fn * const init_ctx;
+    std::set<df::building *> seen;
+    blueprint_processor(const string &mode, const string &phase,
+                        bool force_create, get_tile_fn *get_tile,
+                        init_ctx_fn *init_ctx)
+        : mode(mode), phase(phase), force_create(force_create),
+          get_tile(get_tile), init_ctx(init_ctx) { }
+};
+
 // global engravings cache, cleared when the string cache is cleared
 struct PosHash {
     size_t operator()(const df::coord &c) const {
@@ -974,7 +1002,45 @@ static const char * get_tile_zone(const df::coord &pos,
     return add_expansion_syntax(zone, get_zone_keys(zone));
 }
 
-static const char * get_tile_query(const df::coord &, const tile_context &ctx) {
+static string csv_sanitize(const string &str) {
+    static const std::regex pattern("\"");
+    static const string replacement("\"\"");
+
+    return std::regex_replace(str, pattern, replacement);
+}
+
+static const char * get_tile_query(const df::coord &pos,
+                                   const tile_context &ctx) {
+    string bld_name, zone_name;
+    auto & seen = ctx.processor->seen;
+
+    if (ctx.b && !seen.count(ctx.b)) {
+        bld_name = ctx.b->name;
+        seen.emplace(ctx.b);
+    }
+
+    vector<df::building_civzonest*> civzones;
+    if (Buildings::findCivzonesAt(&civzones, pos)) {
+        auto civzone = civzones.back();
+        if (!seen.count(civzone)) {
+            zone_name = civzone->name;
+            seen.emplace(civzone);
+        }
+    }
+
+    if (!bld_name.size() && !zone_name.size())
+        return NULL;
+
+    std::ostringstream str;
+    if (bld_name.size())
+        str << "{givename name=\"" << csv_sanitize(bld_name) << "\"}";
+    if (zone_name.size())
+        str << "{namezone name=\"" << csv_sanitize(zone_name) << "\"}";
+
+    return cache(str);
+}
+
+static const char * get_tile_rooms(const df::coord &, const tile_context &ctx) {
     if (!ctx.b || !ctx.b->is_room)
         return NULL;
     return "r+";
@@ -1027,28 +1093,6 @@ static bool get_filename(string &fname,
     return true;
 }
 
-typedef vector<const char *> bp_row;     // index is x coordinate
-typedef map<int16_t, bp_row> bp_area;    // key is y coordinate
-typedef map<int16_t, bp_area> bp_volume; // key is z coordinate
-
-typedef const char * (get_tile_fn)(const df::coord &pos,
-                                   const tile_context &ctx);
-typedef void (init_ctx_fn)(const df::coord &pos, tile_context &ctx);
-
-struct blueprint_processor {
-    bp_volume mapdata;
-    const string mode;
-    const string phase;
-    const bool force_create;
-    get_tile_fn * const get_tile;
-    init_ctx_fn * const init_ctx;
-    blueprint_processor(const string &mode, const string &phase,
-                        bool force_create, get_tile_fn *get_tile,
-                        init_ctx_fn *init_ctx)
-        : mode(mode), phase(phase), force_create(force_create),
-          get_tile(get_tile), init_ctx(init_ctx) { }
-};
-
 static void write_minimal(ofstream &ofile, const blueprint_options &opts,
                           const bp_volume &mapdata) {
     if (mapdata.begin() == mapdata.end())
@@ -1194,6 +1238,8 @@ static bool do_transform(color_ostream &out,
     add_processor(processors, opts, "zone", "zone", opts.zone, get_tile_zone);
     add_processor(processors, opts, "query", "query", opts.query,
                   get_tile_query, ensure_building);
+    add_processor(processors, opts, "query", "rooms", opts.rooms,
+                  get_tile_rooms, ensure_building);
 
     if (processors.empty()) {
         out.printerr("no phases requested! nothing to do!\n");
@@ -1212,6 +1258,7 @@ static bool do_transform(color_ostream &out,
                 tile_context ctx;
                 ctx.pretty = pretty;
                 for (blueprint_processor &processor : processors) {
+                    ctx.processor = &processor;
                     if (processor.init_ctx)
                         processor.init_ctx(pos, ctx);
                     const char *tile_str = processor.get_tile(pos, ctx);
diff --git a/plugins/lua/blueprint.lua b/plugins/lua/blueprint.lua
index 564962448..6fe869d3b 100644
--- a/plugins/lua/blueprint.lua
+++ b/plugins/lua/blueprint.lua
@@ -11,6 +11,7 @@ local valid_phase_list = {
     'place',
     'zone',
     'query',
+    'rooms',
 }
 valid_phases = utils.invert(valid_phase_list)
 
diff --git a/test/quickfort/ecosystem.lua b/test/quickfort/ecosystem.lua
index b59b8909d..27dddc5d5 100644
--- a/test/quickfort/ecosystem.lua
+++ b/test/quickfort/ecosystem.lua
@@ -332,6 +332,7 @@ function test.end_to_end()
         if phases.place then do_phase(phases.place, area, spec) end
         if phases.zone then do_phase(phases.zone, area, spec) end
         if phases.query then do_phase(phases.query, area, spec) end
+        if phases.rooms then do_phase(phases.rooms, area, spec) end
 
         -- run any extra commands, if defined by the blueprint spec
         if spec.extra_fn then

From b03911945d26e63b0f576f121429b5f79624ca12 Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Wed, 12 Oct 2022 16:03:03 -0700
Subject: [PATCH 767/854] update changelog

---
 docs/changelog.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/changelog.txt b/docs/changelog.txt
index 37f3a1dd1..70e144f3f 100644
--- a/docs/changelog.txt
+++ b/docs/changelog.txt
@@ -40,6 +40,7 @@ changelog.txt uses a syntax similar to RST, with a few special sequences:
 ## Misc Improvements
 - `blueprint`: new ``--smooth`` option for recording all smoothed floors and walls instead of just the ones that require smoothing for later carving
 - `blueprint`: record built constructions in blueprints
+- `blueprint`: record stockpile/building/zone names in blueprints
 - `ls`: indent tag listings and wrap them in the right column for better readability
 - `ls`: new ``--exclude`` option for hiding matched scripts from the output.  this can be especially useful for modders who don't want their mod scripts to be included in ``ls`` output.
 - `digtype`: new ``-z`` option for digtype to restrict designations to the current z-level and down

From f411ba76ba9c161df755cbc03c726c19520fee32 Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Wed, 12 Oct 2022 16:33:06 -0700
Subject: [PATCH 768/854] record accurate room sizes in blueprints

---
 docs/changelog.txt    |  1 +
 plugins/blueprint.cpp | 24 +++++++++++++++++++++++-
 2 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/docs/changelog.txt b/docs/changelog.txt
index 70e144f3f..71d843764 100644
--- a/docs/changelog.txt
+++ b/docs/changelog.txt
@@ -41,6 +41,7 @@ changelog.txt uses a syntax similar to RST, with a few special sequences:
 - `blueprint`: new ``--smooth`` option for recording all smoothed floors and walls instead of just the ones that require smoothing for later carving
 - `blueprint`: record built constructions in blueprints
 - `blueprint`: record stockpile/building/zone names in blueprints
+- `blueprint`: record room sizes in blueprints
 - `ls`: indent tag listings and wrap them in the right column for better readability
 - `ls`: new ``--exclude`` option for hiding matched scripts from the output.  this can be especially useful for modders who don't want their mod scripts to be included in ``ls`` output.
 - `digtype`: new ``-z`` option for digtype to restrict designations to the current z-level and down
diff --git a/plugins/blueprint.cpp b/plugins/blueprint.cpp
index bb4d03d32..2f42e2798 100644
--- a/plugins/blueprint.cpp
+++ b/plugins/blueprint.cpp
@@ -1043,7 +1043,29 @@ static const char * get_tile_query(const df::coord &pos,
 static const char * get_tile_rooms(const df::coord &, const tile_context &ctx) {
     if (!ctx.b || !ctx.b->is_room)
         return NULL;
-    return "r+";
+
+    // get the maximum distance from the center of the building
+    df::building_extents &room = ctx.b->room;
+    int32_t x1 = room.x;
+    int32_t x2 = room.x + room.width - 1;
+    int32_t y1 = room.y;
+    int32_t y2 = room.y + room.height - 1;
+
+    int32_t dimx = std::max(ctx.b->centerx - x1, x2 - ctx.b->centerx);
+    int32_t dimy = std::max(ctx.b->centery - y1, y2 - ctx.b->centery);
+    int32_t max_dim = std::max(dimx, dimy);
+
+    switch (max_dim) {
+        case 0: return "r---&";
+        case 1: return "r--&";
+        case 2: return "r-&";
+        case 3: return "r&";
+        case 4: return "r+&";
+    }
+
+    std::ostringstream str;
+    str << "r{+ " << (max_dim - 3) << "}&";
+    return cache(str);
 }
 
 static bool create_output_dir(color_ostream &out,

From c52138b16874e59665dd75261132ca27167d0194 Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Wed, 12 Oct 2022 17:42:36 -0700
Subject: [PATCH 769/854] generate meta blueprints

---
 docs/changelog.txt           |  1 +
 docs/plugins/blueprint.rst   | 10 ++++--
 plugins/blueprint.cpp        | 70 ++++++++++++++++++++++++++++++++++--
 plugins/lua/blueprint.lua    | 17 +++++++++
 test/plugins/blueprint.lua   |  6 ++++
 test/quickfort/ecosystem.lua |  2 +-
 6 files changed, 100 insertions(+), 6 deletions(-)

diff --git a/docs/changelog.txt b/docs/changelog.txt
index 71d843764..c2173d5e1 100644
--- a/docs/changelog.txt
+++ b/docs/changelog.txt
@@ -42,6 +42,7 @@ changelog.txt uses a syntax similar to RST, with a few special sequences:
 - `blueprint`: record built constructions in blueprints
 - `blueprint`: record stockpile/building/zone names in blueprints
 - `blueprint`: record room sizes in blueprints
+- `blueprint`: generate meta blueprints to reduce the number of blueprints you have to apply
 - `ls`: indent tag listings and wrap them in the right column for better readability
 - `ls`: new ``--exclude`` option for hiding matched scripts from the output.  this can be especially useful for modders who don't want their mod scripts to be included in ``ls`` output.
 - `digtype`: new ``-z`` option for digtype to restrict designations to the current z-level and down
diff --git a/docs/plugins/blueprint.rst b/docs/plugins/blueprint.rst
index 262a3bd5b..3a5e5a0c5 100644
--- a/docs/plugins/blueprint.rst
+++ b/docs/plugins/blueprint.rst
@@ -99,8 +99,14 @@ Options
     Select the output format of the generated files. See the `Output formats`_
     section below for options. If not specified, the output format defaults to
     "minimal", which will produce a small, fast ``.csv`` file.
-``-h``, ``--help``
-    Show command help text.
+``--nometa``
+    `Meta blueprints <quickfort-meta>` let you apply all blueprints that can be
+    replayed at the same time (without unpausing the game) with a single
+    command. This usually reduces the number of `quickfort` commands you need to
+    run to rebuild your fort from about 6 to 2 or 3. If you would rather just
+    have the low-level blueprints, this flag will prevent meta blueprints from
+    being generated and any low-level blueprints from being
+    `hidden <quickfort-hidden>` from the ``quickfort list`` command.
 ``-s``, ``--playback-start <x>,<y>,<comment>``
     Specify the column and row offsets (relative to the upper-left corner of the
     blueprint, which is ``1,1``) where the player should put the cursor when the
diff --git a/plugins/blueprint.cpp b/plugins/blueprint.cpp
index 2f42e2798..b08f4d074 100644
--- a/plugins/blueprint.cpp
+++ b/plugins/blueprint.cpp
@@ -14,6 +14,7 @@
 #include "DataDefs.h"
 #include "DataFuncs.h"
 #include "DataIdentity.h"
+#include "Debug.h"
 #include "LuaTools.h"
 #include "PluginManager.h"
 #include "TileTypes.h"
@@ -47,6 +48,10 @@ using namespace DFHack;
 DFHACK_PLUGIN("blueprint");
 REQUIRE_GLOBAL(world);
 
+namespace DFHack {
+    DBG_DECLARE(blueprint,log);
+}
+
 struct blueprint_options {
     // whether to display help
     bool help = false;
@@ -59,6 +64,9 @@ struct blueprint_options {
     // for it.
     string format;
 
+    // whether to skip generating meta blueprints
+    bool nometa = false;
+
     // offset and comment to write in the quickfort start() modeline marker
     // if not set, coordinates are set to 0 and the comment will be empty
     df::coord2d playback_start = df::coord2d(0, 0);
@@ -101,6 +109,7 @@ static const struct_field_info blueprint_options_fields[] = {
     { struct_field_info::PRIMITIVE, "help",                   offsetof(blueprint_options, help),                  &df::identity_traits<bool>::identity,    0, 0 },
     { struct_field_info::SUBSTRUCT, "start",                  offsetof(blueprint_options, start),                 &df::coord::_identity,                   0, 0 },
     { struct_field_info::PRIMITIVE, "format",                 offsetof(blueprint_options, format),                 df::identity_traits<string>::get(),     0, 0 },
+    { struct_field_info::PRIMITIVE, "nometa",                 offsetof(blueprint_options, nometa),                &df::identity_traits<bool>::identity,    0, 0 },
     { struct_field_info::SUBSTRUCT, "playback_start",         offsetof(blueprint_options, playback_start),        &df::coord2d::_identity,                 0, 0 },
     { struct_field_info::PRIMITIVE, "playback_start_comment", offsetof(blueprint_options, playback_start_comment), df::identity_traits<string>::get(),     0, 0 },
     { struct_field_info::PRIMITIVE, "split_strategy",         offsetof(blueprint_options, split_strategy),         df::identity_traits<string>::get(),     0, 0 },
@@ -1115,6 +1124,32 @@ static bool get_filename(string &fname,
     return true;
 }
 
+// returns true if we could interface with lua and could verify that the given
+// phase is a meta phase
+static bool is_meta_phase(color_ostream &out,
+                          blueprint_options opts, // copy because we can't const
+                          const string &phase) {
+    auto L = Lua::Core::State;
+    Lua::StackUnwinder top(L);
+
+    if (!lua_checkstack(L, 3) ||
+        !Lua::PushModulePublic(
+            out, L, "plugins.blueprint", "is_meta_phase")) {
+        out.printerr("Failed to load blueprint Lua code\n");
+        return false;
+    }
+
+    Lua::Push(L, &opts);
+    Lua::Push(L, phase);
+
+    if (!Lua::SafeCall(out, L, 2, 1)) {
+        out.printerr("Failed Lua call to is_meta_phase\n");
+        return false;
+    }
+
+    return lua_toboolean(L, -1);
+}
+
 static void write_minimal(ofstream &ofile, const blueprint_options &opts,
                           const bp_volume &mapdata) {
     if (mapdata.begin() == mapdata.end())
@@ -1171,8 +1206,8 @@ static void write_pretty(ofstream &ofile, const blueprint_options &opts,
     }
 }
 
-static string get_modeline(const blueprint_options &opts, const string &mode,
-                           const string &phase) {
+static string get_modeline(color_ostream &out, const blueprint_options &opts,
+                           const string &mode, const string &phase) {
     std::ostringstream modeline;
     modeline << "#" << mode << " label(" << phase << ")";
     if (opts.playback_start.x > 0) {
@@ -1183,6 +1218,8 @@ static string get_modeline(const blueprint_options &opts, const string &mode,
         }
         modeline << ")";
     }
+    if (is_meta_phase(out, opts, phase))
+        modeline << " hidden()";
 
     return modeline.str();
 }
@@ -1199,7 +1236,7 @@ static bool write_blueprint(color_ostream &out,
         output_files[fname] = new ofstream(fname, ofstream::trunc);
 
     ofstream &ofile = *output_files[fname];
-    ofile << get_modeline(opts, processor.mode, processor.phase) << endl;
+    ofile << get_modeline(out, opts, processor.mode, processor.phase) << endl;
 
     if (pretty)
         write_pretty(ofile, opts, processor.mapdata);
@@ -1209,6 +1246,27 @@ static bool write_blueprint(color_ostream &out,
     return true;
 }
 
+static void write_meta_blueprint(color_ostream &out,
+                                 std::map<string, ofstream*> &output_files,
+                                 const blueprint_options &opts,
+                                 const std::vector<string> & meta_phases) {
+    string fname;
+    get_filename(fname, out, opts, meta_phases.front());
+    ofstream &ofile = *output_files[fname];
+
+    ofile << "#meta label(";
+    for (string phase : meta_phases) {
+        ofile << phase;
+        if (phase != meta_phases.back())
+            ofile << "_";
+    }
+    ofile << ")" << endl;
+
+    for (string phase : meta_phases) {
+        ofile << "/" << phase << endl;
+    }
+}
+
 static void ensure_building(const df::coord &pos, tile_context &ctx) {
     if (ctx.b)
         return;
@@ -1301,12 +1359,18 @@ static bool do_transform(color_ostream &out,
     }
 
     std::map<string, ofstream*> output_files;
+    std::vector<string> meta_phases;
     for (blueprint_processor &processor : processors) {
         if (processor.mapdata.empty() && !processor.force_create)
             continue;
+        if (is_meta_phase(out, opts, processor.phase))
+            meta_phases.push_back(processor.phase);
         if (!write_blueprint(out, output_files, opts, processor, pretty))
             break;
     }
+    if (meta_phases.size()) {
+        write_meta_blueprint(out, output_files, opts, meta_phases);
+    }
 
     for (auto &it : output_files) {
         filenames.push_back(it.first);
diff --git a/plugins/lua/blueprint.lua b/plugins/lua/blueprint.lua
index 6fe869d3b..e3b36d9fe 100644
--- a/plugins/lua/blueprint.lua
+++ b/plugins/lua/blueprint.lua
@@ -15,6 +15,14 @@ local valid_phase_list = {
 }
 valid_phases = utils.invert(valid_phase_list)
 
+local meta_phase_list = {
+    'build',
+    'place',
+    'zone',
+    'query',
+}
+meta_phases = utils.invert(meta_phase_list)
+
 local valid_formats_list = {
     'minimal',
     'pretty',
@@ -123,6 +131,7 @@ local function process_args(opts, args)
             {'f', 'format', hasArg=true,
              handler=function(optarg) parse_format(opts, optarg) end},
             {'h', 'help', handler=function() opts.help = true end},
+            {nil, 'nometa', handler=function() opts.nometa = true end},
             {'s', 'playback-start', hasArg=true,
              handler=function(optarg) parse_start(opts, optarg) end},
             {nil, 'smooth', handler=function() opts.smooth = true end},
@@ -185,6 +194,11 @@ function parse_commandline(opts, ...)
     parse_positionals(opts, positionals, depth and 4 or 3)
 end
 
+function is_meta_phase(opts, phase)
+    -- this is called directly by cpp so ensure we return a boolean, not nil
+    return not opts.nometa and meta_phases[phase] or false
+end
+
 -- returns the name of the output file for the given context
 function get_filename(opts, phase)
     local fullname = 'blueprints/' .. opts.name
@@ -197,6 +211,9 @@ function get_filename(opts, phase)
         fullname = fullname .. basename
     end
     if opts.split_strategy == 'phase' then
+        if is_meta_phase(opts, phase) then
+            phase = 'meta'
+        end
         return ('%s-%s.csv'):format(fullname, phase)
     end
     -- no splitting
diff --git a/test/plugins/blueprint.lua b/test/plugins/blueprint.lua
index a19d519b8..73ec33eda 100644
--- a/test/plugins/blueprint.lua
+++ b/test/plugins/blueprint.lua
@@ -20,6 +20,12 @@ function test.parse_gui_commandline()
     b.parse_gui_commandline(opts, {'-h'})
     expect.table_eq({help=true, format='minimal', split_strategy='none'}, opts)
 
+    opts = {}
+    b.parse_gui_commandline(opts, {'--nometa'})
+    expect.table_eq({auto_phase=true, format='minimal', split_strategy='none',
+                     name='blueprint', nometa=true},
+                    opts)
+
     opts = {}
     mock.patch(dfhack.maps, 'isValidTilePos', mock.func(true),
                function()
diff --git a/test/quickfort/ecosystem.lua b/test/quickfort/ecosystem.lua
index 27dddc5d5..05f531e2e 100644
--- a/test/quickfort/ecosystem.lua
+++ b/test/quickfort/ecosystem.lua
@@ -244,7 +244,7 @@ end
 local function run_blueprint(basename, spec, pos)
     local args = {tostring(spec.width), tostring(spec.height),
                   tostring(-spec.depth), output_dir..basename,
-                  get_cursor_arg(pos), '-tphase'}
+                  get_cursor_arg(pos), '-tphase', '--nometa'}
     local playback_start_arg = get_playback_start_arg(spec.start)
     if playback_start_arg then
         table.insert(args, playback_start_arg)

From b4986aad97f73c6f961874d6543001af1f9e08cf Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Wed, 12 Oct 2022 17:49:37 -0700
Subject: [PATCH 770/854] create meta bp only if it will reduce the bp count

---
 plugins/blueprint.cpp | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/plugins/blueprint.cpp b/plugins/blueprint.cpp
index b08f4d074..361aaa1ca 100644
--- a/plugins/blueprint.cpp
+++ b/plugins/blueprint.cpp
@@ -1285,7 +1285,7 @@ static void add_processor(vector<blueprint_processor> &processors,
 
 static bool do_transform(color_ostream &out,
                          const df::coord &start, const df::coord &end,
-                         const blueprint_options &opts,
+                         blueprint_options &opts,
                          vector<string> &filenames) {
     // empty map instances to pass to emplace() below
     static const bp_area EMPTY_AREA;
@@ -1358,17 +1358,24 @@ static bool do_transform(color_ostream &out,
         }
     }
 
-    std::map<string, ofstream*> output_files;
     std::vector<string> meta_phases;
     for (blueprint_processor &processor : processors) {
         if (processor.mapdata.empty() && !processor.force_create)
             continue;
         if (is_meta_phase(out, opts, processor.phase))
             meta_phases.push_back(processor.phase);
+    }
+    if (meta_phases.size() <= 1)
+        opts.nometa = true;
+
+    std::map<string, ofstream*> output_files;
+    for (blueprint_processor &processor : processors) {
+        if (processor.mapdata.empty() && !processor.force_create)
+            continue;
         if (!write_blueprint(out, output_files, opts, processor, pretty))
             break;
     }
-    if (meta_phases.size()) {
+    if (!opts.nometa) {
         write_meta_blueprint(out, output_files, opts, meta_phases);
     }
 

From e2953a840e3f4cdf89015d167d1f2d2c4bef2d15 Mon Sep 17 00:00:00 2001
From: DFHack-Urist via GitHub Actions
 <63161697+DFHack-Urist@users.noreply.github.com>
Date: Thu, 13 Oct 2022 07:33:58 +0000
Subject: [PATCH 771/854] Auto-update submodules

scripts: master
---
 scripts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts b/scripts
index 937cf27f9..c297cb6ea 160000
--- a/scripts
+++ b/scripts
@@ -1 +1 @@
-Subproject commit 937cf27f9b41301be6df0fe1d75d77b6f089f688
+Subproject commit c297cb6ea702213bfc22e2cdef47e580cff84f2b

From 2c9ce5f31612f9d5fc1c52088254cdbf96c671fb Mon Sep 17 00:00:00 2001
From: Josh Cooper <cooper.s.josh@outlook.com>
Date: Thu, 13 Oct 2022 11:52:39 -0700
Subject: [PATCH 772/854] Includes pause.h in spectate's cmake

as to.. "changes to the header file will trigger recompliation"
---
 plugins/spectate/CMakeLists.txt | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/plugins/spectate/CMakeLists.txt b/plugins/spectate/CMakeLists.txt
index 5ba1ed9cf..15e5cb172 100644
--- a/plugins/spectate/CMakeLists.txt
+++ b/plugins/spectate/CMakeLists.txt
@@ -1,8 +1,11 @@
 
 project(spectate)
 
+set_source_files_properties(pause.h PROPERTIES HEADER_FILE_ONLY TRUE)
+
 SET(SOURCES
         spectate.cpp
+        pause.h
         pause.cpp)
 
 dfhack_plugin(${PROJECT_NAME} ${SOURCES} LINK_LIBRARIES lua)

From 880e9b34ef9e58704eaa5a86c53a02f16078d503 Mon Sep 17 00:00:00 2001
From: Josh Cooper <cooper.s.josh@outlook.com>
Date: Thu, 13 Oct 2022 11:52:56 -0700
Subject: [PATCH 773/854] Removes disable usage

---
 docs/plugins/spectate.rst | 1 -
 1 file changed, 1 deletion(-)

diff --git a/docs/plugins/spectate.rst b/docs/plugins/spectate.rst
index eea85d3da..51c1eaf45 100644
--- a/docs/plugins/spectate.rst
+++ b/docs/plugins/spectate.rst
@@ -11,7 +11,6 @@ Usage
 ::
 
     enable spectate
-    disable spectate
     spectate <option> <value>
 
 

From c9165f8999a5f5d9865977074fe09b8e204c909c Mon Sep 17 00:00:00 2001
From: Josh Cooper <cooper.s.josh@outlook.com>
Date: Thu, 13 Oct 2022 11:57:05 -0700
Subject: [PATCH 774/854] Adds the pause.h World::Update() to onupdate, to keep
 settings locked

---
 plugins/spectate/spectate.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/plugins/spectate/spectate.cpp b/plugins/spectate/spectate.cpp
index 1148e26a4..bab789454 100644
--- a/plugins/spectate/spectate.cpp
+++ b/plugins/spectate/spectate.cpp
@@ -149,6 +149,8 @@ DFhackCExport command_result plugin_onstatechange(color_ostream &out, state_chan
 }
 
 DFhackCExport command_result plugin_onupdate(color_ostream &out) {
+    // keeps announcement pause settings locked
+    World::Update(); // from pause.h
     if (lock_collision) {
         if (unpause_enabled) {
             // player asked for auto-unpause enabled

From 5c785d4bd75c0738e86ca9defceccbf160d0e04a Mon Sep 17 00:00:00 2001
From: Josh Cooper <cooper.s.josh@outlook.com>
Date: Thu, 13 Oct 2022 11:57:25 -0700
Subject: [PATCH 775/854] Rewords spectate changelog entries

---
 docs/changelog.txt | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/docs/changelog.txt b/docs/changelog.txt
index 7bb4bd9c7..ed3ab4f02 100644
--- a/docs/changelog.txt
+++ b/docs/changelog.txt
@@ -44,10 +44,10 @@ changelog.txt uses a syntax similar to RST, with a few special sequences:
 - UX: List widgets now have mouse-interactive scrollbars
 - UX: You can now hold down the mouse button on a scrollbar to make it scroll multiple times.
 - UX: You can now drag the scrollbar to scroll to a specific spot
-- `spectate`: ``spectate auto-unpause`` is a new feature that will auto-dismiss pause events when enabled. This does not affect the player's ability to pause at a whim.
-- `spectate`: ``spectate auto-disengage`` is a new feature that will auto-disengage the plugin when the player interacts with the game while unpaused
-- `spectate`: ``spectate focus-jobs`` is a new feature that allows the plugin to not always follow a job, so it can trail a dwarf after they finish a job
-- `spectate`: ``spectate tick-threshold`` is a new feature that allows the player to change how long to follow a dwarf
+- `spectate`: new ``auto-unpause`` option for auto-dismissal of announcement pause events (e.g. sieges).
+- `spectate`: new ``auto-disengage`` option for auto-disengagement of plugin through player interaction whilst unpaused.
+- `spectate`: new ``focus-jobs`` option for following a dwarf after their job has finished (when disabled).
+- `spectate`: new ``tick-threshold``, option for specifying the change interval (maximum follow time when focus-jobs is enabled)
 - `spectate`: added persistent configuration of the plugin settings
 
 ## Documentation

From 0b9b05e488e319fe7993464e3416dcfa8fad7525 Mon Sep 17 00:00:00 2001
From: Tachytaenius <henryfthomson@gmail.com>
Date: Thu, 13 Oct 2022 20:51:01 +0100
Subject: [PATCH 776/854] Add changelog entries

---
 docs/changelog.txt | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/docs/changelog.txt b/docs/changelog.txt
index f9b7accc5..4068edb36 100644
--- a/docs/changelog.txt
+++ b/docs/changelog.txt
@@ -44,13 +44,17 @@ changelog.txt uses a syntax similar to RST, with a few special sequences:
 - UX: List widgets now have mouse-interactive scrollbars
 - UX: You can now hold down the mouse button on a scrollbar to make it scroll multiple times.
 - UX: You can now drag the scrollbar to scroll to a specific spot
+- Constructions module: ``findAtTile`` now uses a binary search intead of a linear search.
 
 ## Documentation
 
 ## API
+- Constructions module: added ``insert()`` to insert constructions into the game's sorted list.
 
 ## Lua
 - ``widgets.Scrollbar``: new scrollbar widget that can be paired with an associated scrollable widget. Integrated with ``widgets.Label`` and ``widgets.List``.
+- ``dfhack.constructions.findAtTile()``: exposed preexisting function to Lua.
+- ``dfhack.constructions.insert()``: exposed new function to Lua.
 
 # 0.47.05-r7
 

From c238b7c651fe9a4ee1aa48dfebc37e2f21e1712c Mon Sep 17 00:00:00 2001
From: DFHack-Urist via GitHub Actions
 <63161697+DFHack-Urist@users.noreply.github.com>
Date: Fri, 14 Oct 2022 03:03:32 +0000
Subject: [PATCH 777/854] Auto-update submodules

scripts: master
---
 scripts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts b/scripts
index c297cb6ea..6f0d7ea22 160000
--- a/scripts
+++ b/scripts
@@ -1 +1 @@
-Subproject commit c297cb6ea702213bfc22e2cdef47e580cff84f2b
+Subproject commit 6f0d7ea22edcd68a1716d843e3ff439a75f23c35

From ffed499057c9dfa3fbc27b943a7993814da81acd Mon Sep 17 00:00:00 2001
From: Josh Cooper <cooper.s.josh@outlook.com>
Date: Thu, 13 Oct 2022 23:22:51 -0700
Subject: [PATCH 778/854] Swaps static variable instantiation order in
 pause.cpp

---
 plugins/spectate/pause.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/plugins/spectate/pause.cpp b/plugins/spectate/pause.cpp
index bb3e90ee0..10e8304f4 100644
--- a/plugins/spectate/pause.cpp
+++ b/plugins/spectate/pause.cpp
@@ -12,6 +12,9 @@ using namespace DFHack;
 using namespace Pausing;
 using namespace df::enums;
 
+std::unordered_set<Lock*> PlayerLock::locks;
+std::unordered_set<Lock*> AnnouncementLock::locks;
+
 namespace pausing {
     AnnouncementLock announcementLock("monitor");
     PlayerLock playerLock("monitor");
@@ -39,9 +42,6 @@ namespace pausing {
 }
 using namespace pausing;
 
-std::unordered_set<Lock*> PlayerLock::locks;
-std::unordered_set<Lock*> AnnouncementLock::locks;
-
 template<typename Locks>
 inline bool any_lock(Locks locks) {
     return std::any_of(locks.begin(), locks.end(), [](Lock* lock) { return lock->isLocked(); });

From b1bf80e58588a3244980ec83ee0aac5755d356cf Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Fri, 14 Oct 2022 11:58:43 -0700
Subject: [PATCH 779/854] support "group" file split strategy for blueprint

---
 ...ntum-build.csv => gui_quantum-2-build.csv} |  0
 ...ntum-place.csv => gui_quantum-3-place.csv} |  0
 .../ecosystem/golden/gui_quantum-4-query.csv  |  6 +++
 .../golden/{meta-dig.csv => meta-1-dig.csv}   |  0
 .../{tracks-carve.csv => tracks-2-carve.csv}  |  0
 ...{transform-dig.csv => transform-1-dig.csv} |  0
 ...onstruct.csv => transform-2-construct.csv} |  0
 ...nsform-build.csv => transform-3-build.csv} |  0
 .../in/{basic-dig.csv => basic-1-dig.csv}     |  0
 .../in/{basic-carve.csv => basic-2-carve.csv} |  0
 .../in/{basic-build.csv => basic-3-build.csv} |  0
 .../in/{basic-place.csv => basic-4-place.csv} |  0
 .../in/{basic-zone.csv => basic-5-zone.csv}   |  0
 ...{buildings-dig.csv => buildings-1-dig.csv} |  0
 ...onstruct.csv => buildings-2-construct.csv} |  0
 ...ldings-build.csv => buildings-3-build.csv} |  0
 ...tions-dig.csv => fortifications-1-dig.csv} |  0
 ...smooth.csv => fortifications-2-smooth.csv} |  0
 ...s-carve.csv => fortifications-3-carve.csv} |  0
 ...ntum-build.csv => gui_quantum-2-build.csv} |  0
 ...ntum-place.csv => gui_quantum-3-place.csv} |  0
 .../test/ecosystem/in/gui_quantum-4-query.csv |  1 +
 .../in/{meta-dig.csv => meta-1-dig.csv}       |  0
 ...piles-place.csv => stockpiles-2-place.csv} |  0
 .../in/{tracks-dig.csv => tracks-1-dig.csv}   |  0
 .../{tracks-carve.csv => tracks-2-carve.csv}  |  0
 .../{tracks-build.csv => tracks-3-build.csv}  |  0
 ...{transform-dig.csv => transform-1-dig.csv} |  0
 ...onstruct.csv => transform-2-construct.csv} |  0
 ...nsform-build.csv => transform-3-build.csv} |  0
 .../in/{zones-zone.csv => zones-2-zone.csv}   |  0
 docs/plugins/blueprint.rst                    |  7 +++-
 plugins/blueprint.cpp                         | 37 +++++++++++++------
 plugins/lua/blueprint.lua                     | 20 ++++++----
 scripts                                       |  2 +-
 test/plugins/blueprint.lua                    | 10 ++---
 test/quickfort/ecosystem.lua                  |  4 +-
 37 files changed, 58 insertions(+), 29 deletions(-)
 rename data/blueprints/library/test/ecosystem/golden/{gui_quantum-build.csv => gui_quantum-2-build.csv} (100%)
 rename data/blueprints/library/test/ecosystem/golden/{gui_quantum-place.csv => gui_quantum-3-place.csv} (100%)
 create mode 100644 data/blueprints/library/test/ecosystem/golden/gui_quantum-4-query.csv
 rename data/blueprints/library/test/ecosystem/golden/{meta-dig.csv => meta-1-dig.csv} (100%)
 rename data/blueprints/library/test/ecosystem/golden/{tracks-carve.csv => tracks-2-carve.csv} (100%)
 rename data/blueprints/library/test/ecosystem/golden/{transform-dig.csv => transform-1-dig.csv} (100%)
 rename data/blueprints/library/test/ecosystem/golden/{transform-construct.csv => transform-2-construct.csv} (100%)
 rename data/blueprints/library/test/ecosystem/golden/{transform-build.csv => transform-3-build.csv} (100%)
 rename data/blueprints/library/test/ecosystem/in/{basic-dig.csv => basic-1-dig.csv} (100%)
 rename data/blueprints/library/test/ecosystem/in/{basic-carve.csv => basic-2-carve.csv} (100%)
 rename data/blueprints/library/test/ecosystem/in/{basic-build.csv => basic-3-build.csv} (100%)
 rename data/blueprints/library/test/ecosystem/in/{basic-place.csv => basic-4-place.csv} (100%)
 rename data/blueprints/library/test/ecosystem/in/{basic-zone.csv => basic-5-zone.csv} (100%)
 rename data/blueprints/library/test/ecosystem/in/{buildings-dig.csv => buildings-1-dig.csv} (100%)
 rename data/blueprints/library/test/ecosystem/in/{buildings-construct.csv => buildings-2-construct.csv} (100%)
 rename data/blueprints/library/test/ecosystem/in/{buildings-build.csv => buildings-3-build.csv} (100%)
 rename data/blueprints/library/test/ecosystem/in/{fortifications-dig.csv => fortifications-1-dig.csv} (100%)
 rename data/blueprints/library/test/ecosystem/in/{fortifications-smooth.csv => fortifications-2-smooth.csv} (100%)
 rename data/blueprints/library/test/ecosystem/in/{fortifications-carve.csv => fortifications-3-carve.csv} (100%)
 rename data/blueprints/library/test/ecosystem/in/{gui_quantum-build.csv => gui_quantum-2-build.csv} (100%)
 rename data/blueprints/library/test/ecosystem/in/{gui_quantum-place.csv => gui_quantum-3-place.csv} (100%)
 create mode 100644 data/blueprints/library/test/ecosystem/in/gui_quantum-4-query.csv
 rename data/blueprints/library/test/ecosystem/in/{meta-dig.csv => meta-1-dig.csv} (100%)
 rename data/blueprints/library/test/ecosystem/in/{stockpiles-place.csv => stockpiles-2-place.csv} (100%)
 rename data/blueprints/library/test/ecosystem/in/{tracks-dig.csv => tracks-1-dig.csv} (100%)
 rename data/blueprints/library/test/ecosystem/in/{tracks-carve.csv => tracks-2-carve.csv} (100%)
 rename data/blueprints/library/test/ecosystem/in/{tracks-build.csv => tracks-3-build.csv} (100%)
 rename data/blueprints/library/test/ecosystem/in/{transform-dig.csv => transform-1-dig.csv} (100%)
 rename data/blueprints/library/test/ecosystem/in/{transform-construct.csv => transform-2-construct.csv} (100%)
 rename data/blueprints/library/test/ecosystem/in/{transform-build.csv => transform-3-build.csv} (100%)
 rename data/blueprints/library/test/ecosystem/in/{zones-zone.csv => zones-2-zone.csv} (100%)

diff --git a/data/blueprints/library/test/ecosystem/golden/gui_quantum-build.csv b/data/blueprints/library/test/ecosystem/golden/gui_quantum-2-build.csv
similarity index 100%
rename from data/blueprints/library/test/ecosystem/golden/gui_quantum-build.csv
rename to data/blueprints/library/test/ecosystem/golden/gui_quantum-2-build.csv
diff --git a/data/blueprints/library/test/ecosystem/golden/gui_quantum-place.csv b/data/blueprints/library/test/ecosystem/golden/gui_quantum-3-place.csv
similarity index 100%
rename from data/blueprints/library/test/ecosystem/golden/gui_quantum-place.csv
rename to data/blueprints/library/test/ecosystem/golden/gui_quantum-3-place.csv
diff --git a/data/blueprints/library/test/ecosystem/golden/gui_quantum-4-query.csv b/data/blueprints/library/test/ecosystem/golden/gui_quantum-4-query.csv
new file mode 100644
index 000000000..e9d422551
--- /dev/null
+++ b/data/blueprints/library/test/ecosystem/golden/gui_quantum-4-query.csv
@@ -0,0 +1,6 @@
+#query label(query)
+
+
+
+,,{givename name="foo dumper"}
+,,{givename name="foo"}
diff --git a/data/blueprints/library/test/ecosystem/golden/meta-dig.csv b/data/blueprints/library/test/ecosystem/golden/meta-1-dig.csv
similarity index 100%
rename from data/blueprints/library/test/ecosystem/golden/meta-dig.csv
rename to data/blueprints/library/test/ecosystem/golden/meta-1-dig.csv
diff --git a/data/blueprints/library/test/ecosystem/golden/tracks-carve.csv b/data/blueprints/library/test/ecosystem/golden/tracks-2-carve.csv
similarity index 100%
rename from data/blueprints/library/test/ecosystem/golden/tracks-carve.csv
rename to data/blueprints/library/test/ecosystem/golden/tracks-2-carve.csv
diff --git a/data/blueprints/library/test/ecosystem/golden/transform-dig.csv b/data/blueprints/library/test/ecosystem/golden/transform-1-dig.csv
similarity index 100%
rename from data/blueprints/library/test/ecosystem/golden/transform-dig.csv
rename to data/blueprints/library/test/ecosystem/golden/transform-1-dig.csv
diff --git a/data/blueprints/library/test/ecosystem/golden/transform-construct.csv b/data/blueprints/library/test/ecosystem/golden/transform-2-construct.csv
similarity index 100%
rename from data/blueprints/library/test/ecosystem/golden/transform-construct.csv
rename to data/blueprints/library/test/ecosystem/golden/transform-2-construct.csv
diff --git a/data/blueprints/library/test/ecosystem/golden/transform-build.csv b/data/blueprints/library/test/ecosystem/golden/transform-3-build.csv
similarity index 100%
rename from data/blueprints/library/test/ecosystem/golden/transform-build.csv
rename to data/blueprints/library/test/ecosystem/golden/transform-3-build.csv
diff --git a/data/blueprints/library/test/ecosystem/in/basic-dig.csv b/data/blueprints/library/test/ecosystem/in/basic-1-dig.csv
similarity index 100%
rename from data/blueprints/library/test/ecosystem/in/basic-dig.csv
rename to data/blueprints/library/test/ecosystem/in/basic-1-dig.csv
diff --git a/data/blueprints/library/test/ecosystem/in/basic-carve.csv b/data/blueprints/library/test/ecosystem/in/basic-2-carve.csv
similarity index 100%
rename from data/blueprints/library/test/ecosystem/in/basic-carve.csv
rename to data/blueprints/library/test/ecosystem/in/basic-2-carve.csv
diff --git a/data/blueprints/library/test/ecosystem/in/basic-build.csv b/data/blueprints/library/test/ecosystem/in/basic-3-build.csv
similarity index 100%
rename from data/blueprints/library/test/ecosystem/in/basic-build.csv
rename to data/blueprints/library/test/ecosystem/in/basic-3-build.csv
diff --git a/data/blueprints/library/test/ecosystem/in/basic-place.csv b/data/blueprints/library/test/ecosystem/in/basic-4-place.csv
similarity index 100%
rename from data/blueprints/library/test/ecosystem/in/basic-place.csv
rename to data/blueprints/library/test/ecosystem/in/basic-4-place.csv
diff --git a/data/blueprints/library/test/ecosystem/in/basic-zone.csv b/data/blueprints/library/test/ecosystem/in/basic-5-zone.csv
similarity index 100%
rename from data/blueprints/library/test/ecosystem/in/basic-zone.csv
rename to data/blueprints/library/test/ecosystem/in/basic-5-zone.csv
diff --git a/data/blueprints/library/test/ecosystem/in/buildings-dig.csv b/data/blueprints/library/test/ecosystem/in/buildings-1-dig.csv
similarity index 100%
rename from data/blueprints/library/test/ecosystem/in/buildings-dig.csv
rename to data/blueprints/library/test/ecosystem/in/buildings-1-dig.csv
diff --git a/data/blueprints/library/test/ecosystem/in/buildings-construct.csv b/data/blueprints/library/test/ecosystem/in/buildings-2-construct.csv
similarity index 100%
rename from data/blueprints/library/test/ecosystem/in/buildings-construct.csv
rename to data/blueprints/library/test/ecosystem/in/buildings-2-construct.csv
diff --git a/data/blueprints/library/test/ecosystem/in/buildings-build.csv b/data/blueprints/library/test/ecosystem/in/buildings-3-build.csv
similarity index 100%
rename from data/blueprints/library/test/ecosystem/in/buildings-build.csv
rename to data/blueprints/library/test/ecosystem/in/buildings-3-build.csv
diff --git a/data/blueprints/library/test/ecosystem/in/fortifications-dig.csv b/data/blueprints/library/test/ecosystem/in/fortifications-1-dig.csv
similarity index 100%
rename from data/blueprints/library/test/ecosystem/in/fortifications-dig.csv
rename to data/blueprints/library/test/ecosystem/in/fortifications-1-dig.csv
diff --git a/data/blueprints/library/test/ecosystem/in/fortifications-smooth.csv b/data/blueprints/library/test/ecosystem/in/fortifications-2-smooth.csv
similarity index 100%
rename from data/blueprints/library/test/ecosystem/in/fortifications-smooth.csv
rename to data/blueprints/library/test/ecosystem/in/fortifications-2-smooth.csv
diff --git a/data/blueprints/library/test/ecosystem/in/fortifications-carve.csv b/data/blueprints/library/test/ecosystem/in/fortifications-3-carve.csv
similarity index 100%
rename from data/blueprints/library/test/ecosystem/in/fortifications-carve.csv
rename to data/blueprints/library/test/ecosystem/in/fortifications-3-carve.csv
diff --git a/data/blueprints/library/test/ecosystem/in/gui_quantum-build.csv b/data/blueprints/library/test/ecosystem/in/gui_quantum-2-build.csv
similarity index 100%
rename from data/blueprints/library/test/ecosystem/in/gui_quantum-build.csv
rename to data/blueprints/library/test/ecosystem/in/gui_quantum-2-build.csv
diff --git a/data/blueprints/library/test/ecosystem/in/gui_quantum-place.csv b/data/blueprints/library/test/ecosystem/in/gui_quantum-3-place.csv
similarity index 100%
rename from data/blueprints/library/test/ecosystem/in/gui_quantum-place.csv
rename to data/blueprints/library/test/ecosystem/in/gui_quantum-3-place.csv
diff --git a/data/blueprints/library/test/ecosystem/in/gui_quantum-4-query.csv b/data/blueprints/library/test/ecosystem/in/gui_quantum-4-query.csv
new file mode 100644
index 000000000..eb287fc8a
--- /dev/null
+++ b/data/blueprints/library/test/ecosystem/in/gui_quantum-4-query.csv
@@ -0,0 +1 @@
+#query
diff --git a/data/blueprints/library/test/ecosystem/in/meta-dig.csv b/data/blueprints/library/test/ecosystem/in/meta-1-dig.csv
similarity index 100%
rename from data/blueprints/library/test/ecosystem/in/meta-dig.csv
rename to data/blueprints/library/test/ecosystem/in/meta-1-dig.csv
diff --git a/data/blueprints/library/test/ecosystem/in/stockpiles-place.csv b/data/blueprints/library/test/ecosystem/in/stockpiles-2-place.csv
similarity index 100%
rename from data/blueprints/library/test/ecosystem/in/stockpiles-place.csv
rename to data/blueprints/library/test/ecosystem/in/stockpiles-2-place.csv
diff --git a/data/blueprints/library/test/ecosystem/in/tracks-dig.csv b/data/blueprints/library/test/ecosystem/in/tracks-1-dig.csv
similarity index 100%
rename from data/blueprints/library/test/ecosystem/in/tracks-dig.csv
rename to data/blueprints/library/test/ecosystem/in/tracks-1-dig.csv
diff --git a/data/blueprints/library/test/ecosystem/in/tracks-carve.csv b/data/blueprints/library/test/ecosystem/in/tracks-2-carve.csv
similarity index 100%
rename from data/blueprints/library/test/ecosystem/in/tracks-carve.csv
rename to data/blueprints/library/test/ecosystem/in/tracks-2-carve.csv
diff --git a/data/blueprints/library/test/ecosystem/in/tracks-build.csv b/data/blueprints/library/test/ecosystem/in/tracks-3-build.csv
similarity index 100%
rename from data/blueprints/library/test/ecosystem/in/tracks-build.csv
rename to data/blueprints/library/test/ecosystem/in/tracks-3-build.csv
diff --git a/data/blueprints/library/test/ecosystem/in/transform-dig.csv b/data/blueprints/library/test/ecosystem/in/transform-1-dig.csv
similarity index 100%
rename from data/blueprints/library/test/ecosystem/in/transform-dig.csv
rename to data/blueprints/library/test/ecosystem/in/transform-1-dig.csv
diff --git a/data/blueprints/library/test/ecosystem/in/transform-construct.csv b/data/blueprints/library/test/ecosystem/in/transform-2-construct.csv
similarity index 100%
rename from data/blueprints/library/test/ecosystem/in/transform-construct.csv
rename to data/blueprints/library/test/ecosystem/in/transform-2-construct.csv
diff --git a/data/blueprints/library/test/ecosystem/in/transform-build.csv b/data/blueprints/library/test/ecosystem/in/transform-3-build.csv
similarity index 100%
rename from data/blueprints/library/test/ecosystem/in/transform-build.csv
rename to data/blueprints/library/test/ecosystem/in/transform-3-build.csv
diff --git a/data/blueprints/library/test/ecosystem/in/zones-zone.csv b/data/blueprints/library/test/ecosystem/in/zones-2-zone.csv
similarity index 100%
rename from data/blueprints/library/test/ecosystem/in/zones-zone.csv
rename to data/blueprints/library/test/ecosystem/in/zones-2-zone.csv
diff --git a/docs/plugins/blueprint.rst b/docs/plugins/blueprint.rst
index 3a5e5a0c5..6c38a6152 100644
--- a/docs/plugins/blueprint.rst
+++ b/docs/plugins/blueprint.rst
@@ -146,5 +146,10 @@ The ``--splitby`` flag can take any of the following values:
 ``none``
     Writes all blueprints into a single file. This is the standard format for
     quickfort fortress blueprint bundles and is the default.
+``group``
+    Creates one file per group of blueprints that can be played back at the same
+    time (without have to unpause the game and let dwarves fulfill jobs between
+    blueprint runs).
 ``phase``
-    Creates a separate file for each phase.
+    Creates a separate file for each phase. Implies ``--nometa`` since meta
+    blueprints can't combine blueprints that are in separate files.
diff --git a/plugins/blueprint.cpp b/plugins/blueprint.cpp
index 361aaa1ca..330b61729 100644
--- a/plugins/blueprint.cpp
+++ b/plugins/blueprint.cpp
@@ -1095,11 +1095,12 @@ static bool create_output_dir(color_ostream &out,
 static bool get_filename(string &fname,
                          color_ostream &out,
                          blueprint_options opts, // copy because we can't const
-                         const string &phase) {
+                         const string &phase,
+                         int32_t ordinal) {
     auto L = Lua::Core::State;
     Lua::StackUnwinder top(L);
 
-    if (!lua_checkstack(L, 3) ||
+    if (!lua_checkstack(L, 4) ||
         !Lua::PushModulePublic(
             out, L, "plugins.blueprint", "get_filename")) {
         out.printerr("Failed to load blueprint Lua code\n");
@@ -1108,8 +1109,9 @@ static bool get_filename(string &fname,
 
     Lua::Push(L, &opts);
     Lua::Push(L, phase);
+    Lua::Push(L, ordinal);
 
-    if (!Lua::SafeCall(out, L, 2, 1)) {
+    if (!Lua::SafeCall(out, L, 3, 1)) {
         out.printerr("Failed Lua call to get_filename\n");
         return false;
     }
@@ -1228,9 +1230,9 @@ static bool write_blueprint(color_ostream &out,
                             std::map<string, ofstream*> &output_files,
                             const blueprint_options &opts,
                             const blueprint_processor &processor,
-                            bool pretty) {
+                            bool pretty, int32_t ordinal) {
     string fname;
-    if (!get_filename(fname, out, opts, processor.phase))
+    if (!get_filename(fname, out, opts, processor.phase, ordinal))
         return false;
     if (!output_files.count(fname))
         output_files[fname] = new ofstream(fname, ofstream::trunc);
@@ -1249,9 +1251,10 @@ static bool write_blueprint(color_ostream &out,
 static void write_meta_blueprint(color_ostream &out,
                                  std::map<string, ofstream*> &output_files,
                                  const blueprint_options &opts,
-                                 const std::vector<string> & meta_phases) {
+                                 const std::vector<string> & meta_phases,
+                                 int32_t ordinal) {
     string fname;
-    get_filename(fname, out, opts, meta_phases.front());
+    get_filename(fname, out, opts, meta_phases.front(), ordinal);
     ofstream &ofile = *output_files[fname];
 
     ofile << "#meta label(";
@@ -1285,7 +1288,7 @@ static void add_processor(vector<blueprint_processor> &processors,
 
 static bool do_transform(color_ostream &out,
                          const df::coord &start, const df::coord &end,
-                         blueprint_options &opts,
+                         blueprint_options opts, // copy so we can munge it
                          vector<string> &filenames) {
     // empty map instances to pass to emplace() below
     static const bp_area EMPTY_AREA;
@@ -1368,16 +1371,26 @@ static bool do_transform(color_ostream &out,
     if (meta_phases.size() <= 1)
         opts.nometa = true;
 
+    bool in_meta = false;
+    int32_t ordinal = 0;
     std::map<string, ofstream*> output_files;
     for (blueprint_processor &processor : processors) {
         if (processor.mapdata.empty() && !processor.force_create)
             continue;
-        if (!write_blueprint(out, output_files, opts, processor, pretty))
+        bool meta_phase = is_meta_phase(out, opts, processor.phase);
+        if (!in_meta)
+            ++ordinal;
+        if (in_meta && !meta_phase) {
+            write_meta_blueprint(out, output_files, opts, meta_phases, ordinal);
+            ++ordinal;
+        }
+        in_meta = meta_phase;
+        if (!write_blueprint(out, output_files, opts, processor, pretty,
+                             ordinal))
             break;
     }
-    if (!opts.nometa) {
-        write_meta_blueprint(out, output_files, opts, meta_phases);
-    }
+    if (in_meta)
+        write_meta_blueprint(out, output_files, opts, meta_phases, ordinal);
 
     for (auto &it : output_files) {
         filenames.push_back(it.first);
diff --git a/plugins/lua/blueprint.lua b/plugins/lua/blueprint.lua
index e3b36d9fe..718b211e8 100644
--- a/plugins/lua/blueprint.lua
+++ b/plugins/lua/blueprint.lua
@@ -31,6 +31,7 @@ valid_formats = utils.invert(valid_formats_list)
 
 local valid_split_strategies_list = {
     'none',
+    'group',
     'phase',
 }
 valid_split_strategies = utils.invert(valid_split_strategies_list)
@@ -143,6 +144,10 @@ local function process_args(opts, args)
         return
     end
 
+    if opts.split_strategy == 'phase' then
+        opts.nometa = true
+    end
+
     return positionals
 end
 
@@ -200,7 +205,7 @@ function is_meta_phase(opts, phase)
 end
 
 -- returns the name of the output file for the given context
-function get_filename(opts, phase)
+function get_filename(opts, phase, ordinal)
     local fullname = 'blueprints/' .. opts.name
     local _,_,basename = fullname:find('/([^/]+)/?$')
     if not basename then
@@ -210,14 +215,13 @@ function get_filename(opts, phase)
     if fullname:endswith('/') then
         fullname = fullname .. basename
     end
-    if opts.split_strategy == 'phase' then
-        if is_meta_phase(opts, phase) then
-            phase = 'meta'
-        end
-        return ('%s-%s.csv'):format(fullname, phase)
+    if opts.split_strategy == 'none' then
+        return ('%s.csv'):format(fullname)
+    end
+    if is_meta_phase(opts, phase) then
+        phase = 'meta'
     end
-    -- no splitting
-    return ('%s.csv'):format(fullname)
+    return ('%s-%d-%s.csv'):format(fullname, ordinal, phase)
 end
 
 -- compatibility with old exported API.
diff --git a/scripts b/scripts
index 6f0d7ea22..0be5cc0ea 160000
--- a/scripts
+++ b/scripts
@@ -1 +1 @@
-Subproject commit 6f0d7ea22edcd68a1716d843e3ff439a75f23c35
+Subproject commit 0be5cc0eaf625029ef26392224db5c3d2822a63d
diff --git a/test/plugins/blueprint.lua b/test/plugins/blueprint.lua
index 73ec33eda..6146aea3f 100644
--- a/test/plugins/blueprint.lua
+++ b/test/plugins/blueprint.lua
@@ -101,7 +101,7 @@ function test.parse_gui_commandline()
     opts = {}
     b.parse_gui_commandline(opts, {'--splitby', 'phase'})
     expect.table_eq({auto_phase=true, format='minimal', split_strategy='phase',
-                     name='blueprint'},
+                     name='blueprint', nometa=true},
                     opts)
 
     expect.error_match('unknown split_strategy',
@@ -241,16 +241,16 @@ end
 
 function test.get_filename()
     local opts = {name='a', split_strategy='none'}
-    expect.eq('blueprints/a.csv', b.get_filename(opts, 'dig'))
+    expect.eq('blueprints/a.csv', b.get_filename(opts, 'dig', 1))
 
     opts = {name='a/', split_strategy='none'}
-    expect.eq('blueprints/a/a.csv', b.get_filename(opts, 'dig'))
+    expect.eq('blueprints/a/a.csv', b.get_filename(opts, 'dig', 1))
 
     opts = {name='a', split_strategy='phase'}
-    expect.eq('blueprints/a-dig.csv', b.get_filename(opts, 'dig'))
+    expect.eq('blueprints/a-1-dig.csv', b.get_filename(opts, 'dig', 1))
 
     opts = {name='a/', split_strategy='phase'}
-    expect.eq('blueprints/a/a-dig.csv', b.get_filename(opts, 'dig'))
+    expect.eq('blueprints/a/a-5-dig.csv', b.get_filename(opts, 'dig', 5))
 
     expect.error_match('could not parse basename', function()
             b.get_filename({name='', split_strategy='none'})
diff --git a/test/quickfort/ecosystem.lua b/test/quickfort/ecosystem.lua
index 05f531e2e..663bc353b 100644
--- a/test/quickfort/ecosystem.lua
+++ b/test/quickfort/ecosystem.lua
@@ -244,7 +244,7 @@ end
 local function run_blueprint(basename, spec, pos)
     local args = {tostring(spec.width), tostring(spec.height),
                   tostring(-spec.depth), output_dir..basename,
-                  get_cursor_arg(pos), '-tphase', '--nometa'}
+                  get_cursor_arg(pos), '-tphase'}
     local playback_start_arg = get_playback_start_arg(spec.start)
     if playback_start_arg then
         table.insert(args, playback_start_arg)
@@ -444,7 +444,7 @@ function extra_fns.gui_quantum(pos)
             view:onInput({_STRING=string.byte('f')})
             view:onInput({_STRING=string.byte('o')})
             view:onInput({_STRING=string.byte('o')})
-            send_keys('SELECT')
+            view:onInput({SELECT=true})
             -- rotate the dump direction to the south
             send_keys('CUSTOM_D')
             view:onRender()

From fc926df59d8f5dae54e220358df2f41595614795 Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Fri, 14 Oct 2022 12:31:51 -0700
Subject: [PATCH 780/854] update changelog

---
 docs/changelog.txt | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docs/changelog.txt b/docs/changelog.txt
index a28ae5f9f..c7c36ac8b 100644
--- a/docs/changelog.txt
+++ b/docs/changelog.txt
@@ -43,6 +43,8 @@ changelog.txt uses a syntax similar to RST, with a few special sequences:
 - `blueprint`: record stockpile/building/zone names in blueprints
 - `blueprint`: record room sizes in blueprints
 - `blueprint`: generate meta blueprints to reduce the number of blueprints you have to apply
+- `blueprint`: support splitting the output file into phases grouped by when they can be applied
+- `blueprint`: when splitting output files, number them so they sort into the order you should apply them in
 - `ls`: indent tag listings and wrap them in the right column for better readability
 - `ls`: new ``--exclude`` option for hiding matched scripts from the output.  this can be especially useful for modders who don't want their mod scripts to be included in ``ls`` output.
 - `digtype`: new ``-z`` option for digtype to restrict designations to the current z-level and down

From ff072bf0c2575d39c2febf1a895b19fe3269b373 Mon Sep 17 00:00:00 2001
From: Josh Cooper <cooper.s.josh@outlook.com>
Date: Fri, 14 Oct 2022 12:41:36 -0700
Subject: [PATCH 781/854] Updates spectate's pause locking

---
 plugins/spectate/pause.cpp | 28 +++++++++++++++++++++++-----
 plugins/spectate/pause.h   | 17 +++++++++++------
 2 files changed, 34 insertions(+), 11 deletions(-)

diff --git a/plugins/spectate/pause.cpp b/plugins/spectate/pause.cpp
index 10e8304f4..0c8462580 100644
--- a/plugins/spectate/pause.cpp
+++ b/plugins/spectate/pause.cpp
@@ -21,7 +21,6 @@ namespace pausing {
 
     const size_t announcement_flag_arr_size = sizeof(decltype(df::announcements::flags)) / sizeof(df::announcement_flags);
     bool state_saved = false; // indicates whether a restore state is ok
-    bool announcements_disabled = false; // indicates whether disable or restore was last enacted, could use a better name
     bool saved_states[announcement_flag_arr_size]; // state to restore
     bool locked_states[announcement_flag_arr_size]; // locked state (re-applied each frame)
     bool allow_player_pause = true; // toggles player pause ability
@@ -70,6 +69,16 @@ inline bool only_or_none_locked(Locks locks, LockT* this_lock) {
     return true;
 }
 
+template<typename Locks>
+inline bool reportLockedLocks(color_ostream &out, Locks locks) {
+    for (auto &L: locks) {
+        if (L->isLocked()) {
+            out.print("Lock '%s' is locked\n", L->name.c_str());
+        }
+    }
+    return true;
+}
+
 bool AnnouncementLock::captureState() {
     if (only_or_none_locked(locks, this)) {
         for (size_t i = 0; i < announcement_flag_arr_size; ++i) {
@@ -93,6 +102,10 @@ bool AnnouncementLock::isOnlyLocked() const {
     return only_lock(locks, this);
 }
 
+void AnnouncementLock::reportLocks(color_ostream &out) {
+    reportLockedLocks(out, locks);
+}
+
 bool PlayerLock::isAnyLocked() const {
     return any_lock(locks);
 }
@@ -101,14 +114,19 @@ bool PlayerLock::isOnlyLocked() const {
     return only_lock(locks, this);
 }
 
-bool World::DisableAnnouncementPausing() {
+void PlayerLock::reportLocks(color_ostream &out) {
+    reportLockedLocks(out, locks);
+}
+
+bool World::DisableAnnouncementPausing(color_ostream &out) {
     if (!announcementLock.isAnyLocked()) {
         for (auto& flag : df::global::d_init->announcements.flags) {
             flag.bits.PAUSE = false;
+            //out.print("pause: %d\n", flag.bits.PAUSE);
         }
-        announcements_disabled = true;
+        return true;
     }
-    return announcements_disabled;
+    return false;
 }
 
 bool World::SaveAnnouncementSettings() {
@@ -116,6 +134,7 @@ bool World::SaveAnnouncementSettings() {
         for (size_t i = 0; i < announcement_flag_arr_size; ++i) {
             saved_states[i] = df::global::d_init->announcements.flags[i].bits.PAUSE;
         }
+        state_saved = true;
         return true;
     }
     return false;
@@ -126,7 +145,6 @@ bool World::RestoreAnnouncementSettings() {
         for (size_t i = 0; i < announcement_flag_arr_size; ++i) {
             df::global::d_init->announcements.flags[i].bits.PAUSE = saved_states[i];
         }
-        announcements_disabled = false;
         return true;
     }
     return false;
diff --git a/plugins/spectate/pause.h b/plugins/spectate/pause.h
index 98d703998..90e884b90 100644
--- a/plugins/spectate/pause.h
+++ b/plugins/spectate/pause.h
@@ -1,6 +1,8 @@
 #pragma once
 #include <unordered_set>
 #include <string>
+#include <atomic>
+#include <ColorText.h>
 
 namespace DFHack {
     ////////////
@@ -9,16 +11,17 @@ namespace DFHack {
     {
         class Lock
         {
-            bool locked = false;
-            std::string name;
+            std::atomic_bool locked{};
         public:
-            explicit Lock(const char* name) { this->name = name;};
+            const std::string name;
+            explicit Lock(const char* name) : name(name){ locked = false; }
             virtual ~Lock()= default;
             virtual bool isAnyLocked() const = 0;
             virtual bool isOnlyLocked() const = 0;
             bool isLocked() const   { return locked; }
-            virtual void lock()     { locked = true; }; //simply locks the lock
-            void unlock()           { locked = false; };
+            virtual void lock()     { locked = true; } //simply locks the lock
+            void unlock()           { locked = false; }
+            virtual void reportLocks(color_ostream &out) = 0;
         };
 
         // non-blocking lock resource used in conjunction with the announcement functions in World
@@ -32,6 +35,7 @@ namespace DFHack {
             void lock() override; // locks and attempts to capture state
             bool isAnyLocked() const override; // returns true if any instance of AnnouncementLock is locked
             bool isOnlyLocked() const override; // returns true if locked and no other instance is locked
+            void reportLocks(color_ostream &out) override;
         };
 
         // non-blocking lock resource used in conjunction with the Player pause functions in World
@@ -43,10 +47,11 @@ namespace DFHack {
             ~PlayerLock() override { locks.erase(this); }
             bool isAnyLocked() const override; // returns true if any instance of PlayerLock is locked
             bool isOnlyLocked() const override; // returns true if locked and no other instance is locked
+            void reportLocks(color_ostream &out) override;
         };
     }
     namespace World {
-        bool DisableAnnouncementPausing(); // disable announcement pausing if all locks are open
+        bool DisableAnnouncementPausing(color_ostream &out); // disable announcement pausing if all locks are open
         bool SaveAnnouncementSettings(); // save current announcement pause settings if all locks are open
         bool RestoreAnnouncementSettings(); // restore saved announcement pause settings if all locks are open
 

From 7c769ebb9ce09deaa2e1549636ef086e773d25e0 Mon Sep 17 00:00:00 2001
From: Josh Cooper <cooper.s.josh@outlook.com>
Date: Fri, 14 Oct 2022 12:42:20 -0700
Subject: [PATCH 782/854] Disables pause locking and announcement manipulation
 code in spectate

---
 plugins/spectate/spectate.cpp | 114 +++++++++++++++++++---------------
 1 file changed, 64 insertions(+), 50 deletions(-)

diff --git a/plugins/spectate/spectate.cpp b/plugins/spectate/spectate.cpp
index bab789454..96500820a 100644
--- a/plugins/spectate/spectate.cpp
+++ b/plugins/spectate/spectate.cpp
@@ -56,7 +56,7 @@ std::set<int32_t> job_tracker;
 std::map<uint16_t,uint16_t> freq;
 std::default_random_engine RNG;
 
-
+void enable_auto_unpause(color_ostream &out, bool state);
 
 
 #define base 0.99
@@ -121,6 +121,7 @@ DFhackCExport command_result plugin_enable(color_ostream &out, bool enable) {
         EM::registerListener(EventType::TICK, ticking, plugin_self);
         EM::registerListener(EventType::JOB_STARTED, start, plugin_self);
         EM::registerListener(EventType::JOB_COMPLETED, complete, plugin_self);
+        enable_auto_unpause(out, unpause_enabled);
     } else if (!enable && enabled) {
         // warp 8, engage!
         out.print("Spectate mode disabled!\n");
@@ -141,6 +142,12 @@ DFhackCExport command_result plugin_onstatechange(color_ostream &out, state_chan
                 our_dorf = nullptr;
                 job_watched = nullptr;
                 following_dwarf = false;
+                //pause_lock->unlock();
+                break;
+            case SC_MAP_LOADED:
+                // todo: RE UNDEAD_ATTACK event still pausing regardless of announcement settings
+                //enable_auto_unpause(out, unpause_enabled);
+                break;
             default:
                 break;
         }
@@ -150,22 +157,21 @@ DFhackCExport command_result plugin_onstatechange(color_ostream &out, state_chan
 
 DFhackCExport command_result plugin_onupdate(color_ostream &out) {
     // keeps announcement pause settings locked
-    World::Update(); // from pause.h
-    if (lock_collision) {
-        if (unpause_enabled) {
-            // player asked for auto-unpause enabled
-            World::SaveAnnouncementSettings();
-            if (World::DisableAnnouncementPausing()) {
-                // now that we've got what we want, we can lock it down
-                lock_collision = false;
-                pause_lock->lock();
-            }
-        } else {
-            if (World::RestoreAnnouncementSettings()) {
-                lock_collision = false;
-            }
-        }
-    }
+//    World::Update(); // from pause.h
+//    if (lock_collision) {
+//        if (unpause_enabled) {
+//            // player asked for auto-unpause enabled
+//            World::SaveAnnouncementSettings();
+//            if (World::DisableAnnouncementPausing(out)) {
+//                // now that we've got what we want, we can lock it down
+//                lock_collision = false;
+//            }
+//        } else {
+//            if (World::RestoreAnnouncementSettings()) {
+//                lock_collision = false;
+//            }
+//        }
+//    }
     while (unpause_enabled && !world->status.popups.empty()) {
         // dismiss announcement popup(s)
         Gui::getCurViewscreen(true)->feed_key(interface_key::CLOSE_MEGA_ANNOUNCEMENT);
@@ -179,40 +185,48 @@ DFhackCExport command_result plugin_onupdate(color_ostream &out) {
 }
 
 void enable_auto_unpause(color_ostream &out, bool state) {
-    // lock_collision == true means: enable_auto_unpause() was already invoked and didn't complete
-    // The onupdate function above ensure the procedure properly completes, thus we only care about
-    // state reversal here ergo `enabled != state`
-    if (lock_collision && unpause_enabled != state) {
-        // if unpaused_enabled is true, then a lock collision means: we couldn't save/disable the pause settings,
-        // therefore nothing to revert and the lock won't even be engaged (nothing to unlock)
-        lock_collision = false;
+    // we don't need to do any of this yet if the plugin isn't enabled
+    if (enabled) {
+// Announcement manipulation doesn't prevent siege pauses
+//        if(pause_lock) {
+//            // lock_collision == true means: enable_auto_unpause() was already invoked and didn't complete
+//            // The onupdate function above ensure the procedure properly completes, thus we only care about
+//            // state reversal here ergo `enabled != state`
+//            if (lock_collision && unpause_enabled != state) {
+//                out.print("handling collision\n");
+//                // if unpaused_enabled is true, then a lock collision means: we couldn't save/disable the pause settings,
+//                // therefore nothing to revert and the lock won't even be engaged (nothing to unlock)
+//                lock_collision = false;
+//                unpause_enabled = state;
+//                if (unpause_enabled) {
+//                    // a collision means we couldn't restore the pause settings, therefore we only need re-engage the lock
+//                    pause_lock->lock();
+//                }
+//                return;
+//            }
+//            // update the announcement settings if we can
+//            if (state) {
+//                if (World::SaveAnnouncementSettings()) {
+//                    World::DisableAnnouncementPausing(out);
+//                    pause_lock->lock();
+//                } else {
+//                    lock_collision = true;
+//                }
+//            } else {
+//                pause_lock->unlock();
+//                if (!World::RestoreAnnouncementSettings()) {
+//                    // this in theory shouldn't happen, if others use the lock like we do in spectate
+//                    lock_collision = true;
+//                }
+//            }
+//            if (lock_collision) {
+//                out.printerr(
+//                        "auto-unpause: must wait for another Pausing::AnnouncementLock to be lifted."
+//                        " This setting will complete when the lock lifts.\n");
+//                pause_lock->reportLocks(out);
+//            }
+//        }
         unpause_enabled = state;
-        if (unpause_enabled) {
-            // a collision means we couldn't restore the pause settings, therefore we only need re-engage the lock
-            pause_lock->lock();
-        }
-        return;
-    }
-    unpause_enabled = state;
-    // update the announcement settings if we can
-    if (unpause_enabled) {
-        if (World::SaveAnnouncementSettings()) {
-            World::DisableAnnouncementPausing();
-            pause_lock->lock();
-        } else {
-            lock_collision = true;
-        }
-    } else {
-        pause_lock->unlock();
-        if (!World::RestoreAnnouncementSettings()) {
-            // this in theory shouldn't happen, if others use the lock like we do in spectate
-            lock_collision = true;
-        }
-    }
-    if (lock_collision) {
-        out.printerr(
-                "auto-unpause: must wait for another Pausing::AnnouncementLock to be lifted."
-                " This setting will complete when the lock lifts.\n");
     }
 }
 

From fea0ce0718b463278c16567c02fbdbf9b1b31924 Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Fri, 14 Oct 2022 13:11:26 -0700
Subject: [PATCH 783/854] fix cvs quoting

---
 .../ecosystem/golden/gui_quantum-4-query.csv  |  4 +--
 plugins/blueprint.cpp                         | 28 +++++++++++++------
 test/quickfort/ecosystem.lua                  |  2 +-
 3 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/data/blueprints/library/test/ecosystem/golden/gui_quantum-4-query.csv b/data/blueprints/library/test/ecosystem/golden/gui_quantum-4-query.csv
index e9d422551..811f7b3b0 100644
--- a/data/blueprints/library/test/ecosystem/golden/gui_quantum-4-query.csv
+++ b/data/blueprints/library/test/ecosystem/golden/gui_quantum-4-query.csv
@@ -2,5 +2,5 @@
 
 
 
-,,{givename name="foo dumper"}
-,,{givename name="foo"}
+,,"{givename name=""foo dumper""}"
+,,"{givename name=""foo""}"
diff --git a/plugins/blueprint.cpp b/plugins/blueprint.cpp
index 330b61729..509b1e6bc 100644
--- a/plugins/blueprint.cpp
+++ b/plugins/blueprint.cpp
@@ -5,8 +5,6 @@
  * Written by cdombroski.
  */
 
-#include <algorithm>
-#include <regex>
 #include <sstream>
 #include <unordered_map>
 
@@ -1011,11 +1009,23 @@ static const char * get_tile_zone(const df::coord &pos,
     return add_expansion_syntax(zone, get_zone_keys(zone));
 }
 
-static string csv_sanitize(const string &str) {
-    static const std::regex pattern("\"");
-    static const string replacement("\"\"");
+// surrounds the given string in quotes and replaces internal double quotes (")
+// with double double quotes ("") (as per the csv spec)
+static string csv_quote(const string &str) {
+    std::ostringstream outstr;
+    outstr << "\"";
+
+    size_t start = 0;
+    auto end = str.find('"');
+    while (end != std::string::npos) {
+        outstr << str.substr(start, end - start);
+        outstr << "\"\"";
+        start = end + 1;
+        end = str.find('"', start);
+    }
+    outstr << str.substr(start, end) << "\"";
 
-    return std::regex_replace(str, pattern, replacement);
+    return outstr.str();
 }
 
 static const char * get_tile_query(const df::coord &pos,
@@ -1042,11 +1052,11 @@ static const char * get_tile_query(const df::coord &pos,
 
     std::ostringstream str;
     if (bld_name.size())
-        str << "{givename name=\"" << csv_sanitize(bld_name) << "\"}";
+        str << "{givename name=" + csv_quote(bld_name) + "}";
     if (zone_name.size())
-        str << "{namezone name=\"" << csv_sanitize(zone_name) << "\"}";
+        str << "{namezone name=" + csv_quote(zone_name) + "}";
 
-    return cache(str);
+    return cache(csv_quote(str.str()));
 }
 
 static const char * get_tile_rooms(const df::coord &, const tile_context &ctx) {
diff --git a/test/quickfort/ecosystem.lua b/test/quickfort/ecosystem.lua
index 663bc353b..27dddc5d5 100644
--- a/test/quickfort/ecosystem.lua
+++ b/test/quickfort/ecosystem.lua
@@ -444,7 +444,7 @@ function extra_fns.gui_quantum(pos)
             view:onInput({_STRING=string.byte('f')})
             view:onInput({_STRING=string.byte('o')})
             view:onInput({_STRING=string.byte('o')})
-            view:onInput({SELECT=true})
+            send_keys('SELECT')
             -- rotate the dump direction to the south
             send_keys('CUSTOM_D')
             view:onRender()

From 20c0b75f8b7a78c114a68812357c5770e3f92d15 Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Fri, 14 Oct 2022 13:20:50 -0700
Subject: [PATCH 784/854] reduce size of overlay button

---
 plugins/overlay.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/overlay.cpp b/plugins/overlay.cpp
index 1a0cc7c02..dd7563112 100644
--- a/plugins/overlay.cpp
+++ b/plugins/overlay.cpp
@@ -99,7 +99,7 @@ namespace DFHack {
     DBG_DECLARE(overlay, log, DebugCategory::LINFO);
 }
 
-static const std::string button_text = "[ DFHack Launcher ]";
+static const std::string button_text = "[ DFHack ]";
 static bool clicked = false;
 
 static bool handle_click() {

From fbb4b37493cadde3d2c90589ba40341059179fa2 Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Fri, 14 Oct 2022 13:22:05 -0700
Subject: [PATCH 785/854] update changelog

---
 docs/changelog.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/changelog.txt b/docs/changelog.txt
index c7c36ac8b..a4fef7c57 100644
--- a/docs/changelog.txt
+++ b/docs/changelog.txt
@@ -51,6 +51,7 @@ changelog.txt uses a syntax similar to RST, with a few special sequences:
 - UX: List widgets now have mouse-interactive scrollbars
 - UX: You can now hold down the mouse button on a scrollbar to make it scroll multiple times.
 - UX: You can now drag the scrollbar to scroll to a specific spot
+- `overlay`: reduce the size of the "DFHack Launcher" button
 - Constructions module: ``findAtTile`` now uses a binary search intead of a linear search.
 
 ## Documentation

From d53746ed48a27d67b8149e582b23ea2369c6ee58 Mon Sep 17 00:00:00 2001
From: Josh Cooper <cooper.s.josh@outlook.com>
Date: Fri, 14 Oct 2022 15:43:39 -0700
Subject: [PATCH 786/854] Fixes various state transition edge cases

---
 plugins/spectate/pause.cpp    |   6 +-
 plugins/spectate/pause.h      |   4 +-
 plugins/spectate/spectate.cpp | 149 ++++++++++++++++++++--------------
 3 files changed, 93 insertions(+), 66 deletions(-)

diff --git a/plugins/spectate/pause.cpp b/plugins/spectate/pause.cpp
index 0c8462580..fadf8d5e9 100644
--- a/plugins/spectate/pause.cpp
+++ b/plugins/spectate/pause.cpp
@@ -71,11 +71,13 @@ inline bool only_or_none_locked(Locks locks, LockT* this_lock) {
 
 template<typename Locks>
 inline bool reportLockedLocks(color_ostream &out, Locks locks) {
+    out.color(DFHack::COLOR_YELLOW);
     for (auto &L: locks) {
         if (L->isLocked()) {
-            out.print("Lock '%s' is locked\n", L->name.c_str());
+            out.print("Lock: '%s'\n", L->name.c_str());
         }
     }
+    out.reset_color();
     return true;
 }
 
@@ -118,7 +120,7 @@ void PlayerLock::reportLocks(color_ostream &out) {
     reportLockedLocks(out, locks);
 }
 
-bool World::DisableAnnouncementPausing(color_ostream &out) {
+bool World::DisableAnnouncementPausing() {
     if (!announcementLock.isAnyLocked()) {
         for (auto& flag : df::global::d_init->announcements.flags) {
             flag.bits.PAUSE = false;
diff --git a/plugins/spectate/pause.h b/plugins/spectate/pause.h
index 90e884b90..ff4f8992d 100644
--- a/plugins/spectate/pause.h
+++ b/plugins/spectate/pause.h
@@ -51,9 +51,9 @@ namespace DFHack {
         };
     }
     namespace World {
-        bool DisableAnnouncementPausing(color_ostream &out); // disable announcement pausing if all locks are open
+        bool DisableAnnouncementPausing(); // disable announcement pausing if all locks are open
         bool SaveAnnouncementSettings(); // save current announcement pause settings if all locks are open
-        bool RestoreAnnouncementSettings(); // restore saved announcement pause settings if all locks are open
+        bool RestoreAnnouncementSettings(); // restore saved announcement pause settings if all locks are open and there is state information to restore (returns true if a restore took place)
 
         bool EnablePlayerPausing(); // enable player pausing if all locks are open
         bool DisablePlayerPausing(); // disable player pausing if all locks are open
diff --git a/plugins/spectate/spectate.cpp b/plugins/spectate/spectate.cpp
index 96500820a..ae577c1b2 100644
--- a/plugins/spectate/spectate.cpp
+++ b/plugins/spectate/spectate.cpp
@@ -46,6 +46,7 @@ bool disengage_enabled = false;
 bool unpause_enabled = false;
 Pausing::AnnouncementLock* pause_lock = nullptr;
 bool lock_collision = false;
+bool announcements_disabled = false;
 
 bool following_dwarf = false;
 df::unit* our_dorf = nullptr;
@@ -79,6 +80,18 @@ inline void saveConfig() {
     }
 }
 
+//struct player_pause_hook : df::viewscreen_dwarfmodest {
+//    typedef df::viewscreen_dwarfmodest interpose_base;
+//    DEFINE_VMETHOD_INTERPOSE(void, feed, (std::set<df::interface_key>* input)) {
+//        if ((ui->main.mode == ui_sidebar_mode::Default) && !allow_player_pause) {
+//            input->erase(interface_key::D_PAUSE);
+//        }
+//        INTERPOSE_NEXT(feed)(input);
+//    }
+//};
+//
+//IMPLEMENT_VMETHOD_INTERPOSE(player_pause_hook, feed);
+
 command_result spectate (color_ostream &out, std::vector <std::string> & parameters);
 
 DFhackCExport command_result plugin_init (color_ostream &out, std::vector <PluginCommand> &commands) {
@@ -106,6 +119,8 @@ DFhackCExport command_result plugin_load_data (color_ostream &out) {
         disengage_enabled = config.ival(DISENGAGE);
         focus_jobs_enabled = config.ival(JOB_FOCUS);
         tick_threshold = config.ival(TICK_THRESHOLD);
+        pause_lock->unlock();
+        enable_auto_unpause(out, unpause_enabled);
     }
     return DFHack::CR_OK;
 }
@@ -121,11 +136,17 @@ DFhackCExport command_result plugin_enable(color_ostream &out, bool enable) {
         EM::registerListener(EventType::TICK, ticking, plugin_self);
         EM::registerListener(EventType::JOB_STARTED, start, plugin_self);
         EM::registerListener(EventType::JOB_COMPLETED, complete, plugin_self);
+        out.print("running: spectate auto-unpause %d\n", unpause_enabled);
+        enabled = true; // enable_auto_unpause won't do anything without this set now
         enable_auto_unpause(out, unpause_enabled);
     } else if (!enable && enabled) {
         // warp 8, engage!
         out.print("Spectate mode disabled!\n");
         EM::unregisterAll(plugin_self);
+        // we need to retain whether auto-unpause is enabled, but we also need to disable its effect
+        bool temp = unpause_enabled;
+        enable_auto_unpause(out, false);
+        unpause_enabled = temp;
         job_tracker.clear();
         freq.clear();
     }
@@ -134,7 +155,7 @@ DFhackCExport command_result plugin_enable(color_ostream &out, bool enable) {
 }
 
 DFhackCExport command_result plugin_onstatechange(color_ostream &out, state_change_event event) {
-    if (enabled && world) {
+    if (enabled) {
         switch (event) {
             case SC_MAP_UNLOADED:
             case SC_BEGIN_UNLOAD:
@@ -142,12 +163,6 @@ DFhackCExport command_result plugin_onstatechange(color_ostream &out, state_chan
                 our_dorf = nullptr;
                 job_watched = nullptr;
                 following_dwarf = false;
-                //pause_lock->unlock();
-                break;
-            case SC_MAP_LOADED:
-                // todo: RE UNDEAD_ATTACK event still pausing regardless of announcement settings
-                //enable_auto_unpause(out, unpause_enabled);
-                break;
             default:
                 break;
         }
@@ -157,24 +172,27 @@ DFhackCExport command_result plugin_onstatechange(color_ostream &out, state_chan
 
 DFhackCExport command_result plugin_onupdate(color_ostream &out) {
     // keeps announcement pause settings locked
-//    World::Update(); // from pause.h
-//    if (lock_collision) {
-//        if (unpause_enabled) {
-//            // player asked for auto-unpause enabled
-//            World::SaveAnnouncementSettings();
-//            if (World::DisableAnnouncementPausing(out)) {
-//                // now that we've got what we want, we can lock it down
-//                lock_collision = false;
-//            }
-//        } else {
-//            if (World::RestoreAnnouncementSettings()) {
-//                lock_collision = false;
-//            }
-//        }
-//    }
+    World::Update(); // from pause.h
+    if (lock_collision) {
+        if (unpause_enabled) {
+            // player asked for auto-unpause enabled
+            World::SaveAnnouncementSettings();
+            if (World::DisableAnnouncementPausing()) {
+                // now that we've got what we want, we can lock it down
+                lock_collision = false;
+            }
+        } else {
+            if (World::RestoreAnnouncementSettings()) {
+                lock_collision = false;
+            }
+        }
+    }
     while (unpause_enabled && !world->status.popups.empty()) {
         // dismiss announcement popup(s)
         Gui::getCurViewscreen(true)->feed_key(interface_key::CLOSE_MEGA_ANNOUNCEMENT);
+        if (World::ReadPauseState()) {
+            World::SetPauseState(false);
+        }
     }
     if (disengage_enabled && !World::ReadPauseState()) {
         if (our_dorf && our_dorf->id != df::global::ui->follow_unit) {
@@ -187,47 +205,54 @@ DFhackCExport command_result plugin_onupdate(color_ostream &out) {
 void enable_auto_unpause(color_ostream &out, bool state) {
     // we don't need to do any of this yet if the plugin isn't enabled
     if (enabled) {
-// Announcement manipulation doesn't prevent siege pauses
-//        if(pause_lock) {
-//            // lock_collision == true means: enable_auto_unpause() was already invoked and didn't complete
-//            // The onupdate function above ensure the procedure properly completes, thus we only care about
-//            // state reversal here ergo `enabled != state`
-//            if (lock_collision && unpause_enabled != state) {
-//                out.print("handling collision\n");
-//                // if unpaused_enabled is true, then a lock collision means: we couldn't save/disable the pause settings,
-//                // therefore nothing to revert and the lock won't even be engaged (nothing to unlock)
-//                lock_collision = false;
-//                unpause_enabled = state;
-//                if (unpause_enabled) {
-//                    // a collision means we couldn't restore the pause settings, therefore we only need re-engage the lock
-//                    pause_lock->lock();
-//                }
-//                return;
-//            }
-//            // update the announcement settings if we can
-//            if (state) {
-//                if (World::SaveAnnouncementSettings()) {
-//                    World::DisableAnnouncementPausing(out);
-//                    pause_lock->lock();
-//                } else {
-//                    lock_collision = true;
-//                }
-//            } else {
-//                pause_lock->unlock();
-//                if (!World::RestoreAnnouncementSettings()) {
-//                    // this in theory shouldn't happen, if others use the lock like we do in spectate
-//                    lock_collision = true;
-//                }
-//            }
-//            if (lock_collision) {
-//                out.printerr(
-//                        "auto-unpause: must wait for another Pausing::AnnouncementLock to be lifted."
-//                        " This setting will complete when the lock lifts.\n");
-//                pause_lock->reportLocks(out);
-//            }
-//        }
-        unpause_enabled = state;
+        // todo: R.E. UNDEAD_ATTACK event [still pausing regardless of announcement settings]
+        if(pause_lock) {
+            // lock_collision == true means: enable_auto_unpause() was already invoked and didn't complete
+            // The onupdate function above ensure the procedure properly completes, thus we only care about
+            // state reversal here ergo `enabled != state`
+            if (lock_collision && unpause_enabled != state) {
+                out.print("handling collision\n");
+                // if unpaused_enabled is true, then a lock collision means: we couldn't save/disable the pause settings,
+                // therefore nothing to revert and the lock won't even be engaged (nothing to unlock)
+                lock_collision = false;
+                unpause_enabled = state;
+                if (unpause_enabled) {
+                    // a collision means we couldn't restore the pause settings, therefore we only need re-engage the lock
+                    pause_lock->lock();
+                }
+                return;
+            }
+            // update the announcement settings if we can
+            if (state) {
+                if (World::SaveAnnouncementSettings()) {
+                    World::DisableAnnouncementPausing();
+                    announcements_disabled = true;
+                    pause_lock->lock();
+                } else {
+                    out.printerr("lock collision enabling auto-unpause\n");
+                    lock_collision = true;
+                }
+            } else {
+                pause_lock->unlock();
+                if (announcements_disabled) {
+                    if (!World::RestoreAnnouncementSettings()) {
+                        // this in theory shouldn't happen, if others use the lock like we do in spectate
+                        out.printerr("lock collision disabling auto-unpause\n");
+                        lock_collision = true;
+                    } else {
+                        announcements_disabled = false;
+                    }
+                }
+            }
+            if (lock_collision) {
+                out.printerr(
+                        "auto-unpause: must wait for another Pausing::AnnouncementLock to be lifted.\n"
+                        "The action you were attempting will complete when the following lock or locks lift.\n");
+                pause_lock->reportLocks(out);
+            }
+        }
     }
+    unpause_enabled = state;
 }
 
 command_result spectate (color_ostream &out, std::vector <std::string> & parameters) {

From aa64dea61d093f0ba829223498864838b27eb547 Mon Sep 17 00:00:00 2001
From: Josh Cooper <cooper.s.josh@outlook.com>
Date: Fri, 14 Oct 2022 15:44:52 -0700
Subject: [PATCH 787/854] Revert "Includes pause.h in spectate's cmake"

This reverts commit 2c9ce5f31612f9d5fc1c52088254cdbf96c671fb.
---
 plugins/spectate/CMakeLists.txt | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/plugins/spectate/CMakeLists.txt b/plugins/spectate/CMakeLists.txt
index 15e5cb172..5ba1ed9cf 100644
--- a/plugins/spectate/CMakeLists.txt
+++ b/plugins/spectate/CMakeLists.txt
@@ -1,11 +1,8 @@
 
 project(spectate)
 
-set_source_files_properties(pause.h PROPERTIES HEADER_FILE_ONLY TRUE)
-
 SET(SOURCES
         spectate.cpp
-        pause.h
         pause.cpp)
 
 dfhack_plugin(${PROJECT_NAME} ${SOURCES} LINK_LIBRARIES lua)

From 736313d16bfac9cb1611794f594822c2bc8846e0 Mon Sep 17 00:00:00 2001
From: Josh Cooper <cooper.s.josh@outlook.com>
Date: Fri, 14 Oct 2022 15:55:44 -0700
Subject: [PATCH 788/854] Extends pause api

---
 plugins/spectate/pause.cpp | 4 ++++
 plugins/spectate/pause.h   | 1 +
 2 files changed, 5 insertions(+)

diff --git a/plugins/spectate/pause.cpp b/plugins/spectate/pause.cpp
index fadf8d5e9..5c60e2194 100644
--- a/plugins/spectate/pause.cpp
+++ b/plugins/spectate/pause.cpp
@@ -166,6 +166,10 @@ bool World::DisablePlayerPausing() {
     return !allow_player_pause;
 }
 
+bool World::IsPlayerPausingEnabled() {
+    return allow_player_pause;
+}
+
 void World::Update() {
     static bool did_once = false;
     if (!did_once) {
diff --git a/plugins/spectate/pause.h b/plugins/spectate/pause.h
index ff4f8992d..286954683 100644
--- a/plugins/spectate/pause.h
+++ b/plugins/spectate/pause.h
@@ -57,6 +57,7 @@ namespace DFHack {
 
         bool EnablePlayerPausing(); // enable player pausing if all locks are open
         bool DisablePlayerPausing(); // disable player pausing if all locks are open
+        bool IsPlayerPausingEnabled(); // returns whether the player can pause or not
 
         void Update();
     }

From 45ac340f3735520756bd2994b8b719249f7071ff Mon Sep 17 00:00:00 2001
From: Josh Cooper <cooper.s.josh@outlook.com>
Date: Fri, 14 Oct 2022 17:02:43 -0700
Subject: [PATCH 789/854] Finalizes spectate update

- Fixes for state transitions that were found broken. eg. plugin disabled -> enable auto-unpause feature -> enable plugin (auto-unpause will not truly be enabled; similar transitions were broken)
- Adds a commented out lock for if the pause code is ever adopted into the core API, as to enable many mods to use the `World::SetPauseState()` without walking over each other, and in the case of `reveal hell` also be able to avoid needing to set the state every tick in onupdate
- Revises the usage docs with `enable|disable|set` syntax
---
 docs/plugins/spectate.rst     |  3 +-
 plugins/spectate/pause.h      | 13 +++++++++
 plugins/spectate/spectate.cpp | 53 +++++++++++++++--------------------
 3 files changed, 37 insertions(+), 32 deletions(-)

diff --git a/docs/plugins/spectate.rst b/docs/plugins/spectate.rst
index 51c1eaf45..8d4b6bdee 100644
--- a/docs/plugins/spectate.rst
+++ b/docs/plugins/spectate.rst
@@ -11,7 +11,8 @@ Usage
 ::
 
     enable spectate
-    spectate <option> <value>
+    spectate set tick-threshold <value>
+    spectate enable|disable <feature>
 
 
 When enabled, the plugin will automatically switch which dwarf is being
diff --git a/plugins/spectate/pause.h b/plugins/spectate/pause.h
index 286954683..4386f4384 100644
--- a/plugins/spectate/pause.h
+++ b/plugins/spectate/pause.h
@@ -49,6 +49,19 @@ namespace DFHack {
             bool isOnlyLocked() const override; // returns true if locked and no other instance is locked
             void reportLocks(color_ostream &out) override;
         };
+
+        // non-blocking lock resource used in conjunction with the pause set state function in World
+// todo: integrate with World::SetPauseState
+//        class PauseStateLock : public Lock
+//        {
+//            static std::unordered_set<Lock*> locks;
+//        public:
+//            explicit PauseStateLock(const char* name): Lock(name) { locks.emplace(this); }
+//            ~PauseStateLock() override { locks.erase(this); }
+//            bool isAnyLocked() const override; // returns true if any instance of PlayerLock is locked
+//            bool isOnlyLocked() const override; // returns true if locked and no other instance is locked
+//            void reportLocks(color_ostream &out) override;
+//        };
     }
     namespace World {
         bool DisableAnnouncementPausing(); // disable announcement pausing if all locks are open
diff --git a/plugins/spectate/spectate.cpp b/plugins/spectate/spectate.cpp
index ae577c1b2..123811d9b 100644
--- a/plugins/spectate/spectate.cpp
+++ b/plugins/spectate/spectate.cpp
@@ -136,7 +136,6 @@ DFhackCExport command_result plugin_enable(color_ostream &out, bool enable) {
         EM::registerListener(EventType::TICK, ticking, plugin_self);
         EM::registerListener(EventType::JOB_STARTED, start, plugin_self);
         EM::registerListener(EventType::JOB_COMPLETED, complete, plugin_self);
-        out.print("running: spectate auto-unpause %d\n", unpause_enabled);
         enabled = true; // enable_auto_unpause won't do anything without this set now
         enable_auto_unpause(out, unpause_enabled);
     } else if (!enable && enabled) {
@@ -191,6 +190,7 @@ DFhackCExport command_result plugin_onupdate(color_ostream &out) {
         // dismiss announcement popup(s)
         Gui::getCurViewscreen(true)->feed_key(interface_key::CLOSE_MEGA_ANNOUNCEMENT);
         if (World::ReadPauseState()) {
+            // WARNING: This has a possibility of conflicting with `reveal hell` - if Hermes himself runs `reveal hell` on precisely the right moment that is
             World::SetPauseState(false);
         }
     }
@@ -257,37 +257,28 @@ void enable_auto_unpause(color_ostream &out, bool state) {
 
 command_result spectate (color_ostream &out, std::vector <std::string> & parameters) {
     if (!parameters.empty()) {
-        if (parameters.size() % 2 != 0) {
-            return DFHack::CR_WRONG_USAGE;
-        }
-        for (size_t i = 0; i + 1 < parameters.size(); i += 2) {
-            if (parameters[i] == "auto-unpause") {
-                if (parameters[i + 1] == "0") {
-                    enable_auto_unpause(out, false);
-                } else if (parameters[i + 1] == "1") {
-                    enable_auto_unpause(out, true);
-                } else {
-                    return DFHack::CR_WRONG_USAGE;
-                }
-            } else if (parameters[i] == "auto-disengage") {
-                if (parameters[i + 1] == "0") {
-                    disengage_enabled = false;
-                } else if (parameters[i + 1] == "1") {
-                    disengage_enabled = true;
-                } else {
-                    return DFHack::CR_WRONG_USAGE;
-                }
-            } else if (parameters[i] == "focus-jobs") {
-                if (parameters[i + 1] == "0") {
-                    focus_jobs_enabled = false;
-                } else if (parameters[i + 1] == "1") {
-                    focus_jobs_enabled = true;
-                } else {
-                    return DFHack::CR_WRONG_USAGE;
-                }
-            } else if (parameters[i] == "tick-threshold") {
+        if (parameters.size() >= 2 && parameters.size() <= 3) {
+            bool state;
+            bool set = false;
+            if (parameters[0] == "enable") {
+                state = true;
+            } else if (parameters[0] == "disable") {
+                state = false;
+            } else if (parameters[0] == "set") {
+                set = true;
+            } else {
+                return DFHack::CR_WRONG_USAGE;
+            }
+            auto &arg = parameters[1];
+            if(arg == "auto-unpause"){
+                enable_auto_unpause(out, state);
+            } else if (arg == "auto-disengage") {
+                disengage_enabled = state;
+            } else if (arg == "focus-jobs") {
+                focus_jobs_enabled = state;
+            } else if (arg == "tick-threshold" && set && parameters.size() == 3) {
                 try {
-                    tick_threshold = std::stol(parameters[i + 1]);
+                    tick_threshold = std::stol(parameters[2]);
                 } catch (const std::exception &e) {
                     out.printerr("%s\n", e.what());
                 }

From 851ff10959fb4aa86f4e3e693c4eca17d22a2f16 Mon Sep 17 00:00:00 2001
From: Josh Cooper <cooper.s.josh@outlook.com>
Date: Fri, 14 Oct 2022 18:23:48 -0700
Subject: [PATCH 790/854] Fixes uninitialized warning

---
 plugins/spectate/spectate.cpp | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/plugins/spectate/spectate.cpp b/plugins/spectate/spectate.cpp
index 123811d9b..d46f3368a 100644
--- a/plugins/spectate/spectate.cpp
+++ b/plugins/spectate/spectate.cpp
@@ -258,7 +258,7 @@ void enable_auto_unpause(color_ostream &out, bool state) {
 command_result spectate (color_ostream &out, std::vector <std::string> & parameters) {
     if (!parameters.empty()) {
         if (parameters.size() >= 2 && parameters.size() <= 3) {
-            bool state;
+            bool state =false;
             bool set = false;
             if (parameters[0] == "enable") {
                 state = true;
@@ -269,14 +269,13 @@ command_result spectate (color_ostream &out, std::vector <std::string> & paramet
             } else {
                 return DFHack::CR_WRONG_USAGE;
             }
-            auto &arg = parameters[1];
-            if(arg == "auto-unpause"){
+            if(parameters[1] == "auto-unpause"){
                 enable_auto_unpause(out, state);
-            } else if (arg == "auto-disengage") {
+            } else if (parameters[1] == "auto-disengage") {
                 disengage_enabled = state;
-            } else if (arg == "focus-jobs") {
+            } else if (parameters[1] == "focus-jobs") {
                 focus_jobs_enabled = state;
-            } else if (arg == "tick-threshold" && set && parameters.size() == 3) {
+            } else if (parameters[1] == "tick-threshold" && set && parameters.size() == 3) {
                 try {
                     tick_threshold = std::stol(parameters[2]);
                 } catch (const std::exception &e) {

From fd747525d086633ddcab98a4f6fd1ad318218bad Mon Sep 17 00:00:00 2001
From: Josh Cooper <cppcooper@users.noreply.github.com>
Date: Sat, 15 Oct 2022 22:58:21 -0700
Subject: [PATCH 791/854] Removes atomic_bool from pause.h

this is 99% for triggering CI
---
 plugins/spectate/pause.h | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/plugins/spectate/pause.h b/plugins/spectate/pause.h
index 4386f4384..ab736ed53 100644
--- a/plugins/spectate/pause.h
+++ b/plugins/spectate/pause.h
@@ -1,7 +1,6 @@
 #pragma once
 #include <unordered_set>
 #include <string>
-#include <atomic>
 #include <ColorText.h>
 
 namespace DFHack {
@@ -11,10 +10,10 @@ namespace DFHack {
     {
         class Lock
         {
-            std::atomic_bool locked{};
+            bool locked = false;
         public:
             const std::string name;
-            explicit Lock(const char* name) : name(name){ locked = false; }
+            explicit Lock(const char* name) : name(name){}
             virtual ~Lock()= default;
             virtual bool isAnyLocked() const = 0;
             virtual bool isOnlyLocked() const = 0;

From 82f759c56e6ad86526d3849859461fd6c65b35b8 Mon Sep 17 00:00:00 2001
From: Tachytaenius <henryfthomson@gmail.com>
Date: Wed, 19 Oct 2022 21:26:20 +0100
Subject: [PATCH 792/854] Single-character typo adjustment in Lua API.rst

---
 docs/Lua API.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/Lua API.rst b/docs/Lua API.rst
index 5cfd8cf09..58d5015b6 100644
--- a/docs/Lua API.rst	
+++ b/docs/Lua API.rst	
@@ -3354,7 +3354,7 @@ A module for reading custom tokens added to the raws by mods.
 
   Where ``typeInstance`` is a unit, entity, item, job, projectile, building, plant, or interaction
   instance. Gets ``typeDefinition`` and then returns the same as ``getToken(typeDefinition, token)``.
-  For units, it gets the token from the race or caste instead if applicable. For plants growth items,
+  For units, it gets the token from the race or caste instead if applicable. For plant growth items,
   it gets the token from the plant or plant growth instead if applicable. For plants it does the same
   but with growth number -1.
 

From 43f4d4be399ab02cc4ffb4dd63d110cfb26dedfe Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Wed, 19 Oct 2022 13:14:35 -0700
Subject: [PATCH 793/854] fix typo in keybinding docs

---
 docs/builtins/keybinding.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/builtins/keybinding.rst b/docs/builtins/keybinding.rst
index e7e738bc8..6d1565509 100644
--- a/docs/builtins/keybinding.rst
+++ b/docs/builtins/keybinding.rst
@@ -10,7 +10,7 @@ bindings are not remembered between runs of the game unless re-created in
 `dfhack.init`.
 
 Hotkeys can be any combinations of Ctrl/Alt/Shift with A-Z, 0-9, F1-F12, or
-``\``` (the key below the ``Esc`` key.
+\` (the key below the :kbd:`Esc` key.
 
 Usage
 -----

From 9199f8207fb4f7d3125b09e5a19fcdd69ab04d4a Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Wed, 19 Oct 2022 14:01:35 -0700
Subject: [PATCH 794/854] add global keybinding for on-screen keyboard

---
 data/init/dfhack.keybindings.init | 13 ++++++++++---
 docs/changelog.txt                |  1 +
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/data/init/dfhack.keybindings.init b/data/init/dfhack.keybindings.init
index 2ee706b09..fd02635e2 100644
--- a/data/init/dfhack.keybindings.init
+++ b/data/init/dfhack.keybindings.init
@@ -4,9 +4,9 @@
 # defaults when you update DFHack. Instead, add your configuration to
 # dfhack-config/init/dfhack.init
 
-##############################
-# Generic dwarfmode bindings #
-##############################
+###################
+# Global bindings #
+###################
 
 # the GUI command launcher (two bindings since some keyboards don't have `)
 keybinding add ` gui/launcher
@@ -16,6 +16,13 @@ keybinding add Ctrl-Shift-D gui/launcher
 keybinding add Ctrl-F1 hotkeys
 keybinding add Alt-F1 hotkeys
 
+# on-screen keyboard
+keybinding add Ctrl-Shift-K gui/cp437-table
+
+##############################
+# Generic dwarfmode bindings #
+##############################
+
 # toggle the display of water level as 1-7 tiles
 keybinding add Ctrl-W twaterlvl
 
diff --git a/docs/changelog.txt b/docs/changelog.txt
index a4fef7c57..8b5603a6f 100644
--- a/docs/changelog.txt
+++ b/docs/changelog.txt
@@ -53,6 +53,7 @@ changelog.txt uses a syntax similar to RST, with a few special sequences:
 - UX: You can now drag the scrollbar to scroll to a specific spot
 - `overlay`: reduce the size of the "DFHack Launcher" button
 - Constructions module: ``findAtTile`` now uses a binary search intead of a linear search.
+- `gui/cp437-table`: new global keybinding for the clickable on-screen keyboard for players with keyboard layouts that prevent them from using certain keys: Ctrl-Shift-K
 
 ## Documentation
 

From f94cc3fda04df267431cb1b694601969d732262d Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Wed, 19 Oct 2022 16:24:21 -0700
Subject: [PATCH 795/854] add backtick to keybinding's hardcoded docs

---
 library/Core.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/library/Core.cpp b/library/Core.cpp
index 73336b2e7..669015096 100644
--- a/library/Core.cpp
+++ b/library/Core.cpp
@@ -963,7 +963,7 @@ command_result Core::runCommand(color_ostream &con, const std::string &first_, v
                 << "  keybinding set <key>[@context] \"cmdline\" \"cmdline\"..." << endl
                 << "  keybinding add <key>[@context] \"cmdline\" \"cmdline\"..." << endl
                 << "Later adds, and earlier items within one command have priority." << endl
-                << "Supported keys: [Ctrl-][Alt-][Shift-](A-Z, 0-9, F1-F12, or Enter)." << endl
+                << "Supported keys: [Ctrl-][Alt-][Shift-](A-Z, 0-9, F1-F12, `, or Enter)." << endl
                 << "Context may be used to limit the scope of the binding, by" << endl
                 << "requiring the current context to have a certain prefix." << endl
                 << "Current UI context is: "

From 666edd6d60d99f49ce2556af0c58e53d8795c6c0 Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Wed, 19 Oct 2022 16:47:54 -0700
Subject: [PATCH 796/854] don't overwrite dig priority by accident

many callers of setDesignationAt simply didn't bother with the priority
parameter. change the default value of the priority param so that by
default we will keep the previous value instead of overwriting it
---
 docs/changelog.txt                 |  1 +
 library/include/modules/MapCache.h | 12 +++++++++---
 library/modules/MapCache.cpp       |  2 +-
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/docs/changelog.txt b/docs/changelog.txt
index 8b5603a6f..b2bf9f4c0 100644
--- a/docs/changelog.txt
+++ b/docs/changelog.txt
@@ -36,6 +36,7 @@ changelog.txt uses a syntax similar to RST, with a few special sequences:
 ## New Plugins
 
 ## Fixes
+- `tiletypes`: no longer resets dig priority to the default when updating other properties of a tile
 
 ## Misc Improvements
 - `blueprint`: new ``--smooth`` option for recording all smoothed floors and walls instead of just the ones that require smoothing for later carving
diff --git a/library/include/modules/MapCache.h b/library/include/modules/MapCache.h
index 70ba0a858..522746fb0 100644
--- a/library/include/modules/MapCache.h
+++ b/library/include/modules/MapCache.h
@@ -267,7 +267,7 @@ public:
     {
         return index_tile(designation,p);
     }
-    bool setDesignationAt(df::coord2d p, df::tile_designation des, int32_t priority = 4000)
+    bool setDesignationAt(df::coord2d p, df::tile_designation des, int32_t priority = 0)
     {
         if(!valid) return false;
         dirty_designations = true;
@@ -276,6 +276,12 @@ public:
         index_tile(designation,p) = des;
         if((des.bits.dig || des.bits.smooth) && block) {
             block->flags.bits.designated = true;
+            // if priority is not specified, keep the existing priority if it
+            // is set. otherwise default to 4000.
+            if (priority <= 0)
+                priority = priorityAt(p);
+            if (priority <= 0)
+                priority = 4000;
             setPriorityAt(p, priority);
         }
         return true;
@@ -554,8 +560,8 @@ class DFHACK_EXPORT MapCache
         Block * b= BlockAtTile(tilecoord);
         return b ? b->DesignationAt(tilecoord) : df::tile_designation();
     }
-    // priority is optional, only set if >= 0
-    bool setDesignationAt (DFCoord tilecoord, df::tile_designation des, int32_t priority = 4000)
+    // if priority is 0, it is kept unchanged if previously set, otherwise 4000
+    bool setDesignationAt (DFCoord tilecoord, df::tile_designation des, int32_t priority = 0)
     {
         if (Block *b = BlockAtTile(tilecoord))
         {
diff --git a/library/modules/MapCache.cpp b/library/modules/MapCache.cpp
index ce3039ecf..b88a078b1 100644
--- a/library/modules/MapCache.cpp
+++ b/library/modules/MapCache.cpp
@@ -303,7 +303,7 @@ int32_t MapExtras::Block::priorityAt(df::coord2d pos)
 
 bool MapExtras::Block::setPriorityAt(df::coord2d pos, int32_t priority)
 {
-    if (!block || priority < 0)
+    if (!block || priority <= 0)
         return false;
 
     auto event = getPriorityEvent(block, true);

From 142b45ef49d4b932239f28afc6a44780a127552a Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Wed, 19 Oct 2022 17:30:51 -0700
Subject: [PATCH 797/854] move list item hotkey hint left by one tile

so it doesn't get covered by the scrollbar
---
 library/lua/gui/widgets.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/library/lua/gui/widgets.lua b/library/lua/gui/widgets.lua
index eb8d92244..fd5f83a59 100644
--- a/library/lua/gui/widgets.lua
+++ b/library/lua/gui/widgets.lua
@@ -1192,7 +1192,7 @@ function List:onRenderBody(dc)
 
         if obj.key then
             local keystr = gui.getKeyDisplay(obj.key)
-            ip = ip-2-#keystr
+            ip = ip-3-#keystr
             dc:seek(ip,y):pen(self.text_pen)
             dc:string('('):string(keystr,COLOR_LIGHTGREEN):string(')')
         end

From 1e21e6546ea61b34e66aad4088eb502ffe21947d Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Wed, 19 Oct 2022 17:31:28 -0700
Subject: [PATCH 798/854] fix materials selection dialog

where the filter was swallowing the sublist hotkeys
---
 docs/changelog.txt            | 1 +
 library/lua/gui/materials.lua | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/docs/changelog.txt b/docs/changelog.txt
index b2bf9f4c0..1a2cf1c0a 100644
--- a/docs/changelog.txt
+++ b/docs/changelog.txt
@@ -36,6 +36,7 @@ changelog.txt uses a syntax similar to RST, with a few special sequences:
 ## New Plugins
 
 ## Fixes
+- `gui/create-item`: prevent materials list filter from intercepting sublist hotkeys
 - `tiletypes`: no longer resets dig priority to the default when updating other properties of a tile
 
 ## Misc Improvements
diff --git a/library/lua/gui/materials.lua b/library/lua/gui/materials.lua
index c81161bc5..165fda3e6 100644
--- a/library/lua/gui/materials.lua
+++ b/library/lua/gui/materials.lua
@@ -56,6 +56,8 @@ function MaterialDialog:init(info)
             frame = { l = 0, r = 0, t = 4, b = 2 },
             icon_width = 2,
             on_submit = self:callback('onSubmitItem'),
+            edit_ignore_keys={'CUSTOM_SHIFT_I', 'CUSTOM_SHIFT_C',
+                              'CUSTOM_SHIFT_P'},
         },
         widgets.Label{
             text = { {

From 0bf53dc0e4f6eb2a971ffb4b0ee744bed74094e4 Mon Sep 17 00:00:00 2001
From: DFHack-Urist via GitHub Actions
 <63161697+DFHack-Urist@users.noreply.github.com>
Date: Thu, 20 Oct 2022 07:30:58 +0000
Subject: [PATCH 799/854] Auto-update submodules

scripts: master
---
 scripts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts b/scripts
index 0be5cc0ea..efa8aeba8 160000
--- a/scripts
+++ b/scripts
@@ -1 +1 @@
-Subproject commit 0be5cc0eaf625029ef26392224db5c3d2822a63d
+Subproject commit efa8aeba8716afabe42d015346213b1e15438169

From f66dd6f4046589ce56568e83426379e652572785 Mon Sep 17 00:00:00 2001
From: Josh Cooper <cooper.s.josh@outlook.com>
Date: Thu, 20 Oct 2022 23:52:30 -0700
Subject: [PATCH 800/854] Implements change requests

- removes redundant `if (df::global::ui)` checks; and tested to ensure no segfaults cropped up like in the past times I've removed these
- removes useless `if (pause_lock)` pause lock is set when plugin initializes, even if pause lock was left null (since we technically don't need it, and that was the point of the null check) it still would be a useless check (actually an impediment preventing functionality)
- removes disabled interpose code
- removes lua linkage
- updates doc

extra:
- surrounds user input for tick frequency with `std::abs()` not that we would have ended up with a negative value, but it was probably a typo and this is easier than printing an error or letting it underflow past max int (on most systems)
---
 docs/plugins/spectate.rst       |   8 +--
 plugins/spectate/CMakeLists.txt |   2 +-
 plugins/spectate/spectate.cpp   | 103 +++++++++++++-------------------
 3 files changed, 45 insertions(+), 68 deletions(-)

diff --git a/docs/plugins/spectate.rst b/docs/plugins/spectate.rst
index 8d4b6bdee..62b7cf667 100644
--- a/docs/plugins/spectate.rst
+++ b/docs/plugins/spectate.rst
@@ -19,10 +19,6 @@ When enabled, the plugin will automatically switch which dwarf is being
 followed periodically, preferring dwarves on z-levels with the highest
 job activity.
 
-To set features that toggle between two states, use {0,1} to specify
-which state the feature should be in. Anything else will take any positive
-value.
-
 Changes to plugin settings will be saved per world. Whether the plugin itself
 is enabled or not is not saved.
 
@@ -32,11 +28,11 @@ Examples
 ``spectate``
     The plugin reports its feature status.
 
-``spectate auto-unpause 1``
+``spectate enable auto-unpause``
     Enable the spectate plugin to automatically dismiss pause events caused
     by the game. Siege events are one example of such a game event.
 
-``spectate tick-interval 50``
+``spectate set tick-interval 50``
     Set the tick interval the followed dwarf can be changed at back to its
     default value.
 
diff --git a/plugins/spectate/CMakeLists.txt b/plugins/spectate/CMakeLists.txt
index 5ba1ed9cf..d2de072d8 100644
--- a/plugins/spectate/CMakeLists.txt
+++ b/plugins/spectate/CMakeLists.txt
@@ -5,4 +5,4 @@ SET(SOURCES
         spectate.cpp
         pause.cpp)
 
-dfhack_plugin(${PROJECT_NAME} ${SOURCES} LINK_LIBRARIES lua)
+dfhack_plugin(${PROJECT_NAME} ${SOURCES})
diff --git a/plugins/spectate/spectate.cpp b/plugins/spectate/spectate.cpp
index d46f3368a..8e4575fb0 100644
--- a/plugins/spectate/spectate.cpp
+++ b/plugins/spectate/spectate.cpp
@@ -80,18 +80,6 @@ inline void saveConfig() {
     }
 }
 
-//struct player_pause_hook : df::viewscreen_dwarfmodest {
-//    typedef df::viewscreen_dwarfmodest interpose_base;
-//    DEFINE_VMETHOD_INTERPOSE(void, feed, (std::set<df::interface_key>* input)) {
-//        if ((ui->main.mode == ui_sidebar_mode::Default) && !allow_player_pause) {
-//            input->erase(interface_key::D_PAUSE);
-//        }
-//        INTERPOSE_NEXT(feed)(input);
-//    }
-//};
-//
-//IMPLEMENT_VMETHOD_INTERPOSE(player_pause_hook, feed);
-
 command_result spectate (color_ostream &out, std::vector <std::string> & parameters);
 
 DFhackCExport command_result plugin_init (color_ostream &out, std::vector <PluginCommand> &commands) {
@@ -206,51 +194,49 @@ void enable_auto_unpause(color_ostream &out, bool state) {
     // we don't need to do any of this yet if the plugin isn't enabled
     if (enabled) {
         // todo: R.E. UNDEAD_ATTACK event [still pausing regardless of announcement settings]
-        if(pause_lock) {
-            // lock_collision == true means: enable_auto_unpause() was already invoked and didn't complete
-            // The onupdate function above ensure the procedure properly completes, thus we only care about
-            // state reversal here ergo `enabled != state`
-            if (lock_collision && unpause_enabled != state) {
-                out.print("handling collision\n");
-                // if unpaused_enabled is true, then a lock collision means: we couldn't save/disable the pause settings,
-                // therefore nothing to revert and the lock won't even be engaged (nothing to unlock)
-                lock_collision = false;
-                unpause_enabled = state;
-                if (unpause_enabled) {
-                    // a collision means we couldn't restore the pause settings, therefore we only need re-engage the lock
-                    pause_lock->lock();
-                }
-                return;
+        // lock_collision == true means: enable_auto_unpause() was already invoked and didn't complete
+        // The onupdate function above ensure the procedure properly completes, thus we only care about
+        // state reversal here ergo `enabled != state`
+        if (lock_collision && unpause_enabled != state) {
+            out.print("handling collision\n");
+            // if unpaused_enabled is true, then a lock collision means: we couldn't save/disable the pause settings,
+            // therefore nothing to revert and the lock won't even be engaged (nothing to unlock)
+            lock_collision = false;
+            unpause_enabled = state;
+            if (unpause_enabled) {
+                // a collision means we couldn't restore the pause settings, therefore we only need re-engage the lock
+                pause_lock->lock();
             }
-            // update the announcement settings if we can
-            if (state) {
-                if (World::SaveAnnouncementSettings()) {
-                    World::DisableAnnouncementPausing();
-                    announcements_disabled = true;
-                    pause_lock->lock();
-                } else {
-                    out.printerr("lock collision enabling auto-unpause\n");
-                    lock_collision = true;
-                }
+            return;
+        }
+        // update the announcement settings if we can
+        if (state) {
+            if (World::SaveAnnouncementSettings()) {
+                World::DisableAnnouncementPausing();
+                announcements_disabled = true;
+                pause_lock->lock();
             } else {
-                pause_lock->unlock();
-                if (announcements_disabled) {
-                    if (!World::RestoreAnnouncementSettings()) {
-                        // this in theory shouldn't happen, if others use the lock like we do in spectate
-                        out.printerr("lock collision disabling auto-unpause\n");
-                        lock_collision = true;
-                    } else {
-                        announcements_disabled = false;
-                    }
-                }
+                out.printerr("lock collision enabling auto-unpause\n");
+                lock_collision = true;
             }
-            if (lock_collision) {
-                out.printerr(
-                        "auto-unpause: must wait for another Pausing::AnnouncementLock to be lifted.\n"
-                        "The action you were attempting will complete when the following lock or locks lift.\n");
-                pause_lock->reportLocks(out);
+        } else {
+            pause_lock->unlock();
+            if (announcements_disabled) {
+                if (!World::RestoreAnnouncementSettings()) {
+                    // this in theory shouldn't happen, if others use the lock like we do in spectate
+                    out.printerr("lock collision disabling auto-unpause\n");
+                    lock_collision = true;
+                } else {
+                    announcements_disabled = false;
+                }
             }
         }
+        if (lock_collision) {
+            out.printerr(
+                    "auto-unpause: must wait for another Pausing::AnnouncementLock to be lifted.\n"
+                    "The action you were attempting will complete when the following lock or locks lift.\n");
+            pause_lock->reportLocks(out);
+        }
     }
     unpause_enabled = state;
 }
@@ -277,7 +263,7 @@ command_result spectate (color_ostream &out, std::vector <std::string> & paramet
                 focus_jobs_enabled = state;
             } else if (parameters[1] == "tick-threshold" && set && parameters.size() == 3) {
                 try {
-                    tick_threshold = std::stol(parameters[2]);
+                    tick_threshold = std::abs(std::stol(parameters[2]));
                 } catch (const std::exception &e) {
                     out.printerr("%s\n", e.what());
                 }
@@ -298,7 +284,6 @@ command_result spectate (color_ostream &out, std::vector <std::string> & paramet
 
 // every tick check whether to decide to follow a dwarf
 void onTick(color_ostream& out, void* ptr) {
-    if (!df::global::ui) return;
     int32_t tick = df::global::world->frame_counter;
     if (our_dorf) {
         if (!Units::isAlive(our_dorf)) {
@@ -315,7 +300,6 @@ void onTick(color_ostream& out, void* ptr) {
             dwarves.push_back(unit);
         }
         std::uniform_int_distribution<uint64_t> follow_any(0, dwarves.size() - 1);
-        if (df::global::ui) {
             // if you're looking at a warning about a local address escaping, it means the unit* from dwarves (which aren't local)
             our_dorf = dwarves[follow_any(RNG)];
             df::global::ui->follow_unit = our_dorf->id;
@@ -324,7 +308,7 @@ void onTick(color_ostream& out, void* ptr) {
             if (!job_watched) {
                 timestamp = tick;
             }
-        }
+
     }
 }
 
@@ -345,8 +329,7 @@ void onJobStart(color_ostream& out, void* job_ptr) {
         std::bernoulli_distribution follow_job(p);
         if (!job->flags.bits.special && follow_job(RNG)) {
             job_watched = job;
-            df::unit* unit = Job::getWorker(job);
-            if (df::global::ui && unit) {
+            if (df::unit* unit = Job::getWorker(job)) {
                 our_dorf = unit;
                 df::global::ui->follow_unit = unit->id;
             }
@@ -360,9 +343,7 @@ void onJobStart(color_ostream& out, void* job_ptr) {
                 nonworkers.push_back(unit);
             }
             std::uniform_int_distribution<> follow_drunk(0, nonworkers.size() - 1);
-            if (df::global::ui) {
-                df::global::ui->follow_unit = nonworkers[follow_drunk(RNG)]->id;
-            }
+            df::global::ui->follow_unit = nonworkers[follow_drunk(RNG)]->id;
         }
     }
 }

From a39d3f20a72d451ff0779544bc87b7962ecd77ed Mon Sep 17 00:00:00 2001
From: Josh Cooper <cooper.s.josh@outlook.com>
Date: Fri, 21 Oct 2022 00:02:42 -0700
Subject: [PATCH 801/854] Replaces unsigned integer for freq map's value to
 ensure reasonable p's

---
 plugins/spectate/spectate.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/spectate/spectate.cpp b/plugins/spectate/spectate.cpp
index 8e4575fb0..a0011740f 100644
--- a/plugins/spectate/spectate.cpp
+++ b/plugins/spectate/spectate.cpp
@@ -54,7 +54,7 @@ df::job* job_watched = nullptr;
 int32_t timestamp = -1;
 
 std::set<int32_t> job_tracker;
-std::map<uint16_t,uint16_t> freq;
+std::map<uint16_t,int16_t> freq;
 std::default_random_engine RNG;
 
 void enable_auto_unpause(color_ostream &out, bool state);

From 593b80cfa0ef40ece3b7848b3999e7617d1d1464 Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Fri, 21 Oct 2022 12:17:59 -0700
Subject: [PATCH 802/854] make scrollbars more responsive when dragging

---
 docs/Lua API.rst            | 12 +++++--
 library/lua/gui/widgets.lua | 64 +++++++++++++++++++++----------------
 2 files changed, 46 insertions(+), 30 deletions(-)

diff --git a/docs/Lua API.rst b/docs/Lua API.rst
index 58d5015b6..b72221787 100644
--- a/docs/Lua API.rst	
+++ b/docs/Lua API.rst	
@@ -4052,7 +4052,11 @@ Scrollbars have the following attributes:
 
 :fg: Specifies the pen for the scroll icons and the active part of the bar. Default is ``COLOR_LIGHTGREEN``.
 :bg: Specifies the pen for the background part of the scrollbar. Default is ``COLOR_CYAN``.
-:on_scroll: A callback called when the scrollbar is scrolled. It will be called with a single string parameter with a value of "up_large", "down_large", "up_small", or "down_small".
+:on_scroll: A callback called when the scrollbar is scrolled. If the scrollbar is clicked,
+  the callback will be called with one of the following string parameters: "up_large",
+  "down_large", "up_small", or "down_small". If the scrollbar is dragged, the callback will
+  be called with the value that ``top_elem`` should be set to on the next call to
+  ``update()`` (see below).
 
 The Scrollbar widget implements the following methods:
 
@@ -4062,8 +4066,10 @@ The Scrollbar widget implements the following methods:
   The ``top_elem`` param is the (one-based) index of the first visible element.
   The ``elems_per_page`` param is the maximum number of elements that can be
   shown at one time. The ``num_elems`` param is the total number of elements
-  that the paried widget can scroll through. The scrollbar will adjust its
-  scrollbar size and position accordingly.
+  that the paried widget can scroll through. If ``elems_per_page`` or
+  ``num_elems`` is not specified, the most recently specified value for these
+  parameters is used. The scrollbar will adjust its scrollbar size and position
+  according to the values passed to this function.
 
 Clicking on the arrows at the top or the bottom of a scrollbar will scroll an
 associated widget by a small amount. Clicking on the unfilled portion of the
diff --git a/library/lua/gui/widgets.lua b/library/lua/gui/widgets.lua
index fd5f83a59..415bba3d3 100644
--- a/library/lua/gui/widgets.lua
+++ b/library/lua/gui/widgets.lua
@@ -363,8 +363,6 @@ end
 -- Scrollbar --
 ---------------
 
--- these can be overridden by the user, e.g.:
---   require('gui.widgets').SCROLL_DELAY_MS = 100
 SCROLL_INITIAL_DELAY_MS = 300
 SCROLL_DELAY_MS = 20
 
@@ -389,6 +387,17 @@ function Scrollbar:init()
     self:update(1, 1, 1)
 end
 
+local function scrollbar_get_max_pos_and_height(scrollbar)
+    local frame_body = scrollbar.frame_body
+    local scrollbar_body_height = (frame_body and frame_body.height or 3) - 2
+
+    local height = math.max(1, math.floor(
+        (math.min(scrollbar.elems_per_page, scrollbar.num_elems) * scrollbar_body_height) /
+        scrollbar.num_elems))
+
+    return scrollbar_body_height - height, height
+end
+
 -- calculate and cache the number of tiles of empty space above the top of the
 -- scrollbar and the number of tiles the scrollbar should occupy to represent
 -- the percentage of text that is on the screen.
@@ -398,39 +407,33 @@ function Scrollbar:update(top_elem, elems_per_page, num_elems)
     if not top_elem then error('must specify index of new top element') end
     elems_per_page = elems_per_page or self.elems_per_page
     num_elems = num_elems or self.num_elems
+    self.top_elem = top_elem
+    self.elems_per_page, self.num_elems = elems_per_page, num_elems
 
-    local frame_height = self.frame_body and self.frame_body.height or 3
-    local scrollbar_body_height = frame_height - 2
-    local height = math.max(1, math.floor(
-        (math.min(elems_per_page, num_elems) * scrollbar_body_height) /
-        num_elems))
-
-    local max_pos = scrollbar_body_height - height
+    local max_pos, height = scrollbar_get_max_pos_and_height(self)
     local pos = (num_elems == elems_per_page) and 0 or
             math.ceil(((top_elem-1) * max_pos) /
                       (num_elems - elems_per_page))
 
-    self.top_elem = top_elem
-    self.elems_per_page, self.num_elems = elems_per_page, num_elems
     self.bar_offset, self.bar_height = pos, height
 end
 
 local function scrollbar_do_drag(scrollbar)
-    local x,y = dfhack.screen.getMousePos()
-    x,y = scrollbar.frame_body:localXY(x,y)
-    local bar_idx = y - scrollbar.bar_offset
-    local delta = bar_idx - scrollbar.is_dragging
-    if delta < -scrollbar.bar_height then
-        scrollbar.on_scroll('up_large')
-    elseif delta < 0 then
-        scrollbar.on_scroll('up_small')
-    elseif delta > scrollbar.bar_height then
-        scrollbar.on_scroll('down_large')
-    elseif delta > 0 then
-        scrollbar.on_scroll('down_small')
+    local _,y = scrollbar.frame_body:localXY(dfhack.screen.getMousePos())
+    local cur_pos = y - scrollbar.is_dragging
+    local max_top = scrollbar.num_elems - scrollbar.elems_per_page + 1
+    local max_pos = scrollbar_get_max_pos_and_height(scrollbar)
+    local new_top_elem = math.floor(cur_pos * max_top / max_pos) + 1
+    new_top_elem = math.max(1, math.min(new_top_elem, max_top))
+    if new_top_elem ~= scrollbar.top_elem then
+        scrollbar.on_scroll(new_top_elem)
     end
 end
 
+local function scrollbar_is_visible(scrollbar)
+    return scrollbar.elems_per_page < scrollbar.num_elems
+end
+
 local UP_ARROW_CHAR = string.char(24)
 local DOWN_ARROW_CHAR = string.char(25)
 local NO_ARROW_CHAR = string.char(32)
@@ -439,7 +442,7 @@ local BAR_BG_CHAR = string.char(179)
 
 function Scrollbar:onRenderBody(dc)
     -- don't draw if all elements are visible
-    if self.elems_per_page >= self.num_elems then return end
+    if not scrollbar_is_visible(self) then return end
     -- render up arrow if we're not at the top
     dc:seek(0, 0):char(
         self.top_elem == 1 and NO_ARROW_CHAR or UP_ARROW_CHAR, self.fg, self.bg)
@@ -482,7 +485,10 @@ function Scrollbar:onRenderBody(dc)
 end
 
 function Scrollbar:onInput(keys)
-    if not keys._MOUSE_L_DOWN or not self.on_scroll then return false end
+    if not keys._MOUSE_L_DOWN or not self.on_scroll
+            or not scrollbar_is_visible(self) then
+        return false
+    end
     local _,y = self:getMousePos()
     if not y then return false end
     local scroll_spec = nil
@@ -761,7 +767,9 @@ end
 
 function Label:on_scrollbar(scroll_spec)
     local v = 0
-    if scroll_spec == 'down_large' then
+    if tonumber(scroll_spec) then
+        v = scroll_spec - self.start_line_num
+    elseif scroll_spec == 'down_large' then
         v = '+halfpage'
     elseif scroll_spec == 'up_large' then
         v = '-halfpage'
@@ -1134,7 +1142,9 @@ end
 
 function List:on_scrollbar(scroll_spec)
     local v = 0
-    if scroll_spec == 'down_large' then
+    if tonumber(scroll_spec) then
+        v = scroll_spec - self.page_top
+    elseif scroll_spec == 'down_large' then
         v = math.ceil(self.page_size / 2)
     elseif scroll_spec == 'up_large' then
         v = -math.ceil(self.page_size / 2)

From 64b923b9eb02264772757facf34d2bb3c9f4d345 Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Fri, 21 Oct 2022 12:43:53 -0700
Subject: [PATCH 803/854] make the materials dialog filter lcase only

this allows the capital letter hotkeys to be processed by the list
widget without the special-casing of the ignore_keys attribute.
---
 docs/Lua API.rst              |  3 ++-
 docs/changelog.txt            |  1 +
 library/lua/gui/materials.lua |  3 +--
 library/lua/gui/widgets.lua   | 12 +++++++++++-
 4 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/docs/Lua API.rst b/docs/Lua API.rst
index 58d5015b6..c4bf56548 100644
--- a/docs/Lua API.rst	
+++ b/docs/Lua API.rst	
@@ -4382,7 +4382,8 @@ supports:
 :edit_pen: If specified, used instead of ``cursor_pen`` for the edit field.
 :edit_below: If true, the edit field is placed below the list instead of above.
 :edit_key: If specified, the edit field is disabled until this key is pressed.
-:edit_ignore_keys: If specified, must be a list of key names that the filter edit field should ignore.
+:edit_ignore_keys: If specified, will be passed to the filter edit field as its ``ignore_keys`` attribute.
+:edit_on_char: If specified, will be passed to the filter edit field as its ``on_char`` attribute.
 :not_found_label: Specifies the text of the label shown when no items match the filter.
 
 The list choices may include the following attributes:
diff --git a/docs/changelog.txt b/docs/changelog.txt
index 1a2cf1c0a..af2e6b3fa 100644
--- a/docs/changelog.txt
+++ b/docs/changelog.txt
@@ -66,6 +66,7 @@ changelog.txt uses a syntax similar to RST, with a few special sequences:
 - ``widgets.Scrollbar``: new scrollbar widget that can be paired with an associated scrollable widget. Integrated with ``widgets.Label`` and ``widgets.List``.
 - ``dfhack.constructions.findAtTile()``: exposed preexisting function to Lua.
 - ``dfhack.constructions.insert()``: exposed new function to Lua.
+- ``widgets.EditField`` now allows other widgets to process characters that the ``on_char`` callback rejects.
 
 # 0.47.05-r7
 
diff --git a/library/lua/gui/materials.lua b/library/lua/gui/materials.lua
index 165fda3e6..1fbce4377 100644
--- a/library/lua/gui/materials.lua
+++ b/library/lua/gui/materials.lua
@@ -56,8 +56,7 @@ function MaterialDialog:init(info)
             frame = { l = 0, r = 0, t = 4, b = 2 },
             icon_width = 2,
             on_submit = self:callback('onSubmitItem'),
-            edit_ignore_keys={'CUSTOM_SHIFT_I', 'CUSTOM_SHIFT_C',
-                              'CUSTOM_SHIFT_P'},
+            edit_on_char=function(c) return c:match('%l') end,
         },
         widgets.Label{
             text = { {
diff --git a/library/lua/gui/widgets.lua b/library/lua/gui/widgets.lua
index fd5f83a59..fb2570b6f 100644
--- a/library/lua/gui/widgets.lua
+++ b/library/lua/gui/widgets.lua
@@ -326,6 +326,8 @@ function EditField:onInput(keys)
             if not self.on_char or self.on_char(cv, old) then
                 self:setText(old:sub(1,self.cursor-1)..cv..old:sub(self.cursor),
                              self.cursor + 1)
+            elseif self.on_char then
+                return self.modal
             end
         end
         if self.on_change and self.text ~= old then
@@ -1274,14 +1276,22 @@ FilteredList.ATTRS {
     edit_below = false,
     edit_key = DEFAULT_NIL,
     edit_ignore_keys = DEFAULT_NIL,
+    edit_on_char = DEFAULT_NIL,
 }
 
 function FilteredList:init(info)
+    local on_char = self:callback('onFilterChar')
+    if self.edit_on_char then
+        on_char = function(c, text)
+            return self.edit_on_char(c, text) and self:onFilterChar(c, text)
+        end
+    end
+
     self.edit = EditField{
         text_pen = info.edit_pen or info.cursor_pen,
         frame = { l = info.icon_width, t = 0, h = 1 },
         on_change = self:callback('onFilterChange'),
-        on_char = self:callback('onFilterChar'),
+        on_char = on_char,
         key = self.edit_key,
         ignore_keys = self.edit_ignore_keys,
     }

From 75f929ccebcc91fb2ea8638f841d3049051de995 Mon Sep 17 00:00:00 2001
From: DFHack-Urist via GitHub Actions
 <63161697+DFHack-Urist@users.noreply.github.com>
Date: Sun, 23 Oct 2022 07:25:20 +0000
Subject: [PATCH 804/854] Auto-update submodules

scripts: master
---
 scripts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts b/scripts
index efa8aeba8..23b95d66b 160000
--- a/scripts
+++ b/scripts
@@ -1 +1 @@
-Subproject commit efa8aeba8716afabe42d015346213b1e15438169
+Subproject commit 23b95d66b1c6219e7718627edfe02c8a451cc192

From c18beb30bb9e63f61604939ce34bc6473a46d281 Mon Sep 17 00:00:00 2001
From: Josh Cooper <cooper.s.josh@outlook.com>
Date: Sun, 23 Oct 2022 10:40:23 -0700
Subject: [PATCH 805/854] Updates spectate.rst

---
 docs/plugins/spectate.rst | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/docs/plugins/spectate.rst b/docs/plugins/spectate.rst
index 62b7cf667..0d1dc1362 100644
--- a/docs/plugins/spectate.rst
+++ b/docs/plugins/spectate.rst
@@ -11,7 +11,7 @@ Usage
 ::
 
     enable spectate
-    spectate set tick-threshold <value>
+    spectate set <setting> <value>
     spectate enable|disable <feature>
 
 
@@ -26,7 +26,7 @@ Examples
 --------
 
 ``spectate``
-    The plugin reports its feature status.
+    The plugin reports its configured status.
 
 ``spectate enable auto-unpause``
     Enable the spectate plugin to automatically dismiss pause events caused
@@ -36,12 +36,13 @@ Examples
     Set the tick interval the followed dwarf can be changed at back to its
     default value.
 
-Options
--------
+Features
+--------
+:focus-jobs:     Toggle whether the plugin should always be following a job. (default: disabled)
+:auto-unpause:   Toggle auto-dismissal of game pause events. (default: disabled)
+:auto-disengage: Toggle auto-disengagement of plugin through player intervention while unpaused. (default: disabled)
 
-:no option:      Show plugin status.
+Settings
+-------
 :tick-threshold: Set the plugin's tick interval for changing the followed dwarf.
                  Acts as a maximum follow time when used with focus-jobs enabled. (default: 50)
-:focus-jobs:     Toggle whether the plugin should always be following a job. (default: 0)
-:auto-unpause:   Toggle auto-dismissal of game pause events. (default: 0)
-:auto-disengage: Toggle auto-disengagement of plugin through player intervention while unpaused. (default: 0)

From 2ca2066081b7c8788b482e3c43a763919105408d Mon Sep 17 00:00:00 2001
From: Josh Cooper <cooper.s.josh@outlook.com>
Date: Sun, 23 Oct 2022 10:45:23 -0700
Subject: [PATCH 806/854] Fixes underline in spectate.rst

---
 docs/plugins/spectate.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/plugins/spectate.rst b/docs/plugins/spectate.rst
index 0d1dc1362..825c3f73d 100644
--- a/docs/plugins/spectate.rst
+++ b/docs/plugins/spectate.rst
@@ -43,6 +43,6 @@ Features
 :auto-disengage: Toggle auto-disengagement of plugin through player intervention while unpaused. (default: disabled)
 
 Settings
--------
+--------
 :tick-threshold: Set the plugin's tick interval for changing the followed dwarf.
                  Acts as a maximum follow time when used with focus-jobs enabled. (default: 50)

From 6a57cc445068a696882f2abe50a94cc3a4e15da0 Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Sun, 23 Oct 2022 16:52:32 -0700
Subject: [PATCH 807/854] fix render errors with automaterial box boundaries

---
 docs/changelog.txt       |  1 +
 plugins/automaterial.cpp | 34 ++++++++++++++++++++++++----------
 2 files changed, 25 insertions(+), 10 deletions(-)

diff --git a/docs/changelog.txt b/docs/changelog.txt
index af2e6b3fa..570d21685 100644
--- a/docs/changelog.txt
+++ b/docs/changelog.txt
@@ -38,6 +38,7 @@ changelog.txt uses a syntax similar to RST, with a few special sequences:
 ## Fixes
 - `gui/create-item`: prevent materials list filter from intercepting sublist hotkeys
 - `tiletypes`: no longer resets dig priority to the default when updating other properties of a tile
+- `automaterial`: fix rendering errors with box boundary markers
 
 ## Misc Improvements
 - `blueprint`: new ``--smooth`` option for recording all smoothed floors and walls instead of just the ones that require smoothing for later carving
diff --git a/plugins/automaterial.cpp b/plugins/automaterial.cpp
index b1b83d09e..62a03aff0 100644
--- a/plugins/automaterial.cpp
+++ b/plugins/automaterial.cpp
@@ -14,6 +14,7 @@
 
 // DF data structure definition headers
 #include "DataDefs.h"
+#include "Debug.h"
 #include "MiscUtils.h"
 #include "TileTypes.h"
 #include "df/build_req_choice_genst.h"
@@ -52,6 +53,10 @@ REQUIRE_GLOBAL(gps);
 REQUIRE_GLOBAL(ui);
 REQUIRE_GLOBAL(ui_build_selector);
 
+namespace DFHack {
+    DBG_DECLARE(automaterial,log,DebugCategory::LINFO);
+}
+
 struct MaterialDescriptor
 {
     df::item_type item_type;
@@ -719,7 +724,6 @@ struct jobutils_hook : public df::viewscreen_dwarfmodest
         if (box_select_mode == SELECT_FIRST || (!show_box_selection && box_select_mode == SELECT_SECOND))
         {
             int32_t x, y, z;
-
             if (!Gui::getCursorCoords(x, y, z))
                 return;
 
@@ -732,12 +736,13 @@ struct jobutils_hook : public df::viewscreen_dwarfmodest
             if (!Gui::getCursorCoords(box_second.x, box_second.y, box_second.z))
                 return;
 
-            int32_t xD = (box_second.x > box_first.x) ? 1 : -1;
-            int32_t yD = (box_second.y > box_first.y) ? 1 : -1;
-            for (int32_t xB = box_first.x; (xD > 0) ? (xB <= box_second.x) : (xB >= box_second.x); xB += xD)
-            {
-                for (int32_t yB = box_first.y; (yD > 0) ? (yB <= box_second.y) : (yB >= box_second.y); yB += yD)
-                {
+            Gui::DwarfmodeDims dims = Gui::getDwarfmodeViewDims();
+            int32_t startx = std::max((int32_t)vport.x, std::min(box_first.x, box_second.x));
+            int32_t endx = std::min(vport.x + dims.map_x2 - dims.map_x1, std::max(box_first.x, box_second.x));
+            int32_t starty = std::max((int32_t)vport.y, std::min(box_first.y, box_second.y));
+            int32_t endy = std::min(vport.y + dims.map_y2 - dims.map_y1, std::max(box_first.y, box_second.y));
+            for (int32_t yB = starty; yB <= endy; ++yB) {
+                for (int32_t xB = startx; xB <= endx; ++xB) {
                     if (hollow_selection && !(xB == box_first.x || xB == box_second.x || yB == box_first.y || yB == box_second.y))
                         continue;
 
@@ -963,6 +968,11 @@ struct jobutils_hook : public df::viewscreen_dwarfmodest
 
     void move_cursor(df::coord &pos)
     {
+        int32_t x, y, z;
+        Gui::getCursorCoords(x, y, z);
+        DEBUG(log).print("moving cursor from %d, %d, %d to %d, %d, %d\n",
+                         x, y, z, pos.x, pos.y, pos.z);
+
         Gui::setCursorCoords(pos.x, pos.y, pos.z);
         Gui::refreshSidebar();
     }
@@ -1269,9 +1279,13 @@ struct jobutils_hook : public df::viewscreen_dwarfmodest
                     label << "Selection: " << dX << "x" << dY;
                     OutputString(COLOR_WHITE, x, ++y, label.str(), true, left_margin);
 
-                    int cx = box_first.x;
-                    int cy = box_first.y;
-                    OutputString(COLOR_BROWN, cx, cy, "X", false, 0, 0, true /* map */);
+                    df::coord vport = Gui::getViewportPos();
+                    int cx = box_first.x - vport.x + 1;
+                    int cy = box_first.y - vport.y + 1;
+
+                    Gui::DwarfmodeDims dims = Gui::getDwarfmodeViewDims();
+                    if (cx >= 1 && cx <= dims.map_x2 && cy >= 1 && cy <= dims.map_y2)
+                        OutputString(COLOR_BROWN, cx, cy, "X", false, 0, 0, true /* map */);
                     break;
                 }
 

From 01c46f7a7e76b44a81ab9aa415d6d1ad5e67c61a Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Mon, 24 Oct 2022 09:35:59 -0700
Subject: [PATCH 808/854] fix z-level jumps when clicking quickly

this happens when TWBT is enabled and multilevel is > 0
getDepthAt() returns inconsistent values for the same position, leading
to a mismatch when we "unshift" the coordinates to account for render
depth
---
 docs/changelog.txt     |  1 +
 plugins/mousequery.cpp | 30 ++++++++++++++++++------------
 2 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/docs/changelog.txt b/docs/changelog.txt
index af2e6b3fa..8447ec1fa 100644
--- a/docs/changelog.txt
+++ b/docs/changelog.txt
@@ -37,6 +37,7 @@ changelog.txt uses a syntax similar to RST, with a few special sequences:
 
 ## Fixes
 - `gui/create-item`: prevent materials list filter from intercepting sublist hotkeys
+- `mousequery`: fix the cursor jumping up z levels sometimes when using TWBT
 - `tiletypes`: no longer resets dig priority to the default when updating other properties of a tile
 
 ## Misc Improvements
diff --git a/plugins/mousequery.cpp b/plugins/mousequery.cpp
index 6358262f4..4c88bd2ac 100644
--- a/plugins/mousequery.cpp
+++ b/plugins/mousequery.cpp
@@ -56,10 +56,12 @@ static uint32_t scroll_delay = 100;
 static bool awaiting_lbut_up, awaiting_rbut_up;
 static enum { None, Left, Right } drag_mode;
 
-static df::coord get_mouse_pos(int32_t &mx, int32_t &my)
+static df::coord get_mouse_pos(int32_t &mx, int32_t &my, int32_t &depth)
 {
     df::coord pos = Gui::getMousePos();
-    pos.z -= Gui::getDepthAt(pos.x, pos.y);
+
+    depth = Gui::getDepthAt(pos.x, pos.y);
+    pos.z -= depth;
 
     df::coord vpos = Gui::getViewportPos();
     mx = pos.x - vpos.x + 1;
@@ -291,10 +293,13 @@ struct mousequery_hook : public df::viewscreen_dwarfmodest
         return false;
     }
 
-    bool handleLeft(df::coord &mpos, int32_t mx, int32_t my)
+    bool handleLeft(df::coord &mpos, int32_t mx, int32_t my, int32_t depth)
     {
-        if (!(Core::getInstance().getModstate() & DFH_MOD_SHIFT))
-            mpos.z += Gui::getDepthAt(mx, my);
+        if (Core::getInstance().getModstate() & DFH_MOD_SHIFT) {
+            DEBUG(log).print("shift is down; not adjusting tile depth\n");
+        }
+        else
+            mpos.z += depth;
 
         bool cursor_still_here = (last_clicked_x == mpos.x && last_clicked_y == mpos.y && last_clicked_z == mpos.z);
         last_clicked_x = mpos.x;
@@ -444,8 +449,8 @@ struct mousequery_hook : public df::viewscreen_dwarfmodest
 
     bool handleMouse(const set<df::interface_key> *input)
     {
-        int32_t mx, my;
-        auto mpos = get_mouse_pos(mx, my);
+        int32_t mx, my, depth;
+        auto mpos = get_mouse_pos(mx, my, depth);
         if (mpos.x == -30000)
             return false;
 
@@ -458,7 +463,7 @@ struct mousequery_hook : public df::viewscreen_dwarfmodest
                 last_move_pos = mpos;
             }
             else
-                return handleLeft(mpos, mx, my);
+                return handleLeft(mpos, mx, my, depth);
         }
         else if (enabler->mouse_rbut)
         {
@@ -531,7 +536,8 @@ struct mousequery_hook : public df::viewscreen_dwarfmodest
         if (mpos.x == x && mpos.y == y && mpos.z == z)
             return;
 
-        DEBUG(log).print("moving cursor to %d, %d, %d\n", x, y, z);
+        DEBUG(log).print("moving cursor to %d, %d, %d\n",
+                         mpos.x, mpos.y, mpos.z);
         Gui::setCursorCoords(mpos.x, mpos.y, mpos.z);
         Gui::refreshSidebar();
     }
@@ -568,8 +574,8 @@ struct mousequery_hook : public df::viewscreen_dwarfmodest
 
         auto dims = Gui::getDwarfmodeViewDims();
 
-        int32_t mx, my;
-        auto mpos = get_mouse_pos(mx, my);
+        int32_t mx, my, depth;
+        auto mpos = get_mouse_pos(mx, my, depth);
         bool mpos_valid = mpos.x != -30000 && mpos.y != -30000 && mpos.z != -30000;
 
         // Check if in lever binding mode
@@ -582,7 +588,7 @@ struct mousequery_hook : public df::viewscreen_dwarfmodest
         if (awaiting_lbut_up && !enabler->mouse_lbut_down)
         {
             awaiting_lbut_up = false;
-            handleLeft(mpos, mx, my);
+            handleLeft(mpos, mx, my, depth);
         }
 
         if (awaiting_rbut_up && !enabler->mouse_rbut_down)

From 8b61a17009438c119008bcc848464461bf98d233 Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Mon, 24 Oct 2022 12:46:31 -0700
Subject: [PATCH 809/854] prevent z-level from changing after box select

if the player clicks the mouse too fast after finishing a selection
---
 docs/changelog.txt       | 1 +
 plugins/automaterial.cpp | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/docs/changelog.txt b/docs/changelog.txt
index af2e6b3fa..79ba705b1 100644
--- a/docs/changelog.txt
+++ b/docs/changelog.txt
@@ -36,6 +36,7 @@ changelog.txt uses a syntax similar to RST, with a few special sequences:
 ## New Plugins
 
 ## Fixes
+- `automaterial`: fix the cursor jumping up a z level when clicking quickly after box select
 - `gui/create-item`: prevent materials list filter from intercepting sublist hotkeys
 - `tiletypes`: no longer resets dig priority to the default when updating other properties of a tile
 
diff --git a/plugins/automaterial.cpp b/plugins/automaterial.cpp
index b1b83d09e..a99d66cfc 100644
--- a/plugins/automaterial.cpp
+++ b/plugins/automaterial.cpp
@@ -94,7 +94,7 @@ static bool show_box_selection = true;
 static bool hollow_selection = false;
 static deque<df::item*> box_select_materials;
 
-#define SELECTION_IGNORE_TICKS 10
+#define SELECTION_IGNORE_TICKS 1
 static int ignore_selection = SELECTION_IGNORE_TICKS;
 
 static map<int16_t, MaterialDescriptor> last_used_material;

From 7b2119c4d13fb99611b3490e5b72d2216a06f7d5 Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Mon, 24 Oct 2022 17:03:28 -0700
Subject: [PATCH 810/854] remove debug statement that doesn't help

---
 plugins/mousequery.cpp | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/plugins/mousequery.cpp b/plugins/mousequery.cpp
index 4c88bd2ac..124664fa2 100644
--- a/plugins/mousequery.cpp
+++ b/plugins/mousequery.cpp
@@ -295,10 +295,7 @@ struct mousequery_hook : public df::viewscreen_dwarfmodest
 
     bool handleLeft(df::coord &mpos, int32_t mx, int32_t my, int32_t depth)
     {
-        if (Core::getInstance().getModstate() & DFH_MOD_SHIFT) {
-            DEBUG(log).print("shift is down; not adjusting tile depth\n");
-        }
-        else
+        if (!(Core::getInstance().getModstate() & DFH_MOD_SHIFT))
             mpos.z += depth;
 
         bool cursor_still_here = (last_clicked_x == mpos.x && last_clicked_y == mpos.y && last_clicked_z == mpos.z);

From 754e1dd4ac001f34bdc433230c211389906463df Mon Sep 17 00:00:00 2001
From: Josh Cooper <cppcooper@users.noreply.github.com>
Date: Mon, 24 Oct 2022 17:50:21 -0700
Subject: [PATCH 811/854] Update docs/plugins/spectate.rst

---
 docs/plugins/spectate.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/plugins/spectate.rst b/docs/plugins/spectate.rst
index 825c3f73d..1ca3efeb8 100644
--- a/docs/plugins/spectate.rst
+++ b/docs/plugins/spectate.rst
@@ -32,7 +32,7 @@ Examples
     Enable the spectate plugin to automatically dismiss pause events caused
     by the game. Siege events are one example of such a game event.
 
-``spectate set tick-interval 50``
+``spectate set tick-threshold 50``
     Set the tick interval the followed dwarf can be changed at back to its
     default value.
 

From 606f204b8249c104f5a254b3c33d4c3fcb25e435 Mon Sep 17 00:00:00 2001
From: Josh Cooper <cppcooper@users.noreply.github.com>
Date: Mon, 24 Oct 2022 17:57:14 -0700
Subject: [PATCH 812/854] Apply suggestions from code review

---
 plugins/spectate/spectate.cpp | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/plugins/spectate/spectate.cpp b/plugins/spectate/spectate.cpp
index a0011740f..00271e23e 100644
--- a/plugins/spectate/spectate.cpp
+++ b/plugins/spectate/spectate.cpp
@@ -40,7 +40,7 @@ void onTick(color_ostream& out, void* tick);
 void onJobStart(color_ostream &out, void* job);
 void onJobCompletion(color_ostream &out, void* job);
 
-uint64_t tick_threshold = 50;
+uint64_t tick_threshold = 1000;
 bool focus_jobs_enabled = false;
 bool disengage_enabled = false;
 bool unpause_enabled = false;
@@ -174,7 +174,8 @@ DFhackCExport command_result plugin_onupdate(color_ostream &out) {
             }
         }
     }
-    while (unpause_enabled && !world->status.popups.empty()) {
+    int failsafe = 0;
+    while (unpause_enabled && !world->status.popups.empty() && ++failsafe <= 10) {
         // dismiss announcement popup(s)
         Gui::getCurViewscreen(true)->feed_key(interface_key::CLOSE_MEGA_ANNOUNCEMENT);
         if (World::ReadPauseState()) {
@@ -182,6 +183,9 @@ DFhackCExport command_result plugin_onupdate(color_ostream &out) {
             World::SetPauseState(false);
         }
     }
+    if (failsafe) {
+        out.printerr("spectate encountered a problem dismissing a popup!");
+    }
     if (disengage_enabled && !World::ReadPauseState()) {
         if (our_dorf && our_dorf->id != df::global::ui->follow_unit) {
             plugin_enable(out, false);

From 48e0b53adc2ed9fb55e03d7222c15d59b71dfd03 Mon Sep 17 00:00:00 2001
From: Josh Cooper <cppcooper@users.noreply.github.com>
Date: Mon, 24 Oct 2022 17:59:29 -0700
Subject: [PATCH 813/854] Fixes logical error in new failsafe

---
 plugins/spectate/spectate.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/spectate/spectate.cpp b/plugins/spectate/spectate.cpp
index 00271e23e..2295422c5 100644
--- a/plugins/spectate/spectate.cpp
+++ b/plugins/spectate/spectate.cpp
@@ -183,7 +183,7 @@ DFhackCExport command_result plugin_onupdate(color_ostream &out) {
             World::SetPauseState(false);
         }
     }
-    if (failsafe) {
+    if (failsafe >= 10) {
         out.printerr("spectate encountered a problem dismissing a popup!");
     }
     if (disengage_enabled && !World::ReadPauseState()) {

From 9dc199dac3c1cc5f0f0025a307145372eb653c19 Mon Sep 17 00:00:00 2001
From: Josh Cooper <cppcooper@users.noreply.github.com>
Date: Tue, 25 Oct 2022 15:01:57 -0700
Subject: [PATCH 814/854] Apply suggestions from code review

---
 plugins/spectate/spectate.cpp | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/plugins/spectate/spectate.cpp b/plugins/spectate/spectate.cpp
index 2295422c5..5f720806c 100644
--- a/plugins/spectate/spectate.cpp
+++ b/plugins/spectate/spectate.cpp
@@ -184,7 +184,7 @@ DFhackCExport command_result plugin_onupdate(color_ostream &out) {
         }
     }
     if (failsafe >= 10) {
-        out.printerr("spectate encountered a problem dismissing a popup!");
+        out.printerr("spectate encountered a problem dismissing a popup!\n");
     }
     if (disengage_enabled && !World::ReadPauseState()) {
         if (our_dorf && our_dorf->id != df::global::ui->follow_unit) {
@@ -304,15 +304,14 @@ void onTick(color_ostream& out, void* ptr) {
             dwarves.push_back(unit);
         }
         std::uniform_int_distribution<uint64_t> follow_any(0, dwarves.size() - 1);
-            // if you're looking at a warning about a local address escaping, it means the unit* from dwarves (which aren't local)
-            our_dorf = dwarves[follow_any(RNG)];
-            df::global::ui->follow_unit = our_dorf->id;
-            job_watched = our_dorf->job.current_job;
-            following_dwarf = true;
-            if (!job_watched) {
-                timestamp = tick;
-            }
-
+        // if you're looking at a warning about a local address escaping, it means the unit* from dwarves (which aren't local)
+        our_dorf = dwarves[follow_any(RNG)];
+        df::global::ui->follow_unit = our_dorf->id;
+        job_watched = our_dorf->job.current_job;
+        following_dwarf = true;
+        if (!job_watched) {
+            timestamp = tick;
+        }
     }
 }
 

From ba2e71c7be37e21319fafdc5ba9f8351d7c2c977 Mon Sep 17 00:00:00 2001
From: DFHack-Urist via GitHub Actions
 <63161697+DFHack-Urist@users.noreply.github.com>
Date: Sat, 29 Oct 2022 07:18:00 +0000
Subject: [PATCH 815/854] Auto-update submodules

scripts: master
---
 scripts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts b/scripts
index 23b95d66b..12d78b259 160000
--- a/scripts
+++ b/scripts
@@ -1 +1 @@
-Subproject commit 23b95d66b1c6219e7718627edfe02c8a451cc192
+Subproject commit 12d78b25994521451392d8538c0d2db22499bfe3

From 2197aded309d3af08a14b3df8463e3aa38a82789 Mon Sep 17 00:00:00 2001
From: Josh Cooper <cppcooper@users.noreply.github.com>
Date: Sun, 6 Nov 2022 17:30:28 -0800
Subject: [PATCH 816/854] Fixes segfault

---
 library/modules/EventManager.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/library/modules/EventManager.cpp b/library/modules/EventManager.cpp
index 5d2a24ad0..d8f8543a0 100644
--- a/library/modules/EventManager.cpp
+++ b/library/modules/EventManager.cpp
@@ -904,7 +904,10 @@ static void manageReportEvent(color_ostream& out) {
     std::vector<df::report*>& reports = df::global::world->status.reports;
     size_t idx = df::report::binsearch_index(reports, lastReport, false);
     // returns the index to the key equal to or greater than the key provided
-    idx = reports[idx]->id == lastReport ? idx + 1 : idx; // we need the index after (where the new stuff is)
+    while (idx < reports.size() && reports[idx]->id <= lastReport) {
+        idx++;
+    }
+    // returns the index to the key equal to or greater than the key provided
 
     for ( ; idx < reports.size(); idx++ ) {
         df::report* report = reports[idx];

From 391553624f7a6a9e6c53b4cab508191ce5b7856b Mon Sep 17 00:00:00 2001
From: Josh Cooper <cppcooper@users.noreply.github.com>
Date: Sun, 6 Nov 2022 17:34:53 -0800
Subject: [PATCH 817/854] Update changelog.txt

---
 docs/changelog.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/changelog.txt b/docs/changelog.txt
index 3ede58a70..7aad40128 100644
--- a/docs/changelog.txt
+++ b/docs/changelog.txt
@@ -41,6 +41,7 @@ changelog.txt uses a syntax similar to RST, with a few special sequences:
 - `mousequery`: fix the cursor jumping up z levels sometimes when using TWBT
 - `tiletypes`: no longer resets dig priority to the default when updating other properties of a tile
 - `automaterial`: fix rendering errors with box boundary markers
+- Core: fix the segmentation fault with the REPORT event in EventManager
 
 ## Misc Improvements
 - `blueprint`: new ``--smooth`` option for recording all smoothed floors and walls instead of just the ones that require smoothing for later carving

From f7fe53f626c8980e78457108d6660c01d2a825c1 Mon Sep 17 00:00:00 2001
From: "pre-commit-ci[bot]"
 <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Date: Mon, 7 Nov 2022 21:21:27 +0000
Subject: [PATCH 818/854] [pre-commit.ci] pre-commit autoupdate
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

updates:
- [github.com/python-jsonschema/check-jsonschema: 0.18.3 → 0.18.4](https://github.com/python-jsonschema/check-jsonschema/compare/0.18.3...0.18.4)
---
 .pre-commit-config.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 00e01ea22..ace64d0d5 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -20,7 +20,7 @@ repos:
       args: ['--fix=lf']
     - id: trailing-whitespace
 - repo: https://github.com/python-jsonschema/check-jsonschema
-  rev: 0.18.3
+  rev: 0.18.4
   hooks:
     - id: check-github-workflows
 - repo: https://github.com/Lucas-C/pre-commit-hooks

From 5b9c18fc3cabc8d8cdeb1a28154d073e3ae6c458 Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Mon, 7 Nov 2022 09:12:46 -0800
Subject: [PATCH 819/854] migrate string fns from uicommon to MiscUtils

and clean up some leaky usings
---
 library/ColorText.cpp                  |  1 +
 library/RemoteServer.cpp               |  1 +
 library/VTableInterpose.cpp            |  1 +
 library/include/MiscUtils.h            | 41 +++++++++++++++++++-------
 plugins/autobutcher.cpp                |  3 +-
 plugins/autoclothing.cpp               |  8 +++--
 plugins/autonestbox.cpp                | 10 +++----
 plugins/createitem.cpp                 |  2 +-
 plugins/fix-unit-occupancy.cpp         |  1 +
 plugins/generated-creature-renamer.cpp |  1 +
 plugins/uicommon.h                     | 24 ---------------
 11 files changed, 49 insertions(+), 44 deletions(-)

diff --git a/library/ColorText.cpp b/library/ColorText.cpp
index 7f417e0a8..d528cb4c7 100644
--- a/library/ColorText.cpp
+++ b/library/ColorText.cpp
@@ -52,6 +52,7 @@ POSSIBILITY OF SUCH DAMAGE.
 #include <cstdlib>
 #include <sstream>
 
+using namespace std;
 using namespace DFHack;
 
 #include "tinythread.h"
diff --git a/library/RemoteServer.cpp b/library/RemoteServer.cpp
index c934754b0..734b80702 100644
--- a/library/RemoteServer.cpp
+++ b/library/RemoteServer.cpp
@@ -61,6 +61,7 @@ POSSIBILITY OF SUCH DAMAGE.
 
 #include "json/json.h"
 
+using namespace std;
 using namespace DFHack;
 
 using dfproto::CoreTextNotification;
diff --git a/library/VTableInterpose.cpp b/library/VTableInterpose.cpp
index 520d91061..75ee62f01 100644
--- a/library/VTableInterpose.cpp
+++ b/library/VTableInterpose.cpp
@@ -36,6 +36,7 @@ distribution.
 
 #include "MiscUtils.h"
 
+using namespace std;
 using namespace DFHack;
 
 /*
diff --git a/library/include/MiscUtils.h b/library/include/MiscUtils.h
index 56506f7bd..b6bada0ff 100644
--- a/library/include/MiscUtils.h
+++ b/library/include/MiscUtils.h
@@ -24,6 +24,7 @@ distribution.
 
 #pragma once
 #include "Export.h"
+#include <algorithm>
 #include <iostream>
 #include <iomanip>
 #include <climits>
@@ -33,10 +34,6 @@ distribution.
 #include <cstdio>
 #include <memory>
 
-using std::ostream;
-using std::stringstream;
-using std::endl;
-
 #if defined(_MSC_VER)
     #define DFHACK_FUNCTION_SIG __FUNCSIG__
 #elif defined(__GNUC__)
@@ -83,9 +80,9 @@ using std::make_unique;
 }
 
 template <typename T>
-void print_bits ( T val, ostream& out )
+void print_bits ( T val, std::ostream& out )
 {
-    stringstream strs;
+    std::stringstream strs;
     T n_bits = sizeof ( val ) * CHAR_BIT;
     int cnt;
     for ( unsigned i = 0; i < n_bits; ++i )
@@ -93,24 +90,24 @@ void print_bits ( T val, ostream& out )
         cnt = i/10;
         strs << cnt << " ";
     }
-    strs << endl;
+    strs << std::endl;
     for ( unsigned i = 0; i < n_bits; ++i )
     {
         cnt = i%10;
         strs << cnt << " ";
     }
-    strs << endl;
+    strs << std::endl;
     for ( unsigned i = 0; i < n_bits; ++i )
     {
         strs << "--";
     }
-    strs << endl;
+    strs << std::endl;
     for ( unsigned i = 0; i < n_bits; ++i )
     {
         strs<< !!( val & 1 ) << " ";
         val >>= 1;
     }
-    strs << endl;
+    strs << std::endl;
     out << strs.str();
 }
 
@@ -389,6 +386,30 @@ DFHACK_EXPORT std::string toUpper(const std::string &str);
 DFHACK_EXPORT std::string toLower(const std::string &str);
 DFHACK_EXPORT std::string to_search_normalized(const std::string &str);
 
+static inline std::string int_to_string(const int n)
+{
+    std::ostringstream ss;
+    ss << n;
+    return ss.str();
+}
+
+// trim from start
+static inline std::string &ltrim(std::string &s) {
+    s.erase(s.begin(), std::find_if(s.begin(), s.end(), [](char x){ return !std::isspace(x); }));
+    return s;
+}
+
+// trim from end
+static inline std::string &rtrim(std::string &s) {
+    s.erase(std::find_if(s.rbegin(), s.rend(), [](char x){ return !std::isspace(x); }).base(), s.end());
+    return s;
+}
+
+// trim from both ends
+static inline std::string &trim(std::string &s) {
+    return ltrim(rtrim(s));
+}
+
 enum word_wrap_whitespace_mode {
     WSMODE_KEEP_ALL,
     WSMODE_COLLAPSE_ALL,
diff --git a/plugins/autobutcher.cpp b/plugins/autobutcher.cpp
index 32c8b8764..81ec0c5df 100644
--- a/plugins/autobutcher.cpp
+++ b/plugins/autobutcher.cpp
@@ -24,6 +24,7 @@
 #include "modules/Units.h"
 #include "modules/World.h"
 
+using std::endl;
 using std::string;
 using std::unordered_map;
 using std::unordered_set;
@@ -808,7 +809,7 @@ static void autobutcher_cycle(color_ostream &out) {
     for (auto w : watched_races) {
         int slaughter_count = w.second->ProcessUnits();
         if (slaughter_count) {
-            stringstream ss;
+            std::stringstream ss;
             ss << slaughter_count;
             string announce = Units::getRaceNamePluralById(w.first) + " marked for slaughter: " + ss.str();
             DEBUG(cycle,out).print("%s\n", announce.c_str());
diff --git a/plugins/autoclothing.cpp b/plugins/autoclothing.cpp
index 83eb0398a..1535b5eb8 100644
--- a/plugins/autoclothing.cpp
+++ b/plugins/autoclothing.cpp
@@ -23,6 +23,8 @@
 #include "df/creature_raw.h"
 #include "df/world.h"
 
+using std::endl;
+
 using namespace DFHack;
 using namespace DFHack::Items;
 using namespace DFHack::Units;
@@ -80,7 +82,7 @@ struct ClothingRequirement
 
     std::string Serialize()
     {
-        stringstream stream;
+        std::stringstream stream;
         stream << ENUM_KEY_STR(job_type, jobType) << " ";
         stream << ENUM_KEY_STR(item_type,itemType) << " ";
         stream << item_subtype << " ";
@@ -91,7 +93,7 @@ struct ClothingRequirement
 
     void Deserialize(std::string s)
     {
-        stringstream stream(s);
+        std::stringstream stream(s);
         std::string loadedJob;
         stream >> loadedJob;
         FOR_ENUM_ITEMS(job_type, job)
@@ -138,7 +140,7 @@ struct ClothingRequirement
 
     std::string ToReadableLabel()
     {
-        stringstream stream;
+        std::stringstream stream;
         stream << bitfield_to_string(material_category) << " ";
         std::string adjective = "";
         std::string name = "";
diff --git a/plugins/autonestbox.cpp b/plugins/autonestbox.cpp
index dd052f234..8b1ee5244 100644
--- a/plugins/autonestbox.cpp
+++ b/plugins/autonestbox.cpp
@@ -200,7 +200,7 @@ static command_result df_autonestbox(color_ostream &out, vector<string> &paramet
         autonestbox_cycle(out);
     }
     else {
-        out << "autonestbox is " << (is_enabled ? "" : "not ") << "running" << endl;
+        out << "autonestbox is " << (is_enabled ? "" : "not ") << "running" << std::endl;
     }
     return CR_OK;
 }
@@ -377,11 +377,11 @@ static size_t assign_nestboxes(color_ostream &out) {
             did_complain = false;
         old_count = freeEgglayers;
         if (!did_complain) {
-            stringstream ss;
+            std::stringstream ss;
             ss << freeEgglayers;
             string announce = "Not enough free nestbox zones found! You need " + ss.str() + " more.";
             Gui::showAnnouncement(announce, 6, true);
-            out << announce << endl;
+            out << announce << std::endl;
             did_complain = true;
         }
     }
@@ -396,12 +396,12 @@ static void autonestbox_cycle(color_ostream &out) {
 
     size_t processed = assign_nestboxes(out);
     if (processed > 0) {
-        stringstream ss;
+        std::stringstream ss;
         ss << processed << " nestboxes were assigned.";
         string announce = ss.str();
         DEBUG(cycle,out).print("%s\n", announce.c_str());
         Gui::showAnnouncement(announce, 2, false);
-        out << announce << endl;
+        out << announce << std::endl;
         // can complain again
         // (might lead to spamming the same message twice, but catches the case
         // where for example 2 new egglayers hatched right after 2 zones were created and assigned)
diff --git a/plugins/createitem.cpp b/plugins/createitem.cpp
index 09c6d8e20..57dbf7244 100644
--- a/plugins/createitem.cpp
+++ b/plugins/createitem.cpp
@@ -256,7 +256,7 @@ command_result df_createitem (color_ostream &out, vector <string> & parameters)
 
     if (parameters.size() == 3)
     {
-        stringstream ss(parameters[2]);
+        std::stringstream ss(parameters[2]);
         ss >> count;
         if (count < 1)
         {
diff --git a/plugins/fix-unit-occupancy.cpp b/plugins/fix-unit-occupancy.cpp
index 973c185a8..4b2db0f12 100644
--- a/plugins/fix-unit-occupancy.cpp
+++ b/plugins/fix-unit-occupancy.cpp
@@ -14,6 +14,7 @@
 #include "df/unit.h"
 #include "df/world.h"
 
+using std::endl;
 using namespace DFHack;
 
 DFHACK_PLUGIN("fix-unit-occupancy");
diff --git a/plugins/generated-creature-renamer.cpp b/plugins/generated-creature-renamer.cpp
index f6e9e41b6..92c11cfaf 100644
--- a/plugins/generated-creature-renamer.cpp
+++ b/plugins/generated-creature-renamer.cpp
@@ -13,6 +13,7 @@
 //#include "df/world.h"
 
 using namespace DFHack;
+using std::endl;
 
 DFHACK_PLUGIN("generated-creature-renamer");
 REQUIRE_GLOBAL(world);
diff --git a/plugins/uicommon.h b/plugins/uicommon.h
index dc57c9374..e7a586585 100644
--- a/plugins/uicommon.h
+++ b/plugins/uicommon.h
@@ -157,13 +157,6 @@ static inline void OutputToggleString(int &x, int &y, const char *text, df::inte
     OutputToggleString(x, y, text, DFHack::Screen::getKeyDisplay(hotkey).c_str(), state, newline, left_margin, color, hotkey_color, map);
 }
 
-inline string int_to_string(const int n)
-{
-    std::ostringstream ss;
-    ss << n;
-    return ss.str();
-}
-
 static inline void set_to_limit(int &value, const int maximum, const int min = 0)
 {
     if (value < min)
@@ -172,23 +165,6 @@ static inline void set_to_limit(int &value, const int maximum, const int min = 0
         value = maximum;
 }
 
-// trim from start
-static inline std::string &ltrim(std::string &s) {
-    s.erase(s.begin(), std::find_if(s.begin(), s.end(), [](char x){ return !std::isspace(x); }));
-    return s;
-}
-
-// trim from end
-static inline std::string &rtrim(std::string &s) {
-    s.erase(std::find_if(s.rbegin(), s.rend(), [](char x){ return !std::isspace(x); }).base(), s.end());
-    return s;
-}
-
-// trim from both ends
-static inline std::string &trim(std::string &s) {
-    return ltrim(rtrim(s));
-}
-
 inline void paint_text(const UIColor color, const int &x, const int &y, const std::string &text, const UIColor background = 0)
 {
     Screen::paintString(Screen::Pen(' ', color, background), x, y, text);

From 5a720bd4964aca26820b8620081a5356e3bfb7a4 Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Mon, 7 Nov 2022 15:40:00 -0800
Subject: [PATCH 820/854] update changelog

---
 docs/changelog.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/changelog.txt b/docs/changelog.txt
index 3ede58a70..a0c85f486 100644
--- a/docs/changelog.txt
+++ b/docs/changelog.txt
@@ -70,6 +70,7 @@ changelog.txt uses a syntax similar to RST, with a few special sequences:
 
 ## API
 - Constructions module: added ``insert()`` to insert constructions into the game's sorted list.
+- MiscUtils: moved the following string transformation functions from ``uicommon.h``: ``int_to_string``, ``ltrim``, ``rtrim``, and ``trim``
 
 ## Lua
 - ``widgets.Scrollbar``: new scrollbar widget that can be paired with an associated scrollable widget. Integrated with ``widgets.Label`` and ``widgets.List``.

From be18f4e90054de42bf93e9665971e457d5b8f321 Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Fri, 4 Nov 2022 17:41:15 -0700
Subject: [PATCH 821/854] return self from Screen:show() as a convenience

---
 library/lua/gui.lua | 1 +
 1 file changed, 1 insertion(+)

diff --git a/library/lua/gui.lua b/library/lua/gui.lua
index 8d546b21a..070fceaf9 100644
--- a/library/lua/gui.lua
+++ b/library/lua/gui.lua
@@ -641,6 +641,7 @@ function Screen:show(parent)
     if not dscreen.show(self, parent.child) then
         error('Could not show screen')
     end
+    return self
 end
 
 function Screen:onAboutToShow(parent)

From 28aadea6afce4442b48f8c439c271bd94c9a6aaa Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Mon, 7 Nov 2022 13:58:12 -0800
Subject: [PATCH 822/854] allow an alternate ViewRect for getMousePos

---
 library/lua/gui.lua | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/library/lua/gui.lua b/library/lua/gui.lua
index 070fceaf9..e69237003 100644
--- a/library/lua/gui.lua
+++ b/library/lua/gui.lua
@@ -473,8 +473,8 @@ function View:getWindowSize()
     return rect.width, rect.height
 end
 
-function View:getMousePos()
-    local rect = self.frame_body
+function View:getMousePos(view_rect)
+    local rect = view_rect or self.frame_body
     local x,y = dscreen.getMousePos()
     if rect and rect:inClipGlobalXY(x,y) then
         return rect:localXY(x,y)

From a0ff7e4d3f571dc57fc3264ab950dd13753b6ab7 Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Mon, 7 Nov 2022 15:58:29 -0800
Subject: [PATCH 823/854] update Lua docs

---
 docs/Lua API.rst | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/docs/Lua API.rst b/docs/Lua API.rst
index 8e6ea1d9f..2b9f8cb52 100644
--- a/docs/Lua API.rst	
+++ b/docs/Lua API.rst	
@@ -3707,10 +3707,11 @@ The class has the following methods:
 
   Returns the dimensions of the ``frame_body`` rectangle.
 
-* ``view:getMousePos()``
+* ``view:getMousePos([view_rect])``
 
-  Returns the mouse *x,y* in coordinates local to the ``frame_body``
-  rectangle if it is within its clip area, or nothing otherwise.
+  Returns the mouse *x,y* in coordinates local to the given ViewRect (or
+  ``frame_body`` if no ViewRect is passed) if it is within its clip area,
+  or nothing otherwise.
 
 * ``view:updateLayout([parent_rect])``
 
@@ -3829,7 +3830,9 @@ It adds the following methods:
   ``dfhack.screen.show``, calls ``self:onAboutToShow(parent)``. Note that
   ``onAboutToShow()`` can dismiss active screens, and therefore change the
   potential parent. If parent is not specified, this function will re-detect the
-  current topmost window after ``self:onAboutToShow(parent)`` returns.
+  current topmost window after ``self:onAboutToShow(parent)`` returns. This
+  function returns ``self`` as a convenience so you can write such code as
+  ``local view = MyScreen{params=val}:show()``.
 
 * ``screen:onAboutToShow(parent)`` *(for overriding)*
 

From b2b2a52b55d23c2fb2a4218443ed7d500b6ad2d7 Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Mon, 7 Nov 2022 16:00:43 -0800
Subject: [PATCH 824/854] update changelog

---
 docs/changelog.txt | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docs/changelog.txt b/docs/changelog.txt
index 3ede58a70..c1f71209a 100644
--- a/docs/changelog.txt
+++ b/docs/changelog.txt
@@ -76,6 +76,8 @@ changelog.txt uses a syntax similar to RST, with a few special sequences:
 - ``dfhack.constructions.findAtTile()``: exposed preexisting function to Lua.
 - ``dfhack.constructions.insert()``: exposed new function to Lua.
 - ``widgets.EditField`` now allows other widgets to process characters that the ``on_char`` callback rejects.
+- ``gui.Screen.show()`` now returns ``self`` as a convenience
+- ``gui.View.getMousePos()`` now takes an optional ``ViewRect`` parameter in case the caller wants to get the mouse pos relative to a rect that is not the frame_body (such as the frame_rect)
 
 # 0.47.05-r7
 

From 1b7b75d8abe8c4de8a2cdcaa6d73d46694a4e125 Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Mon, 7 Nov 2022 16:13:45 -0800
Subject: [PATCH 825/854] factor out detection of the list index under mouse

---
 library/lua/gui/widgets.lua | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/library/lua/gui/widgets.lua b/library/lua/gui/widgets.lua
index 62b3f5ae8..5c44d3686 100644
--- a/library/lua/gui/widgets.lua
+++ b/library/lua/gui/widgets.lua
@@ -444,7 +444,9 @@ local BAR_BG_CHAR = string.char(179)
 
 function Scrollbar:onRenderBody(dc)
     -- don't draw if all elements are visible
-    if not scrollbar_is_visible(self) then return end
+    if not scrollbar_is_visible(self) then
+        return
+    end
     -- render up arrow if we're not at the top
     dc:seek(0, 0):char(
         self.top_elem == 1 and NO_ARROW_CHAR or UP_ARROW_CHAR, self.fg, self.bg)
@@ -1216,6 +1218,14 @@ function List:onRenderBody(dc)
     end
 end
 
+function List:getIdxUnderMouse()
+    local _,mouse_y = self:getMousePos()
+    if mouse_y and #self.choices > 0 and
+            mouse_y < (#self.choices-self.page_top+1) * self.row_height then
+        return self.page_top + math.floor(mouse_y/self.row_height)
+    end
+end
+
 function List:submit()
     if self.on_submit and #self.choices > 0 then
         self.on_submit(self:getSelected())
@@ -1239,10 +1249,8 @@ function List:onInput(keys)
         self:submit2()
         return true
     elseif keys._MOUSE_L then
-        local _, mouse_y = self:getMousePos()
-        if mouse_y and #self.choices > 0 and
-                mouse_y < (#self.choices-self.page_top+1) * self.row_height then
-            local idx = self.page_top + math.floor(mouse_y/self.row_height)
+        local idx = self:getIdxUnderMouse()
+        if idx then
             self:setSelected(idx)
             self:submit()
             return true

From 83f560a6f4d7d6bac5b3377f0d3c046b88d43538 Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Mon, 7 Nov 2022 16:14:16 -0800
Subject: [PATCH 826/854] allow shift-click to trigger submit2 for List

---
 library/lua/gui/widgets.lua | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/library/lua/gui/widgets.lua b/library/lua/gui/widgets.lua
index 5c44d3686..49f274686 100644
--- a/library/lua/gui/widgets.lua
+++ b/library/lua/gui/widgets.lua
@@ -1252,7 +1252,11 @@ function List:onInput(keys)
         local idx = self:getIdxUnderMouse()
         if idx then
             self:setSelected(idx)
-            self:submit()
+            if dfhack.internal.getModifiers().shift then
+                self:submit2()
+            else
+                self:submit()
+            end
             return true
         end
     else

From 93bc4c00eb697839f53dd00a3f9b74eb10b4f08d Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Mon, 7 Nov 2022 16:19:03 -0800
Subject: [PATCH 827/854] update lua api docs

---
 docs/Lua API.rst | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/docs/Lua API.rst b/docs/Lua API.rst
index 8e6ea1d9f..5b3351e87 100644
--- a/docs/Lua API.rst	
+++ b/docs/Lua API.rst	
@@ -4322,8 +4322,8 @@ It has the following attributes:
             with an empty list.
 :on_submit: Enter key or mouse click callback; if specified, the list reacts to the
             key/click and calls the callback as ``on_submit(index,choice)``.
-:on_submit2: Shift-Enter key callback; if specified, the list reacts to the key
-             and calls it as ``on_submit2(index,choice)``.
+:on_submit2: Shift-Enter key or shift-mouse click callback; if specified, the list
+             reacts to the key/click and calls it as ``on_submit2(index,choice)``.
 :row_height: Height of every row in text lines.
 :icon_width: If not *nil*, the specified number of character columns
              are reserved to the left of the list item for the icons.
@@ -4360,6 +4360,11 @@ The list supports the following methods:
 
   Returns the selected *index, choice*, or nothing if the list is empty.
 
+* ``list:getIdxUnderMouse()``
+
+  Returns the index of the list item under the mouse cursor, or nothing if the
+  list is empty or the mouse is not over a list item.
+
 * ``list:getContentWidth()``
 
   Returns the minimal width to draw all choices without clipping.

From f906aee5b846ce7a1f95fd84920b8c5bb306b80f Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Mon, 7 Nov 2022 16:19:09 -0800
Subject: [PATCH 828/854] update changelog

---
 docs/changelog.txt | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docs/changelog.txt b/docs/changelog.txt
index 3ede58a70..f6972d601 100644
--- a/docs/changelog.txt
+++ b/docs/changelog.txt
@@ -73,6 +73,8 @@ changelog.txt uses a syntax similar to RST, with a few special sequences:
 
 ## Lua
 - ``widgets.Scrollbar``: new scrollbar widget that can be paired with an associated scrollable widget. Integrated with ``widgets.Label`` and ``widgets.List``.
+- ``widgets.List``: new ``getIdxUnderMouse()`` function for detecting the list index under the active mouse cursor
+- ``widgets.List``: shift-clicking now triggers the ``submit2`` attribute function if it is defined
 - ``dfhack.constructions.findAtTile()``: exposed preexisting function to Lua.
 - ``dfhack.constructions.insert()``: exposed new function to Lua.
 - ``widgets.EditField`` now allows other widgets to process characters that the ``on_char`` callback rejects.

From 351ecbfb5975b7b737f09b1a951bc7c90b03ea74 Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Mon, 7 Nov 2022 12:17:47 -0800
Subject: [PATCH 829/854] instrument core keybinding resolution

---
 library/Core.cpp | 27 ++++++++++++++++++++++-----
 1 file changed, 22 insertions(+), 5 deletions(-)

diff --git a/library/Core.cpp b/library/Core.cpp
index 669015096..083a6223f 100644
--- a/library/Core.cpp
+++ b/library/Core.cpp
@@ -101,6 +101,7 @@ size_t loadScriptFiles(Core* core, color_ostream& out, const vector<std::string>
 
 namespace DFHack {
 
+DBG_DECLARE(core,keybinding,DebugCategory::LINFO);
 DBG_DECLARE(core,script,DebugCategory::LINFO);
 
 class MainThread {
@@ -2388,20 +2389,36 @@ bool Core::SelectHotkey(int sym, int modifiers)
 
     std::string cmd;
 
+    DEBUG(keybinding).print("checking hotkeys for sym=%d, modifiers=%x\n", sym, modifiers);
+
     {
         std::lock_guard<std::mutex> lock(HotkeyMutex);
 
         // Check the internal keybindings
         std::vector<KeyBinding> &bindings = key_bindings[sym];
         for (int i = bindings.size()-1; i >= 0; --i) {
-            if (bindings[i].modifiers != modifiers)
+            auto &binding = bindings[i];
+            DEBUG(keybinding).print("examining hotkey with commandline: '%s'\n", binding.cmdline.c_str());
+
+            if (binding.modifiers != modifiers) {
+                DEBUG(keybinding).print("skipping keybinding due to modifiers mismatch: 0x%x != 0x%x\n",
+                                        binding.modifiers, modifiers);
                 continue;
-            if (!bindings[i].focus.empty() &&
-                !prefix_matches(bindings[i].focus, Gui::getFocusString(screen)))
+            }
+            string focusString = Gui::getFocusString(screen);
+            if (!binding.focus.empty() && !prefix_matches(binding.focus, focusString)) {
+                DEBUG(keybinding).print("skipping keybinding due to focus string mismatch: '%s' !~ '%s'\n",
+                                        focusString.c_str(), binding.focus.c_str());
                 continue;
-            if (!plug_mgr->CanInvokeHotkey(bindings[i].command[0], screen))
+            }
+            if (!plug_mgr->CanInvokeHotkey(binding.command[0], screen)) {
+                DEBUG(keybinding).print("skipping keybinding due to hotkey guard rejection (command: '%s')\n",
+                                        binding.command[0].c_str());
                 continue;
-            cmd = bindings[i].cmdline;
+            }
+
+            cmd = binding.cmdline;
+            DEBUG(keybinding).print("matched hotkey\n");
             break;
         }
 

From 32dc80729a49535de49b6bc7e6a23c9be2d9312f Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Sun, 6 Nov 2022 16:42:01 -0800
Subject: [PATCH 830/854] support drawing frames around panels

---
 library/lua/gui/widgets.lua | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/library/lua/gui/widgets.lua b/library/lua/gui/widgets.lua
index 62b3f5ae8..668eefdb9 100644
--- a/library/lua/gui/widgets.lua
+++ b/library/lua/gui/widgets.lua
@@ -73,6 +73,8 @@ end
 Panel = defclass(Panel, Widget)
 
 Panel.ATTRS {
+    frame_style = DEFAULT_NIL, -- as in gui.FramedScreen
+    frame_title = DEFAULT_NIL, -- as in gui.FramedScreen
     on_render = DEFAULT_NIL,
     on_layout = DEFAULT_NIL,
     autoarrange_subviews = false, -- whether to automatically lay out subviews
@@ -87,6 +89,12 @@ function Panel:onRenderBody(dc)
     if self.on_render then self.on_render(dc) end
 end
 
+function Panel:computeFrame(parent_rect)
+    local sw, sh = parent_rect.width, parent_rect.height
+    return gui.compute_frame_body(sw, sh, self.frame, self.frame_inset,
+                                  self.frame_style and 1 or 0)
+end
+
 function Panel:postComputeFrame(body)
     if self.on_layout then self.on_layout(body) end
 end
@@ -112,6 +120,13 @@ function Panel:postUpdateLayout()
     self:updateSubviewLayout()
 end
 
+function Panel:onRenderFrame(dc, rect)
+    Panel.super.onRenderFrame(self, dc, rect)
+    if not self.frame_style then return end
+    local x1,y1,x2,y2 = rect.x1, rect.y1, rect.x2, rect.y2
+    gui.paint_frame(x1, y1, x2, y2, self.frame_style, self.frame_title)
+end
+
 -------------------
 -- ResizingPanel --
 -------------------
@@ -129,8 +144,18 @@ function ResizingPanel:postUpdateLayout(frame_body)
                             (s.frame and s.frame.h or frame_body.height))
         end
     end
+    if self.frame_style then
+        w = w + 2
+        h = h + 2
+    end
     if not self.frame then self.frame = {} end
+    local oldw, oldh = self.frame.w, self.frame.h
     self.frame.w, self.frame.h = w, h
+    if not self._updateLayoutGuard and (oldw ~= w or oldh ~= h) then
+        self._updateLayoutGuard = true -- protect against infinite loops
+        self:updateLayout() -- our frame has changed, we need to fully refresh
+    end
+    self._updateLayoutGuard = nil
 end
 
 -----------

From 63a1c1ae15850a42e5423480fb50c7ef68308765 Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Mon, 7 Nov 2022 16:57:55 -0800
Subject: [PATCH 831/854] update lua docs

---
 docs/Lua API.rst | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/docs/Lua API.rst b/docs/Lua API.rst
index 8e6ea1d9f..5a4011d53 100644
--- a/docs/Lua API.rst	
+++ b/docs/Lua API.rst	
@@ -3946,7 +3946,7 @@ Base of all the widgets. Inherits from View and has the following attributes:
 Panel class
 -----------
 
-Inherits from Widget, and intended for grouping a number of subviews.
+Inherits from Widget, and intended for framing and/or grouping subviews.
 
 Has attributes:
 
@@ -3968,6 +3968,13 @@ Has attributes:
   height or become visible/hidden and you don't have to worry about
   recalculating subview positions.
 
+* ``frame_style``, ``frame_title`` (default: nil)
+  If defined, a frame will be drawn around the panel and subviews will be inset
+  by 1. The attributes are identical to what is defined in the
+  `FramedScreen class`_. When using the predefined frame styles in the ``gui``
+  module, remember to ``require`` the gui module and prefix the identifier with
+  ``gui.``, e.g. ``gui.GREY_LINE_FRAME``.
+
 ResizingPanel class
 -------------------
 

From 0d970509f80e97c38b6cda5919e91ab382df4685 Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Mon, 7 Nov 2022 16:58:51 -0800
Subject: [PATCH 832/854] update changelog

---
 docs/changelog.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/changelog.txt b/docs/changelog.txt
index 3ede58a70..6ddfcf365 100644
--- a/docs/changelog.txt
+++ b/docs/changelog.txt
@@ -75,6 +75,7 @@ changelog.txt uses a syntax similar to RST, with a few special sequences:
 - ``widgets.Scrollbar``: new scrollbar widget that can be paired with an associated scrollable widget. Integrated with ``widgets.Label`` and ``widgets.List``.
 - ``dfhack.constructions.findAtTile()``: exposed preexisting function to Lua.
 - ``dfhack.constructions.insert()``: exposed new function to Lua.
+- ``widgets.Panel``: new ``frame_style`` and ``frame_title`` attributes for drawing frames around groups of widgets
 - ``widgets.EditField`` now allows other widgets to process characters that the ``on_char`` callback rejects.
 
 # 0.47.05-r7

From 3a713c63684016b95b1a18ba59b495d805e42838 Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Mon, 7 Nov 2022 17:52:39 -0800
Subject: [PATCH 833/854] update devel plugins

---
 plugins/devel/itemhacks.cpp | 1 +
 plugins/devel/kittens.cpp   | 1 +
 plugins/devel/tiles.cpp     | 1 +
 3 files changed, 3 insertions(+)

diff --git a/plugins/devel/itemhacks.cpp b/plugins/devel/itemhacks.cpp
index b2c1918c6..66ba8e45f 100644
--- a/plugins/devel/itemhacks.cpp
+++ b/plugins/devel/itemhacks.cpp
@@ -10,6 +10,7 @@
 
 using std::vector;
 using std::string;
+using std::endl;
 using namespace DFHack;
 
 //////////////////////
diff --git a/plugins/devel/kittens.cpp b/plugins/devel/kittens.cpp
index 156686a1e..89ece51b6 100644
--- a/plugins/devel/kittens.cpp
+++ b/plugins/devel/kittens.cpp
@@ -28,6 +28,7 @@
 
 using std::vector;
 using std::string;
+using std::endl;
 using namespace DFHack;
 
 DFHACK_PLUGIN("kittens");
diff --git a/plugins/devel/tiles.cpp b/plugins/devel/tiles.cpp
index 61640257a..f3b825299 100644
--- a/plugins/devel/tiles.cpp
+++ b/plugins/devel/tiles.cpp
@@ -6,6 +6,7 @@
 #include <sstream>
 using std::vector;
 using std::string;
+using std::endl;
 
 #include "Core.h"
 #include <Console.h>

From 3bfc360c1de1d7accc3224c246656353dfe5d5e3 Mon Sep 17 00:00:00 2001
From: DFHack-Urist via GitHub Actions
 <63161697+DFHack-Urist@users.noreply.github.com>
Date: Tue, 8 Nov 2022 07:18:06 +0000
Subject: [PATCH 834/854] Auto-update submodules

scripts: master
---
 scripts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts b/scripts
index 12d78b259..e59407f7c 160000
--- a/scripts
+++ b/scripts
@@ -1 +1 @@
-Subproject commit 12d78b25994521451392d8538c0d2db22499bfe3
+Subproject commit e59407f7cf885ba4276d0f23c0c162c9173f8fbb

From 193d29ba672a9c96aa9ac2ceb9a3b9421ab350b9 Mon Sep 17 00:00:00 2001
From: Myk <myk002@yahoo.com>
Date: Tue, 8 Nov 2022 09:53:08 -0800
Subject: [PATCH 835/854] include cctype to fix build error

---
 library/include/MiscUtils.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/library/include/MiscUtils.h b/library/include/MiscUtils.h
index b6bada0ff..b361bdbdb 100644
--- a/library/include/MiscUtils.h
+++ b/library/include/MiscUtils.h
@@ -27,6 +27,7 @@ distribution.
 #include <algorithm>
 #include <iostream>
 #include <iomanip>
+#include <cctype>
 #include <climits>
 #include <stdint.h>
 #include <vector>

From b82a604c8da18d41232b8a9628f2b066c2df35a4 Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Mon, 31 Oct 2022 11:43:37 -0700
Subject: [PATCH 836/854] factor out keys -> lua onInput code to LuaTools

---
 library/LuaApi.cpp         | 44 +++++++++++++++++++++++++++++++++++++
 library/include/LuaTools.h |  4 ++++
 library/modules/Screen.cpp | 45 +-------------------------------------
 3 files changed, 49 insertions(+), 44 deletions(-)

diff --git a/library/LuaApi.cpp b/library/LuaApi.cpp
index 4a97a0502..328d8ba4f 100644
--- a/library/LuaApi.cpp
+++ b/library/LuaApi.cpp
@@ -158,6 +158,50 @@ void Lua::GetVector(lua_State *state, std::vector<std::string> &pvec)
     }
 }
 
+void Lua::PushInterfaceKeys(lua_State *L,
+                            const std::set<df::interface_key> &keys) {
+    lua_createtable(L, 0, keys.size() + 5);
+
+    for (auto &key : keys)
+    {
+        if (auto name = enum_item_raw_key(key))
+            lua_pushstring(L, name);
+        else
+            lua_pushinteger(L, key);
+
+        lua_pushboolean(L, true);
+        lua_rawset(L, -3);
+
+        int charval = Screen::keyToChar(key);
+        if (charval >= 0)
+        {
+            lua_pushinteger(L, charval);
+            lua_setfield(L, -2, "_STRING");
+        }
+    }
+
+    if (df::global::enabler) {
+        if (df::global::enabler->mouse_lbut_down) {
+            lua_pushboolean(L, true);
+            lua_setfield(L, -2, "_MOUSE_L");
+        }
+        if (df::global::enabler->mouse_rbut_down) {
+            lua_pushboolean(L, true);
+            lua_setfield(L, -2, "_MOUSE_R");
+        }
+        if (df::global::enabler->mouse_lbut) {
+            lua_pushboolean(L, true);
+            lua_setfield(L, -2, "_MOUSE_L_DOWN");
+            df::global::enabler->mouse_lbut = 0;
+        }
+        if (df::global::enabler->mouse_rbut) {
+            lua_pushboolean(L, true);
+            lua_setfield(L, -2, "_MOUSE_R_DOWN");
+            df::global::enabler->mouse_rbut = 0;
+        }
+    }
+}
+
 int Lua::PushPosXYZ(lua_State *state, df::coord pos)
 {
     if (!pos.isValid())
diff --git a/library/include/LuaTools.h b/library/include/LuaTools.h
index 6dc5ae0bd..1b3c5d595 100644
--- a/library/include/LuaTools.h
+++ b/library/include/LuaTools.h
@@ -30,6 +30,8 @@ distribution.
 #include <map>
 #include <type_traits>
 
+#include "df/interfacest.h"
+
 #include "ColorText.h"
 #include "DataDefs.h"
 
@@ -321,6 +323,8 @@ namespace DFHack {namespace Lua {
         Push(L, val); lua_setfield(L, idx, name);
     }
 
+    DFHACK_EXPORT void PushInterfaceKeys(lua_State *L, const std::set<df::interface_key> &keys);
+
     template<class T>
     void PushVector(lua_State *state, const T &pvec, bool addn = false)
     {
diff --git a/library/modules/Screen.cpp b/library/modules/Screen.cpp
index bff14a380..ebcc3f229 100644
--- a/library/modules/Screen.cpp
+++ b/library/modules/Screen.cpp
@@ -749,50 +749,7 @@ int dfhack_lua_viewscreen::do_input(lua_State *L)
     }
 
     lua_pushvalue(L, -2);
-
-    lua_createtable(L, 0, keys->size()+3);
-
-    for (auto it = keys->begin(); it != keys->end(); ++it)
-    {
-        auto key = *it;
-
-        if (auto name = enum_item_raw_key(key))
-            lua_pushstring(L, name);
-        else
-            lua_pushinteger(L, key);
-
-        lua_pushboolean(L, true);
-        lua_rawset(L, -3);
-
-        int charval = Screen::keyToChar(key);
-        if (charval >= 0)
-        {
-            lua_pushinteger(L, charval);
-            lua_setfield(L, -2, "_STRING");
-        }
-    }
-
-    if (enabler)
-    {
-        if (enabler->mouse_lbut_down) {
-            lua_pushboolean(L, true);
-            lua_setfield(L, -2, "_MOUSE_L");
-        }
-        if (enabler->mouse_rbut_down) {
-            lua_pushboolean(L, true);
-            lua_setfield(L, -2, "_MOUSE_R");
-        }
-        if (enabler->mouse_lbut) {
-            lua_pushboolean(L, true);
-            lua_setfield(L, -2, "_MOUSE_L_DOWN");
-            enabler->mouse_lbut = 0;
-        }
-        if (enabler->mouse_rbut) {
-            lua_pushboolean(L, true);
-            lua_setfield(L, -2, "_MOUSE_R_DOWN");
-            enabler->mouse_rbut = 0;
-        }
-    }
+    Lua::PushInterfaceKeys(L, *keys);
 
     lua_call(L, 2, 0);
     self->update_focus(L, -1);

From e4d0bb9e46c234bd84ad9b5df10faa1caeccc0f0 Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Fri, 4 Nov 2022 17:54:18 -0700
Subject: [PATCH 837/854] move Lua push methods into LuaTools.cpp

---
 library/LuaApi.cpp   | 121 +---------------------------------------
 library/LuaTools.cpp | 129 ++++++++++++++++++++++++++++++++++++++++++-
 2 files changed, 128 insertions(+), 122 deletions(-)

diff --git a/library/LuaApi.cpp b/library/LuaApi.cpp
index 328d8ba4f..9f713244d 100644
--- a/library/LuaApi.cpp
+++ b/library/LuaApi.cpp
@@ -68,6 +68,7 @@ distribution.
 
 #include "df/activity_entry.h"
 #include "df/activity_event.h"
+#include "df/enabler.h"
 #include "df/job.h"
 #include "df/job_item.h"
 #include "df/building.h"
@@ -78,9 +79,6 @@ distribution.
 #include "df/identity.h"
 #include "df/nemesis_record.h"
 #include "df/historical_figure.h"
-#include "df/historical_entity.h"
-#include "df/entity_position.h"
-#include "df/entity_position_assignment.h"
 #include "df/histfig_entity_link_positionst.h"
 #include "df/plant_raw.h"
 #include "df/creature_raw.h"
@@ -95,7 +93,6 @@ distribution.
 #include "df/unit_misc_trait.h"
 #include "df/proj_itemst.h"
 #include "df/itemdef.h"
-#include "df/enabler.h"
 #include "df/feature_init.h"
 #include "df/plant.h"
 #include "df/specific_ref.h"
@@ -117,122 +114,6 @@ using Random::PerlinNoise3D;
 
 void dfhack_printerr(lua_State *S, const std::string &str);
 
-void Lua::Push(lua_State *state, const Units::NoblePosition &pos)
-{
-    lua_createtable(state, 0, 3);
-    Lua::PushDFObject(state, pos.entity);
-    lua_setfield(state, -2, "entity");
-    Lua::PushDFObject(state, pos.assignment);
-    lua_setfield(state, -2, "assignment");
-    Lua::PushDFObject(state, pos.position);
-    lua_setfield(state, -2, "position");
-}
-
-void Lua::Push(lua_State *state, df::coord pos)
-{
-    lua_createtable(state, 0, 3);
-    lua_pushinteger(state, pos.x);
-    lua_setfield(state, -2, "x");
-    lua_pushinteger(state, pos.y);
-    lua_setfield(state, -2, "y");
-    lua_pushinteger(state, pos.z);
-    lua_setfield(state, -2, "z");
-}
-
-void Lua::Push(lua_State *state, df::coord2d pos)
-{
-    lua_createtable(state, 0, 2);
-    lua_pushinteger(state, pos.x);
-    lua_setfield(state, -2, "x");
-    lua_pushinteger(state, pos.y);
-    lua_setfield(state, -2, "y");
-}
-
-void Lua::GetVector(lua_State *state, std::vector<std::string> &pvec)
-{
-    lua_pushnil(state);   // first key
-    while (lua_next(state, 1) != 0)
-    {
-        pvec.push_back(lua_tostring(state, -1));
-        lua_pop(state, 1);  // remove value, leave key
-    }
-}
-
-void Lua::PushInterfaceKeys(lua_State *L,
-                            const std::set<df::interface_key> &keys) {
-    lua_createtable(L, 0, keys.size() + 5);
-
-    for (auto &key : keys)
-    {
-        if (auto name = enum_item_raw_key(key))
-            lua_pushstring(L, name);
-        else
-            lua_pushinteger(L, key);
-
-        lua_pushboolean(L, true);
-        lua_rawset(L, -3);
-
-        int charval = Screen::keyToChar(key);
-        if (charval >= 0)
-        {
-            lua_pushinteger(L, charval);
-            lua_setfield(L, -2, "_STRING");
-        }
-    }
-
-    if (df::global::enabler) {
-        if (df::global::enabler->mouse_lbut_down) {
-            lua_pushboolean(L, true);
-            lua_setfield(L, -2, "_MOUSE_L");
-        }
-        if (df::global::enabler->mouse_rbut_down) {
-            lua_pushboolean(L, true);
-            lua_setfield(L, -2, "_MOUSE_R");
-        }
-        if (df::global::enabler->mouse_lbut) {
-            lua_pushboolean(L, true);
-            lua_setfield(L, -2, "_MOUSE_L_DOWN");
-            df::global::enabler->mouse_lbut = 0;
-        }
-        if (df::global::enabler->mouse_rbut) {
-            lua_pushboolean(L, true);
-            lua_setfield(L, -2, "_MOUSE_R_DOWN");
-            df::global::enabler->mouse_rbut = 0;
-        }
-    }
-}
-
-int Lua::PushPosXYZ(lua_State *state, df::coord pos)
-{
-    if (!pos.isValid())
-    {
-        lua_pushnil(state);
-        return 1;
-    }
-    else
-    {
-        lua_pushinteger(state, pos.x);
-        lua_pushinteger(state, pos.y);
-        lua_pushinteger(state, pos.z);
-        return 3;
-    }
-}
-
-int Lua::PushPosXY(lua_State *state, df::coord2d pos)
-{
-    if (!pos.isValid())
-    {
-        lua_pushnil(state);
-        return 1;
-    }
-    else
-    {
-        lua_pushinteger(state, pos.x);
-        lua_pushinteger(state, pos.y);
-        return 2;
-    }
-}
-
 static df::coord2d CheckCoordXY(lua_State *state, int base, bool vararg = false)
 {
     df::coord2d p;
diff --git a/library/LuaTools.cpp b/library/LuaTools.cpp
index fea90b394..3cd6a1f7d 100644
--- a/library/LuaTools.cpp
+++ b/library/LuaTools.cpp
@@ -41,6 +41,7 @@ distribution.
 #include "modules/World.h"
 #include "modules/Gui.h"
 #include "modules/Job.h"
+#include "modules/Screen.h"
 #include "modules/Translation.h"
 #include "modules/Units.h"
 
@@ -51,11 +52,15 @@ distribution.
 #include "DFHackVersion.h"
 #include "PluginManager.h"
 
+#include "df/building.h"
+#include "df/enabler.h"
+#include "df/entity_position.h"
+#include "df/entity_position_assignment.h"
+#include "df/historical_entity.h"
+#include "df/item.h"
 #include "df/job.h"
 #include "df/job_item.h"
-#include "df/building.h"
 #include "df/unit.h"
-#include "df/item.h"
 #include "df/world.h"
 
 #include <lua.h>
@@ -81,6 +86,126 @@ inline void AssertCoreSuspend(lua_State *state)
     assert(!Lua::IsCoreContext(state) || DFHack::Core::getInstance().isSuspended());
 }
 
+/*
+ * Lua Push methods
+ */
+
+void DFHack::Lua::Push(lua_State *state, const Units::NoblePosition &pos)
+{
+    lua_createtable(state, 0, 3);
+    Lua::PushDFObject(state, pos.entity);
+    lua_setfield(state, -2, "entity");
+    Lua::PushDFObject(state, pos.assignment);
+    lua_setfield(state, -2, "assignment");
+    Lua::PushDFObject(state, pos.position);
+    lua_setfield(state, -2, "position");
+}
+
+void DFHack::Lua::Push(lua_State *state, df::coord pos)
+{
+    lua_createtable(state, 0, 3);
+    lua_pushinteger(state, pos.x);
+    lua_setfield(state, -2, "x");
+    lua_pushinteger(state, pos.y);
+    lua_setfield(state, -2, "y");
+    lua_pushinteger(state, pos.z);
+    lua_setfield(state, -2, "z");
+}
+
+void DFHack::Lua::Push(lua_State *state, df::coord2d pos)
+{
+    lua_createtable(state, 0, 2);
+    lua_pushinteger(state, pos.x);
+    lua_setfield(state, -2, "x");
+    lua_pushinteger(state, pos.y);
+    lua_setfield(state, -2, "y");
+}
+
+void DFHack::Lua::GetVector(lua_State *state, std::vector<std::string> &pvec)
+{
+    lua_pushnil(state);   // first key
+    while (lua_next(state, 1) != 0)
+    {
+        pvec.push_back(lua_tostring(state, -1));
+        lua_pop(state, 1);  // remove value, leave key
+    }
+}
+
+void DFHack::Lua::PushInterfaceKeys(lua_State *L,
+                            const std::set<df::interface_key> &keys) {
+    lua_createtable(L, 0, keys.size() + 5);
+
+    for (auto &key : keys)
+    {
+        if (auto name = enum_item_raw_key(key))
+            lua_pushstring(L, name);
+        else
+            lua_pushinteger(L, key);
+
+        lua_pushboolean(L, true);
+        lua_rawset(L, -3);
+
+        int charval = Screen::keyToChar(key);
+        if (charval >= 0)
+        {
+            lua_pushinteger(L, charval);
+            lua_setfield(L, -2, "_STRING");
+        }
+    }
+
+    if (df::global::enabler) {
+        if (df::global::enabler->mouse_lbut_down) {
+            lua_pushboolean(L, true);
+            lua_setfield(L, -2, "_MOUSE_L");
+        }
+        if (df::global::enabler->mouse_rbut_down) {
+            lua_pushboolean(L, true);
+            lua_setfield(L, -2, "_MOUSE_R");
+        }
+        if (df::global::enabler->mouse_lbut) {
+            lua_pushboolean(L, true);
+            lua_setfield(L, -2, "_MOUSE_L_DOWN");
+            df::global::enabler->mouse_lbut = 0;
+        }
+        if (df::global::enabler->mouse_rbut) {
+            lua_pushboolean(L, true);
+            lua_setfield(L, -2, "_MOUSE_R_DOWN");
+            df::global::enabler->mouse_rbut = 0;
+        }
+    }
+}
+
+int DFHack::Lua::PushPosXYZ(lua_State *state, df::coord pos)
+{
+    if (!pos.isValid())
+    {
+        lua_pushnil(state);
+        return 1;
+    }
+    else
+    {
+        lua_pushinteger(state, pos.x);
+        lua_pushinteger(state, pos.y);
+        lua_pushinteger(state, pos.z);
+        return 3;
+    }
+}
+
+int DFHack::Lua::PushPosXY(lua_State *state, df::coord2d pos)
+{
+    if (!pos.isValid())
+    {
+        lua_pushnil(state);
+        return 1;
+    }
+    else
+    {
+        lua_pushinteger(state, pos.x);
+        lua_pushinteger(state, pos.y);
+        return 2;
+    }
+}
+
 /*
  * Public DF object reference handling API
  */

From 1d03afcd6faf71fe766af60b2b16efeaae7bafc1 Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Mon, 7 Nov 2022 15:53:00 -0800
Subject: [PATCH 838/854] update changelog

---
 docs/changelog.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/changelog.txt b/docs/changelog.txt
index 7aad40128..545ac2c68 100644
--- a/docs/changelog.txt
+++ b/docs/changelog.txt
@@ -70,6 +70,7 @@ changelog.txt uses a syntax similar to RST, with a few special sequences:
 - `spectate`: improved documentation of features and functionality
 
 ## API
+- ``Lua::PushInterfaceKeys()``: transforms viewscreen ``feed()`` keys into something that can be interpreted by lua-based widgets
 - Constructions module: added ``insert()`` to insert constructions into the game's sorted list.
 
 ## Lua

From 4668d8c4a33bef21d0c3083c969a4b04b9995d4c Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Fri, 4 Nov 2022 17:40:50 -0700
Subject: [PATCH 839/854] Add Lua::Push method for maps

---
 library/include/LuaTools.h | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/library/include/LuaTools.h b/library/include/LuaTools.h
index 1b3c5d595..e4245f09a 100644
--- a/library/include/LuaTools.h
+++ b/library/include/LuaTools.h
@@ -356,6 +356,13 @@ namespace DFHack {namespace Lua {
         lua_settable(state, -3);
     }
 
+    template<typename T_Key, typename T_Value>
+    void Push(lua_State *L, const std::map<T_Key, T_Value> &pmap) {
+        lua_createtable(L, 0, pmap.size());
+        for (auto &entry : pmap)
+            TableInsert(L, entry.first, entry.second);
+    }
+
     DFHACK_EXPORT void CheckPen(lua_State *L, Screen::Pen *pen, int index, bool allow_nil = false, bool allow_color = true);
 
     DFHACK_EXPORT bool IsCoreContext(lua_State *state);

From d0753b4a9c0ffe56dfaa81a2947ccee32e3a759c Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Mon, 7 Nov 2022 16:48:28 -0800
Subject: [PATCH 840/854] update changelog

---
 docs/changelog.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/changelog.txt b/docs/changelog.txt
index 545ac2c68..7f15d5279 100644
--- a/docs/changelog.txt
+++ b/docs/changelog.txt
@@ -71,6 +71,7 @@ changelog.txt uses a syntax similar to RST, with a few special sequences:
 
 ## API
 - ``Lua::PushInterfaceKeys()``: transforms viewscreen ``feed()`` keys into something that can be interpreted by lua-based widgets
+- ``Lua::Push()``: now handles maps with otherwise supported keys and values
 - Constructions module: added ``insert()`` to insert constructions into the game's sorted list.
 
 ## Lua

From 92645ccb5be21bd12c9d1df8c6e5f9f537e0029c Mon Sep 17 00:00:00 2001
From: Josh Cooper <cooper.s.josh@outlook.com>
Date: Tue, 8 Nov 2022 12:43:23 -0800
Subject: [PATCH 841/854] Fixes JOB_STARTED event

---
 docs/changelog.txt               |  1 +
 library/modules/EventManager.cpp | 12 +++++++-----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/docs/changelog.txt b/docs/changelog.txt
index 7f15d5279..793e91858 100644
--- a/docs/changelog.txt
+++ b/docs/changelog.txt
@@ -42,6 +42,7 @@ changelog.txt uses a syntax similar to RST, with a few special sequences:
 - `tiletypes`: no longer resets dig priority to the default when updating other properties of a tile
 - `automaterial`: fix rendering errors with box boundary markers
 - Core: fix the segmentation fault with the REPORT event in EventManager
+- Core: fix the new JOB_STARTED event only sending each event once, to the first handler listed
 
 ## Misc Improvements
 - `blueprint`: new ``--smooth`` option for recording all smoothed floors and walls instead of just the ones that require smoothing for later carving
diff --git a/library/modules/EventManager.cpp b/library/modules/EventManager.cpp
index d8f8543a0..eb41bbeaf 100644
--- a/library/modules/EventManager.cpp
+++ b/library/modules/EventManager.cpp
@@ -444,12 +444,14 @@ static void manageJobStartedEvent(color_ostream& out) {
 
     // iterate event handler callbacks
     multimap<Plugin*, EventHandler> copy(handlers[EventType::JOB_STARTED].begin(), handlers[EventType::JOB_STARTED].end());
-    for (auto &key_value : copy) {
-        auto &handler = key_value.second;
-        for (df::job_list_link* link = df::global::world->jobs.list.next; link != nullptr; link = link->next) {
-            df::job* job = link->item;
+    for (df::job_list_link* link = df::global::world->jobs.list.next; link != nullptr; link = link->next) {
+        df::job* job = link->item;
+        bool send = false;
+        for (auto &key_value : copy) {
+            auto &handler = key_value.second;
             // the jobs must have a worker to start
-            if (job && Job::getWorker(job) && !startedJobs.count(job->id)) {
+            if (send || (job && Job::getWorker(job) && !startedJobs.count(job->id))) {
+                send = true;
                 startedJobs.emplace(job->id);
                 handler.eventHandler(out, job);
             }

From 78e5c072e59c803ed68c991e6f5cdbcdbe6430cd Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Mon, 31 Oct 2022 09:36:54 -0700
Subject: [PATCH 842/854] reset overlay code to skeleton

---
 plugins/overlay.cpp | 254 ++++++++++++++++++++++----------------------
 1 file changed, 128 insertions(+), 126 deletions(-)

diff --git a/plugins/overlay.cpp b/plugins/overlay.cpp
index dd7563112..3af3bf0b5 100644
--- a/plugins/overlay.cpp
+++ b/plugins/overlay.cpp
@@ -51,6 +51,7 @@
 #include "df/viewscreen_locationsst.h"
 #include "df/viewscreen_meetingst.h"
 #include "df/viewscreen_movieplayerst.h"
+#include "df/viewscreen_new_regionst.h"
 #include "df/viewscreen_noblest.h"
 #include "df/viewscreen_optionst.h"
 #include "df/viewscreen_overallstatusst.h"
@@ -71,6 +72,7 @@
 #include "df/viewscreen_topicmeeting_takerequestsst.h"
 #include "df/viewscreen_tradeagreementst.h"
 #include "df/viewscreen_tradelistst.h"
+#include "df/viewscreen_tradegoodsst.h"
 #include "df/viewscreen_treasurelistst.h"
 #include "df/viewscreen_unitlist_page.h"
 #include "df/viewscreen_unitlistst.h"
@@ -82,64 +84,45 @@
 #include "df/viewscreen_workshop_profilest.h"
 
 #include "Debug.h"
+#include "LuaTools.h"
 #include "PluginManager.h"
 #include "VTableInterpose.h"
-#include "uicommon.h"
-
-#include "modules/Screen.h"
 
 using namespace DFHack;
 
 DFHACK_PLUGIN("overlay");
 DFHACK_PLUGIN_IS_ENABLED(is_enabled);
-REQUIRE_GLOBAL(enabler);
-REQUIRE_GLOBAL(gps);
 
 namespace DFHack {
-    DBG_DECLARE(overlay, log, DebugCategory::LINFO);
-}
-
-static const std::string button_text = "[ DFHack ]";
-static bool clicked = false;
-
-static bool handle_click() {
-    if (!enabler->mouse_lbut_down || clicked) {
-        return false;
-    }
-    df::coord2d pos = Screen::getMousePos();
-    DEBUG(log).print("clicked at screen coordinates (%d, %d)\n", pos.x, pos.y);
-    if (pos.y == gps->dimy - 1 && pos.x >= 1 && (size_t)pos.x <= button_text.size()) {
-        clicked = true;
-        Core::getInstance().setHotkeyCmd("gui/launcher");
-        return true;
-    }
-    return false;
-}
-
-static void draw_widgets() {
-    int x = 1;
-    int y = gps->dimy - 1;
-    OutputString(COLOR_GREEN, x, y, button_text);
+    DBG_DECLARE(overlay, control, DebugCategory::LINFO);
+    DBG_DECLARE(overlay, event, DebugCategory::LINFO);
 }
 
 template<class T>
 struct viewscreen_overlay : T {
     typedef T interpose_base;
 
-    DEFINE_VMETHOD_INTERPOSE(void, feed, (set<df::interface_key> *input)) {
-        if (!handle_click())
-            INTERPOSE_NEXT(feed)(input);
+    viewscreen_overlay() : vs_name(T::_identity.getName()) { }
+
+    DEFINE_VMETHOD_INTERPOSE(void, logic, ()) {
+        INTERPOSE_NEXT(logic)();
+    }
+    DEFINE_VMETHOD_INTERPOSE(void, feed, (std::set<df::interface_key> *input)) {
+        INTERPOSE_NEXT(feed)(input);
     }
     DEFINE_VMETHOD_INTERPOSE(void, render, ()) {
         INTERPOSE_NEXT(render)();
-        draw_widgets();
     }
+
+    T *viewscreen;
+    const char *vs_name;
 };
 
 #define IMPLEMENT_HOOKS(screen) \
     typedef viewscreen_overlay<df::viewscreen_##screen##st> screen##_overlay; \
-    template<> IMPLEMENT_VMETHOD_INTERPOSE(screen##_overlay, feed); \
-    template<> IMPLEMENT_VMETHOD_INTERPOSE(screen##_overlay, render);
+    template<> IMPLEMENT_VMETHOD_INTERPOSE_PRIO(screen##_overlay, logic, 100); \
+    template<> IMPLEMENT_VMETHOD_INTERPOSE_PRIO(screen##_overlay, feed, 100); \
+    template<> IMPLEMENT_VMETHOD_INTERPOSE_PRIO(screen##_overlay, render, 100);
 
 IMPLEMENT_HOOKS(adopt_region)
 IMPLEMENT_HOOKS(adventure_log)
@@ -191,6 +174,7 @@ IMPLEMENT_HOOKS(loadgame)
 IMPLEMENT_HOOKS(locations)
 IMPLEMENT_HOOKS(meeting)
 IMPLEMENT_HOOKS(movieplayer)
+IMPLEMENT_HOOKS(new_region)
 IMPLEMENT_HOOKS(noble)
 IMPLEMENT_HOOKS(option)
 IMPLEMENT_HOOKS(overallstatus)
@@ -210,6 +194,7 @@ IMPLEMENT_HOOKS(topicmeeting_fill_land_holder_positions)
 IMPLEMENT_HOOKS(topicmeeting)
 IMPLEMENT_HOOKS(topicmeeting_takerequests)
 IMPLEMENT_HOOKS(tradeagreement)
+IMPLEMENT_HOOKS(tradegoods)
 IMPLEMENT_HOOKS(tradelist)
 IMPLEMENT_HOOKS(treasurelist)
 IMPLEMENT_HOOKS(unitlist)
@@ -222,15 +207,8 @@ IMPLEMENT_HOOKS(workshop_profile)
 
 #undef IMPLEMENT_HOOKS
 
-DFhackCExport command_result plugin_onstatechange(color_ostream &,
-                                                  state_change_event evt) {
-    if (evt == SC_VIEWSCREEN_CHANGED) {
-        clicked = false;
-    }
-    return CR_OK;
-}
-
 #define INTERPOSE_HOOKS_FAILED(screen) \
+    !INTERPOSE_HOOK(screen##_overlay, logic).apply(enable) || \
     !INTERPOSE_HOOK(screen##_overlay, feed).apply(enable) || \
     !INTERPOSE_HOOK(screen##_overlay, render).apply(enable)
 
@@ -238,98 +216,122 @@ DFhackCExport command_result plugin_enable(color_ostream &, bool enable) {
     if (is_enabled == enable)
         return CR_OK;
 
-    if (enable != is_enabled) {
-        if (INTERPOSE_HOOKS_FAILED(adopt_region) ||
-                INTERPOSE_HOOKS_FAILED(adventure_log) ||
-                INTERPOSE_HOOKS_FAILED(announcelist) ||
-                INTERPOSE_HOOKS_FAILED(assign_display_item) ||
-                INTERPOSE_HOOKS_FAILED(barter) ||
-                INTERPOSE_HOOKS_FAILED(buildinglist) ||
-                INTERPOSE_HOOKS_FAILED(building) ||
-                INTERPOSE_HOOKS_FAILED(choose_start_site) ||
-                INTERPOSE_HOOKS_FAILED(civlist) ||
-                INTERPOSE_HOOKS_FAILED(counterintelligence) ||
-                INTERPOSE_HOOKS_FAILED(createquota) ||
-                INTERPOSE_HOOKS_FAILED(customize_unit) ||
-                INTERPOSE_HOOKS_FAILED(dungeonmode) ||
-                INTERPOSE_HOOKS_FAILED(dungeon_monsterstatus) ||
-                INTERPOSE_HOOKS_FAILED(dungeon_wrestle) ||
-                INTERPOSE_HOOKS_FAILED(dwarfmode) ||
-                INTERPOSE_HOOKS_FAILED(entity) ||
-                INTERPOSE_HOOKS_FAILED(export_graphical_map) ||
-                INTERPOSE_HOOKS_FAILED(export_region) ||
-                INTERPOSE_HOOKS_FAILED(game_cleaner) ||
-                INTERPOSE_HOOKS_FAILED(image_creator) ||
-                INTERPOSE_HOOKS_FAILED(item) ||
-                INTERPOSE_HOOKS_FAILED(joblist) ||
-                INTERPOSE_HOOKS_FAILED(jobmanagement) ||
-                INTERPOSE_HOOKS_FAILED(job) ||
-                INTERPOSE_HOOKS_FAILED(justice) ||
-                INTERPOSE_HOOKS_FAILED(kitchenpref) ||
-                INTERPOSE_HOOKS_FAILED(layer_arena_creature) ||
-                INTERPOSE_HOOKS_FAILED(layer_assigntrade) ||
-                INTERPOSE_HOOKS_FAILED(layer_choose_language_name) ||
-                INTERPOSE_HOOKS_FAILED(layer_currency) ||
-                INTERPOSE_HOOKS_FAILED(layer_export_play_map) ||
-                INTERPOSE_HOOKS_FAILED(layer_military) ||
-                INTERPOSE_HOOKS_FAILED(layer_musicsound) ||
-                INTERPOSE_HOOKS_FAILED(layer_noblelist) ||
-                INTERPOSE_HOOKS_FAILED(layer_overall_health) ||
-                INTERPOSE_HOOKS_FAILED(layer_reaction) ||
-                INTERPOSE_HOOKS_FAILED(layer_squad_schedule) ||
-                INTERPOSE_HOOKS_FAILED(layer_stockpile) ||
-                INTERPOSE_HOOKS_FAILED(layer_stone_restriction) ||
-                INTERPOSE_HOOKS_FAILED(layer_unit_action) ||
-                INTERPOSE_HOOKS_FAILED(layer_unit_health) ||
-                INTERPOSE_HOOKS_FAILED(layer_unit_relationship) ||
-                INTERPOSE_HOOKS_FAILED(layer_world_gen_param_preset) ||
-                INTERPOSE_HOOKS_FAILED(layer_world_gen_param) ||
-                INTERPOSE_HOOKS_FAILED(legends) ||
-                INTERPOSE_HOOKS_FAILED(loadgame) ||
-                INTERPOSE_HOOKS_FAILED(locations) ||
-                INTERPOSE_HOOKS_FAILED(meeting) ||
-                INTERPOSE_HOOKS_FAILED(movieplayer) ||
-                INTERPOSE_HOOKS_FAILED(noble) ||
-                INTERPOSE_HOOKS_FAILED(option) ||
-                INTERPOSE_HOOKS_FAILED(overallstatus) ||
-                INTERPOSE_HOOKS_FAILED(petitions) ||
-                INTERPOSE_HOOKS_FAILED(pet) ||
-                INTERPOSE_HOOKS_FAILED(price) ||
-                INTERPOSE_HOOKS_FAILED(reportlist) ||
-                INTERPOSE_HOOKS_FAILED(requestagreement) ||
-                INTERPOSE_HOOKS_FAILED(savegame) ||
-                INTERPOSE_HOOKS_FAILED(selectitem) ||
-                INTERPOSE_HOOKS_FAILED(setupadventure) ||
-                INTERPOSE_HOOKS_FAILED(setupdwarfgame) ||
-                INTERPOSE_HOOKS_FAILED(stores) ||
-                INTERPOSE_HOOKS_FAILED(textviewer) ||
-                INTERPOSE_HOOKS_FAILED(title) ||
-                INTERPOSE_HOOKS_FAILED(topicmeeting_fill_land_holder_positions) ||
-                INTERPOSE_HOOKS_FAILED(topicmeeting) ||
-                INTERPOSE_HOOKS_FAILED(topicmeeting_takerequests) ||
-                INTERPOSE_HOOKS_FAILED(tradeagreement) ||
-                INTERPOSE_HOOKS_FAILED(tradelist) ||
-                INTERPOSE_HOOKS_FAILED(treasurelist) ||
-                INTERPOSE_HOOKS_FAILED(unitlist) ||
-                INTERPOSE_HOOKS_FAILED(unit) ||
-                INTERPOSE_HOOKS_FAILED(update_region) ||
-                INTERPOSE_HOOKS_FAILED(wages) ||
-                INTERPOSE_HOOKS_FAILED(workquota_condition) ||
-                INTERPOSE_HOOKS_FAILED(workquota_details) ||
-                INTERPOSE_HOOKS_FAILED(workshop_profile))
-            return CR_FAILURE;
+    DEBUG(control).print("%sing interpose hooks\n", enable ? "enabl" : "disabl");
 
-        is_enabled = enable;
-    }
+    if (INTERPOSE_HOOKS_FAILED(adopt_region) ||
+            INTERPOSE_HOOKS_FAILED(adventure_log) ||
+            INTERPOSE_HOOKS_FAILED(announcelist) ||
+            INTERPOSE_HOOKS_FAILED(assign_display_item) ||
+            INTERPOSE_HOOKS_FAILED(barter) ||
+            INTERPOSE_HOOKS_FAILED(buildinglist) ||
+            INTERPOSE_HOOKS_FAILED(building) ||
+            INTERPOSE_HOOKS_FAILED(choose_start_site) ||
+            INTERPOSE_HOOKS_FAILED(civlist) ||
+            INTERPOSE_HOOKS_FAILED(counterintelligence) ||
+            INTERPOSE_HOOKS_FAILED(createquota) ||
+            INTERPOSE_HOOKS_FAILED(customize_unit) ||
+            INTERPOSE_HOOKS_FAILED(dungeonmode) ||
+            INTERPOSE_HOOKS_FAILED(dungeon_monsterstatus) ||
+            INTERPOSE_HOOKS_FAILED(dungeon_wrestle) ||
+            INTERPOSE_HOOKS_FAILED(dwarfmode) ||
+            INTERPOSE_HOOKS_FAILED(entity) ||
+            INTERPOSE_HOOKS_FAILED(export_graphical_map) ||
+            INTERPOSE_HOOKS_FAILED(export_region) ||
+            INTERPOSE_HOOKS_FAILED(game_cleaner) ||
+            INTERPOSE_HOOKS_FAILED(image_creator) ||
+            INTERPOSE_HOOKS_FAILED(item) ||
+            INTERPOSE_HOOKS_FAILED(joblist) ||
+            INTERPOSE_HOOKS_FAILED(jobmanagement) ||
+            INTERPOSE_HOOKS_FAILED(job) ||
+            INTERPOSE_HOOKS_FAILED(justice) ||
+            INTERPOSE_HOOKS_FAILED(kitchenpref) ||
+            INTERPOSE_HOOKS_FAILED(layer_arena_creature) ||
+            INTERPOSE_HOOKS_FAILED(layer_assigntrade) ||
+            INTERPOSE_HOOKS_FAILED(layer_choose_language_name) ||
+            INTERPOSE_HOOKS_FAILED(layer_currency) ||
+            INTERPOSE_HOOKS_FAILED(layer_export_play_map) ||
+            INTERPOSE_HOOKS_FAILED(layer_military) ||
+            INTERPOSE_HOOKS_FAILED(layer_musicsound) ||
+            INTERPOSE_HOOKS_FAILED(layer_noblelist) ||
+            INTERPOSE_HOOKS_FAILED(layer_overall_health) ||
+            INTERPOSE_HOOKS_FAILED(layer_reaction) ||
+            INTERPOSE_HOOKS_FAILED(layer_squad_schedule) ||
+            INTERPOSE_HOOKS_FAILED(layer_stockpile) ||
+            INTERPOSE_HOOKS_FAILED(layer_stone_restriction) ||
+            INTERPOSE_HOOKS_FAILED(layer_unit_action) ||
+            INTERPOSE_HOOKS_FAILED(layer_unit_health) ||
+            INTERPOSE_HOOKS_FAILED(layer_unit_relationship) ||
+            INTERPOSE_HOOKS_FAILED(layer_world_gen_param_preset) ||
+            INTERPOSE_HOOKS_FAILED(layer_world_gen_param) ||
+            INTERPOSE_HOOKS_FAILED(legends) ||
+            INTERPOSE_HOOKS_FAILED(loadgame) ||
+            INTERPOSE_HOOKS_FAILED(locations) ||
+            INTERPOSE_HOOKS_FAILED(meeting) ||
+            INTERPOSE_HOOKS_FAILED(movieplayer) ||
+            INTERPOSE_HOOKS_FAILED(new_region) ||
+            INTERPOSE_HOOKS_FAILED(noble) ||
+            INTERPOSE_HOOKS_FAILED(option) ||
+            INTERPOSE_HOOKS_FAILED(overallstatus) ||
+            INTERPOSE_HOOKS_FAILED(petitions) ||
+            INTERPOSE_HOOKS_FAILED(pet) ||
+            INTERPOSE_HOOKS_FAILED(price) ||
+            INTERPOSE_HOOKS_FAILED(reportlist) ||
+            INTERPOSE_HOOKS_FAILED(requestagreement) ||
+            INTERPOSE_HOOKS_FAILED(savegame) ||
+            INTERPOSE_HOOKS_FAILED(selectitem) ||
+            INTERPOSE_HOOKS_FAILED(setupadventure) ||
+            INTERPOSE_HOOKS_FAILED(setupdwarfgame) ||
+            INTERPOSE_HOOKS_FAILED(stores) ||
+            INTERPOSE_HOOKS_FAILED(textviewer) ||
+            INTERPOSE_HOOKS_FAILED(title) ||
+            INTERPOSE_HOOKS_FAILED(topicmeeting_fill_land_holder_positions) ||
+            INTERPOSE_HOOKS_FAILED(topicmeeting) ||
+            INTERPOSE_HOOKS_FAILED(topicmeeting_takerequests) ||
+            INTERPOSE_HOOKS_FAILED(tradeagreement) ||
+            INTERPOSE_HOOKS_FAILED(tradegoods) ||
+            INTERPOSE_HOOKS_FAILED(tradelist) ||
+            INTERPOSE_HOOKS_FAILED(treasurelist) ||
+            INTERPOSE_HOOKS_FAILED(unitlist) ||
+            INTERPOSE_HOOKS_FAILED(unit) ||
+            INTERPOSE_HOOKS_FAILED(update_region) ||
+            INTERPOSE_HOOKS_FAILED(wages) ||
+            INTERPOSE_HOOKS_FAILED(workquota_condition) ||
+            INTERPOSE_HOOKS_FAILED(workquota_details) ||
+            INTERPOSE_HOOKS_FAILED(workshop_profile))
+        return CR_FAILURE;
+
+    is_enabled = enable;
     return CR_OK;
 }
 
 #undef INTERPOSE_HOOKS_FAILED
 
-DFhackCExport command_result plugin_init(color_ostream &out, std::vector <PluginCommand> &) {
+static command_result overlay_cmd(color_ostream &out, std::vector <std::string> & parameters) {
+    if (DBG_NAME(control).isEnabled(DebugCategory::LDEBUG)) {
+        DEBUG(control).print("interpreting command with %zu parameters:\n",
+                             parameters.size());
+        for (auto &param : parameters) {
+            DEBUG(control).print("  %s\n", param.c_str());
+        }
+    }
+
+    return CR_OK;
+}
+
+DFhackCExport command_result plugin_init(color_ostream &out, std::vector <PluginCommand> &commands) {
+    commands.push_back(
+        PluginCommand(
+            "overlay",
+            "Manage onscreen widgets.",
+            overlay_cmd));
+
     return plugin_enable(out, true);
 }
 
 DFhackCExport command_result plugin_shutdown(color_ostream &out) {
     return plugin_enable(out, false);
 }
+
+DFhackCExport command_result plugin_onupdate (color_ostream &out) {
+    return CR_OK;
+}

From 2f81c3a6960f22c6c772a1795005d49dca595a78 Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Mon, 31 Oct 2022 10:57:04 -0700
Subject: [PATCH 843/854] use preprocessor foreach to reduce boilerplate

---
 library/include/MiscUtils.h |  59 ++++++++++++
 plugins/overlay.cpp         | 183 +++++-------------------------------
 2 files changed, 82 insertions(+), 160 deletions(-)

diff --git a/library/include/MiscUtils.h b/library/include/MiscUtils.h
index 56506f7bd..768d23dd4 100644
--- a/library/include/MiscUtils.h
+++ b/library/include/MiscUtils.h
@@ -429,3 +429,62 @@ DFHACK_EXPORT std::string UTF2DF(const std::string &in);
 DFHACK_EXPORT std::string DF2UTF(const std::string &in);
 DFHACK_EXPORT std::string DF2CONSOLE(const std::string &in);
 DFHACK_EXPORT std::string DF2CONSOLE(DFHack::color_ostream &out, const std::string &in);
+
+// MAP macro for implementing preprocessor foreach
+// from https://github.com/swansontec/map-macro/blob/master/map.h
+// MAP_JOIN was added as a generalization of the existing MAP_LIST
+/*
+ * Created by William Swanson in 2012.
+ *
+ * I, William Swanson, dedicate this work to the public domain.
+ * I waive all rights to the work worldwide under copyright law,
+ * including all related and neighboring rights,
+ * to the extent allowed by law.
+ *
+ * You can copy, modify, distribute and perform the work,
+ * even for commercial purposes, all without asking permission.
+ */
+
+#define EVAL0(...) __VA_ARGS__
+#define EVAL1(...) EVAL0(EVAL0(EVAL0(__VA_ARGS__)))
+#define EVAL2(...) EVAL1(EVAL1(EVAL1(__VA_ARGS__)))
+#define EVAL3(...) EVAL2(EVAL2(EVAL2(__VA_ARGS__)))
+#define EVAL4(...) EVAL3(EVAL3(EVAL3(__VA_ARGS__)))
+#define EVAL(...)  EVAL4(EVAL4(EVAL4(__VA_ARGS__)))
+
+#define MAP_END(...)
+#define MAP_OUT
+#define MAP_COMMA ,
+
+#define MAP_GET_END2() 0, MAP_END
+#define MAP_GET_END1(...) MAP_GET_END2
+#define MAP_GET_END(...) MAP_GET_END1
+#define MAP_NEXT0(test, next, ...) next MAP_OUT
+#define MAP_NEXT1(test, next) MAP_NEXT0(test, next, 0)
+#define MAP_NEXT(test, next)  MAP_NEXT1(MAP_GET_END test, next)
+
+#define MAP0(f, x, peek, ...) f(x) MAP_NEXT(peek, MAP1)(f, peek, __VA_ARGS__)
+#define MAP1(f, x, peek, ...) f(x) MAP_NEXT(peek, MAP0)(f, peek, __VA_ARGS__)
+
+#define MAP_JOIN_NEXT1(sep, test, next) MAP_NEXT0(test, sep next, 0)
+#define MAP_JOIN_NEXT(sep, test, next)  MAP_JOIN_NEXT1(sep, MAP_GET_END test, next)
+
+#define MAP_JOIN0(f, sep, x, peek, ...) f(x) MAP_JOIN_NEXT(sep, peek, MAP_JOIN1)(f, sep, peek, __VA_ARGS__)
+#define MAP_JOIN1(f, sep, x, peek, ...) f(x) MAP_JOIN_NEXT(sep, peek, MAP_JOIN0)(f, sep, peek, __VA_ARGS__)
+
+/**
+ * Applies the function macro `f` to each of the remaining parameters.
+ */
+#define MAP(f, ...) EVAL(MAP1(f, __VA_ARGS__, ()()(), ()()(), ()()(), 0))
+
+/**
+ * Applies the function macro `f` to each of the remaining parameters and
+ * inserts the given separator between the results.
+ */
+#define MAP_JOIN(f, sep, ...) EVAL(MAP_JOIN1(f, sep, __VA_ARGS__, ()()(), ()()(), ()()(), 0))
+
+/**
+ * Applies the function macro `f` to each of the remaining parameters and
+ * inserts commas between the results.
+ */
+#define MAP_LIST(f, ...) MAP_JOIN(f, MAP_COMMA, __VA_ARGS__)
diff --git a/plugins/overlay.cpp b/plugins/overlay.cpp
index 3af3bf0b5..1da693b04 100644
--- a/plugins/overlay.cpp
+++ b/plugins/overlay.cpp
@@ -85,6 +85,7 @@
 
 #include "Debug.h"
 #include "LuaTools.h"
+#include "MiscUtils.h"
 #include "PluginManager.h"
 #include "VTableInterpose.h"
 
@@ -98,6 +99,26 @@ namespace DFHack {
     DBG_DECLARE(overlay, event, DebugCategory::LINFO);
 }
 
+#define SCREEN_LIST adopt_region, adventure_log, announcelist, \
+    assign_display_item, barter, buildinglist, building, choose_start_site, \
+    civlist, counterintelligence, createquota, customize_unit, dungeonmode, \
+    dungeon_monsterstatus, dungeon_wrestle, dwarfmode, entity, \
+    export_graphical_map, export_region, game_cleaner, image_creator, item, \
+    joblist, jobmanagement, job, justice, kitchenpref, layer_arena_creature, \
+    layer_assigntrade, layer_choose_language_name, layer_currency, \
+    layer_export_play_map, layer_military, layer_musicsound, layer_noblelist, \
+    layer_overall_health, layer_reaction, layer_squad_schedule, \
+    layer_stockpile, layer_stone_restriction, layer_unit_action, \
+    layer_unit_health, layer_unit_relationship, layer_world_gen_param_preset, \
+    layer_world_gen_param, legends, loadgame, locations, meeting, movieplayer, \
+    new_region, noble, option, overallstatus, petitions, pet, price, \
+    reportlist, requestagreement, savegame, selectitem, setupadventure, \
+    setupdwarfgame, stores, textviewer, title, \
+    topicmeeting_fill_land_holder_positions, topicmeeting, \
+    topicmeeting_takerequests, tradeagreement, tradegoods, tradelist, \
+    treasurelist, unitlist, unit, update_region, wages, workquota_condition, \
+    workquota_details, workshop_profile
+
 template<class T>
 struct viewscreen_overlay : T {
     typedef T interpose_base;
@@ -124,86 +145,7 @@ struct viewscreen_overlay : T {
     template<> IMPLEMENT_VMETHOD_INTERPOSE_PRIO(screen##_overlay, feed, 100); \
     template<> IMPLEMENT_VMETHOD_INTERPOSE_PRIO(screen##_overlay, render, 100);
 
-IMPLEMENT_HOOKS(adopt_region)
-IMPLEMENT_HOOKS(adventure_log)
-IMPLEMENT_HOOKS(announcelist)
-IMPLEMENT_HOOKS(assign_display_item)
-IMPLEMENT_HOOKS(barter)
-IMPLEMENT_HOOKS(buildinglist)
-IMPLEMENT_HOOKS(building)
-IMPLEMENT_HOOKS(choose_start_site)
-IMPLEMENT_HOOKS(civlist)
-IMPLEMENT_HOOKS(counterintelligence)
-IMPLEMENT_HOOKS(createquota)
-IMPLEMENT_HOOKS(customize_unit)
-IMPLEMENT_HOOKS(dungeonmode)
-IMPLEMENT_HOOKS(dungeon_monsterstatus)
-IMPLEMENT_HOOKS(dungeon_wrestle)
-IMPLEMENT_HOOKS(dwarfmode)
-IMPLEMENT_HOOKS(entity)
-IMPLEMENT_HOOKS(export_graphical_map)
-IMPLEMENT_HOOKS(export_region)
-IMPLEMENT_HOOKS(game_cleaner)
-IMPLEMENT_HOOKS(image_creator)
-IMPLEMENT_HOOKS(item)
-IMPLEMENT_HOOKS(joblist)
-IMPLEMENT_HOOKS(jobmanagement)
-IMPLEMENT_HOOKS(job)
-IMPLEMENT_HOOKS(justice)
-IMPLEMENT_HOOKS(kitchenpref)
-IMPLEMENT_HOOKS(layer_arena_creature)
-IMPLEMENT_HOOKS(layer_assigntrade)
-IMPLEMENT_HOOKS(layer_choose_language_name)
-IMPLEMENT_HOOKS(layer_currency)
-IMPLEMENT_HOOKS(layer_export_play_map)
-IMPLEMENT_HOOKS(layer_military)
-IMPLEMENT_HOOKS(layer_musicsound)
-IMPLEMENT_HOOKS(layer_noblelist)
-IMPLEMENT_HOOKS(layer_overall_health)
-IMPLEMENT_HOOKS(layer_reaction)
-IMPLEMENT_HOOKS(layer_squad_schedule)
-IMPLEMENT_HOOKS(layer_stockpile)
-IMPLEMENT_HOOKS(layer_stone_restriction)
-IMPLEMENT_HOOKS(layer_unit_action)
-IMPLEMENT_HOOKS(layer_unit_health)
-IMPLEMENT_HOOKS(layer_unit_relationship)
-IMPLEMENT_HOOKS(layer_world_gen_param_preset)
-IMPLEMENT_HOOKS(layer_world_gen_param)
-IMPLEMENT_HOOKS(legends)
-IMPLEMENT_HOOKS(loadgame)
-IMPLEMENT_HOOKS(locations)
-IMPLEMENT_HOOKS(meeting)
-IMPLEMENT_HOOKS(movieplayer)
-IMPLEMENT_HOOKS(new_region)
-IMPLEMENT_HOOKS(noble)
-IMPLEMENT_HOOKS(option)
-IMPLEMENT_HOOKS(overallstatus)
-IMPLEMENT_HOOKS(petitions)
-IMPLEMENT_HOOKS(pet)
-IMPLEMENT_HOOKS(price)
-IMPLEMENT_HOOKS(reportlist)
-IMPLEMENT_HOOKS(requestagreement)
-IMPLEMENT_HOOKS(savegame)
-IMPLEMENT_HOOKS(selectitem)
-IMPLEMENT_HOOKS(setupadventure)
-IMPLEMENT_HOOKS(setupdwarfgame)
-IMPLEMENT_HOOKS(stores)
-IMPLEMENT_HOOKS(textviewer)
-IMPLEMENT_HOOKS(title)
-IMPLEMENT_HOOKS(topicmeeting_fill_land_holder_positions)
-IMPLEMENT_HOOKS(topicmeeting)
-IMPLEMENT_HOOKS(topicmeeting_takerequests)
-IMPLEMENT_HOOKS(tradeagreement)
-IMPLEMENT_HOOKS(tradegoods)
-IMPLEMENT_HOOKS(tradelist)
-IMPLEMENT_HOOKS(treasurelist)
-IMPLEMENT_HOOKS(unitlist)
-IMPLEMENT_HOOKS(unit)
-IMPLEMENT_HOOKS(update_region)
-IMPLEMENT_HOOKS(wages)
-IMPLEMENT_HOOKS(workquota_condition)
-IMPLEMENT_HOOKS(workquota_details)
-IMPLEMENT_HOOKS(workshop_profile)
+MAP(IMPLEMENT_HOOKS, SCREEN_LIST)
 
 #undef IMPLEMENT_HOOKS
 
@@ -218,86 +160,7 @@ DFhackCExport command_result plugin_enable(color_ostream &, bool enable) {
 
     DEBUG(control).print("%sing interpose hooks\n", enable ? "enabl" : "disabl");
 
-    if (INTERPOSE_HOOKS_FAILED(adopt_region) ||
-            INTERPOSE_HOOKS_FAILED(adventure_log) ||
-            INTERPOSE_HOOKS_FAILED(announcelist) ||
-            INTERPOSE_HOOKS_FAILED(assign_display_item) ||
-            INTERPOSE_HOOKS_FAILED(barter) ||
-            INTERPOSE_HOOKS_FAILED(buildinglist) ||
-            INTERPOSE_HOOKS_FAILED(building) ||
-            INTERPOSE_HOOKS_FAILED(choose_start_site) ||
-            INTERPOSE_HOOKS_FAILED(civlist) ||
-            INTERPOSE_HOOKS_FAILED(counterintelligence) ||
-            INTERPOSE_HOOKS_FAILED(createquota) ||
-            INTERPOSE_HOOKS_FAILED(customize_unit) ||
-            INTERPOSE_HOOKS_FAILED(dungeonmode) ||
-            INTERPOSE_HOOKS_FAILED(dungeon_monsterstatus) ||
-            INTERPOSE_HOOKS_FAILED(dungeon_wrestle) ||
-            INTERPOSE_HOOKS_FAILED(dwarfmode) ||
-            INTERPOSE_HOOKS_FAILED(entity) ||
-            INTERPOSE_HOOKS_FAILED(export_graphical_map) ||
-            INTERPOSE_HOOKS_FAILED(export_region) ||
-            INTERPOSE_HOOKS_FAILED(game_cleaner) ||
-            INTERPOSE_HOOKS_FAILED(image_creator) ||
-            INTERPOSE_HOOKS_FAILED(item) ||
-            INTERPOSE_HOOKS_FAILED(joblist) ||
-            INTERPOSE_HOOKS_FAILED(jobmanagement) ||
-            INTERPOSE_HOOKS_FAILED(job) ||
-            INTERPOSE_HOOKS_FAILED(justice) ||
-            INTERPOSE_HOOKS_FAILED(kitchenpref) ||
-            INTERPOSE_HOOKS_FAILED(layer_arena_creature) ||
-            INTERPOSE_HOOKS_FAILED(layer_assigntrade) ||
-            INTERPOSE_HOOKS_FAILED(layer_choose_language_name) ||
-            INTERPOSE_HOOKS_FAILED(layer_currency) ||
-            INTERPOSE_HOOKS_FAILED(layer_export_play_map) ||
-            INTERPOSE_HOOKS_FAILED(layer_military) ||
-            INTERPOSE_HOOKS_FAILED(layer_musicsound) ||
-            INTERPOSE_HOOKS_FAILED(layer_noblelist) ||
-            INTERPOSE_HOOKS_FAILED(layer_overall_health) ||
-            INTERPOSE_HOOKS_FAILED(layer_reaction) ||
-            INTERPOSE_HOOKS_FAILED(layer_squad_schedule) ||
-            INTERPOSE_HOOKS_FAILED(layer_stockpile) ||
-            INTERPOSE_HOOKS_FAILED(layer_stone_restriction) ||
-            INTERPOSE_HOOKS_FAILED(layer_unit_action) ||
-            INTERPOSE_HOOKS_FAILED(layer_unit_health) ||
-            INTERPOSE_HOOKS_FAILED(layer_unit_relationship) ||
-            INTERPOSE_HOOKS_FAILED(layer_world_gen_param_preset) ||
-            INTERPOSE_HOOKS_FAILED(layer_world_gen_param) ||
-            INTERPOSE_HOOKS_FAILED(legends) ||
-            INTERPOSE_HOOKS_FAILED(loadgame) ||
-            INTERPOSE_HOOKS_FAILED(locations) ||
-            INTERPOSE_HOOKS_FAILED(meeting) ||
-            INTERPOSE_HOOKS_FAILED(movieplayer) ||
-            INTERPOSE_HOOKS_FAILED(new_region) ||
-            INTERPOSE_HOOKS_FAILED(noble) ||
-            INTERPOSE_HOOKS_FAILED(option) ||
-            INTERPOSE_HOOKS_FAILED(overallstatus) ||
-            INTERPOSE_HOOKS_FAILED(petitions) ||
-            INTERPOSE_HOOKS_FAILED(pet) ||
-            INTERPOSE_HOOKS_FAILED(price) ||
-            INTERPOSE_HOOKS_FAILED(reportlist) ||
-            INTERPOSE_HOOKS_FAILED(requestagreement) ||
-            INTERPOSE_HOOKS_FAILED(savegame) ||
-            INTERPOSE_HOOKS_FAILED(selectitem) ||
-            INTERPOSE_HOOKS_FAILED(setupadventure) ||
-            INTERPOSE_HOOKS_FAILED(setupdwarfgame) ||
-            INTERPOSE_HOOKS_FAILED(stores) ||
-            INTERPOSE_HOOKS_FAILED(textviewer) ||
-            INTERPOSE_HOOKS_FAILED(title) ||
-            INTERPOSE_HOOKS_FAILED(topicmeeting_fill_land_holder_positions) ||
-            INTERPOSE_HOOKS_FAILED(topicmeeting) ||
-            INTERPOSE_HOOKS_FAILED(topicmeeting_takerequests) ||
-            INTERPOSE_HOOKS_FAILED(tradeagreement) ||
-            INTERPOSE_HOOKS_FAILED(tradegoods) ||
-            INTERPOSE_HOOKS_FAILED(tradelist) ||
-            INTERPOSE_HOOKS_FAILED(treasurelist) ||
-            INTERPOSE_HOOKS_FAILED(unitlist) ||
-            INTERPOSE_HOOKS_FAILED(unit) ||
-            INTERPOSE_HOOKS_FAILED(update_region) ||
-            INTERPOSE_HOOKS_FAILED(wages) ||
-            INTERPOSE_HOOKS_FAILED(workquota_condition) ||
-            INTERPOSE_HOOKS_FAILED(workquota_details) ||
-            INTERPOSE_HOOKS_FAILED(workshop_profile))
+    if (MAP_JOIN(INTERPOSE_HOOKS_FAILED, ||, SCREEN_LIST))
         return CR_FAILURE;
 
     is_enabled = enable;

From 69673c2472d99f02e1beffe8fa5684e706f2e2ce Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Mon, 7 Nov 2022 16:29:41 -0800
Subject: [PATCH 844/854] remove unused (and unusable) instance fields

---
 plugins/overlay.cpp | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/plugins/overlay.cpp b/plugins/overlay.cpp
index 1da693b04..a53232cd3 100644
--- a/plugins/overlay.cpp
+++ b/plugins/overlay.cpp
@@ -123,8 +123,6 @@ template<class T>
 struct viewscreen_overlay : T {
     typedef T interpose_base;
 
-    viewscreen_overlay() : vs_name(T::_identity.getName()) { }
-
     DEFINE_VMETHOD_INTERPOSE(void, logic, ()) {
         INTERPOSE_NEXT(logic)();
     }
@@ -134,9 +132,6 @@ struct viewscreen_overlay : T {
     DEFINE_VMETHOD_INTERPOSE(void, render, ()) {
         INTERPOSE_NEXT(render)();
     }
-
-    T *viewscreen;
-    const char *vs_name;
 };
 
 #define IMPLEMENT_HOOKS(screen) \

From dce312b83bdec11f86c08c9cddb148a5e5113d3d Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Wed, 9 Nov 2022 09:37:51 -0800
Subject: [PATCH 845/854] Revert "use preprocessor foreach to reduce
 boilerplate"

This reverts commit 5e845ec7983555a3577e583038da824902dbf477.
not compatible with our MSVC toolchain. we can revert this revert once
we update MSVC for the steam release
---
 library/include/MiscUtils.h |  59 ------------
 plugins/overlay.cpp         | 183 +++++++++++++++++++++++++++++++-----
 2 files changed, 160 insertions(+), 82 deletions(-)

diff --git a/library/include/MiscUtils.h b/library/include/MiscUtils.h
index 768d23dd4..56506f7bd 100644
--- a/library/include/MiscUtils.h
+++ b/library/include/MiscUtils.h
@@ -429,62 +429,3 @@ DFHACK_EXPORT std::string UTF2DF(const std::string &in);
 DFHACK_EXPORT std::string DF2UTF(const std::string &in);
 DFHACK_EXPORT std::string DF2CONSOLE(const std::string &in);
 DFHACK_EXPORT std::string DF2CONSOLE(DFHack::color_ostream &out, const std::string &in);
-
-// MAP macro for implementing preprocessor foreach
-// from https://github.com/swansontec/map-macro/blob/master/map.h
-// MAP_JOIN was added as a generalization of the existing MAP_LIST
-/*
- * Created by William Swanson in 2012.
- *
- * I, William Swanson, dedicate this work to the public domain.
- * I waive all rights to the work worldwide under copyright law,
- * including all related and neighboring rights,
- * to the extent allowed by law.
- *
- * You can copy, modify, distribute and perform the work,
- * even for commercial purposes, all without asking permission.
- */
-
-#define EVAL0(...) __VA_ARGS__
-#define EVAL1(...) EVAL0(EVAL0(EVAL0(__VA_ARGS__)))
-#define EVAL2(...) EVAL1(EVAL1(EVAL1(__VA_ARGS__)))
-#define EVAL3(...) EVAL2(EVAL2(EVAL2(__VA_ARGS__)))
-#define EVAL4(...) EVAL3(EVAL3(EVAL3(__VA_ARGS__)))
-#define EVAL(...)  EVAL4(EVAL4(EVAL4(__VA_ARGS__)))
-
-#define MAP_END(...)
-#define MAP_OUT
-#define MAP_COMMA ,
-
-#define MAP_GET_END2() 0, MAP_END
-#define MAP_GET_END1(...) MAP_GET_END2
-#define MAP_GET_END(...) MAP_GET_END1
-#define MAP_NEXT0(test, next, ...) next MAP_OUT
-#define MAP_NEXT1(test, next) MAP_NEXT0(test, next, 0)
-#define MAP_NEXT(test, next)  MAP_NEXT1(MAP_GET_END test, next)
-
-#define MAP0(f, x, peek, ...) f(x) MAP_NEXT(peek, MAP1)(f, peek, __VA_ARGS__)
-#define MAP1(f, x, peek, ...) f(x) MAP_NEXT(peek, MAP0)(f, peek, __VA_ARGS__)
-
-#define MAP_JOIN_NEXT1(sep, test, next) MAP_NEXT0(test, sep next, 0)
-#define MAP_JOIN_NEXT(sep, test, next)  MAP_JOIN_NEXT1(sep, MAP_GET_END test, next)
-
-#define MAP_JOIN0(f, sep, x, peek, ...) f(x) MAP_JOIN_NEXT(sep, peek, MAP_JOIN1)(f, sep, peek, __VA_ARGS__)
-#define MAP_JOIN1(f, sep, x, peek, ...) f(x) MAP_JOIN_NEXT(sep, peek, MAP_JOIN0)(f, sep, peek, __VA_ARGS__)
-
-/**
- * Applies the function macro `f` to each of the remaining parameters.
- */
-#define MAP(f, ...) EVAL(MAP1(f, __VA_ARGS__, ()()(), ()()(), ()()(), 0))
-
-/**
- * Applies the function macro `f` to each of the remaining parameters and
- * inserts the given separator between the results.
- */
-#define MAP_JOIN(f, sep, ...) EVAL(MAP_JOIN1(f, sep, __VA_ARGS__, ()()(), ()()(), ()()(), 0))
-
-/**
- * Applies the function macro `f` to each of the remaining parameters and
- * inserts commas between the results.
- */
-#define MAP_LIST(f, ...) MAP_JOIN(f, MAP_COMMA, __VA_ARGS__)
diff --git a/plugins/overlay.cpp b/plugins/overlay.cpp
index a53232cd3..0c63e53e8 100644
--- a/plugins/overlay.cpp
+++ b/plugins/overlay.cpp
@@ -85,7 +85,6 @@
 
 #include "Debug.h"
 #include "LuaTools.h"
-#include "MiscUtils.h"
 #include "PluginManager.h"
 #include "VTableInterpose.h"
 
@@ -99,26 +98,6 @@ namespace DFHack {
     DBG_DECLARE(overlay, event, DebugCategory::LINFO);
 }
 
-#define SCREEN_LIST adopt_region, adventure_log, announcelist, \
-    assign_display_item, barter, buildinglist, building, choose_start_site, \
-    civlist, counterintelligence, createquota, customize_unit, dungeonmode, \
-    dungeon_monsterstatus, dungeon_wrestle, dwarfmode, entity, \
-    export_graphical_map, export_region, game_cleaner, image_creator, item, \
-    joblist, jobmanagement, job, justice, kitchenpref, layer_arena_creature, \
-    layer_assigntrade, layer_choose_language_name, layer_currency, \
-    layer_export_play_map, layer_military, layer_musicsound, layer_noblelist, \
-    layer_overall_health, layer_reaction, layer_squad_schedule, \
-    layer_stockpile, layer_stone_restriction, layer_unit_action, \
-    layer_unit_health, layer_unit_relationship, layer_world_gen_param_preset, \
-    layer_world_gen_param, legends, loadgame, locations, meeting, movieplayer, \
-    new_region, noble, option, overallstatus, petitions, pet, price, \
-    reportlist, requestagreement, savegame, selectitem, setupadventure, \
-    setupdwarfgame, stores, textviewer, title, \
-    topicmeeting_fill_land_holder_positions, topicmeeting, \
-    topicmeeting_takerequests, tradeagreement, tradegoods, tradelist, \
-    treasurelist, unitlist, unit, update_region, wages, workquota_condition, \
-    workquota_details, workshop_profile
-
 template<class T>
 struct viewscreen_overlay : T {
     typedef T interpose_base;
@@ -140,7 +119,86 @@ struct viewscreen_overlay : T {
     template<> IMPLEMENT_VMETHOD_INTERPOSE_PRIO(screen##_overlay, feed, 100); \
     template<> IMPLEMENT_VMETHOD_INTERPOSE_PRIO(screen##_overlay, render, 100);
 
-MAP(IMPLEMENT_HOOKS, SCREEN_LIST)
+IMPLEMENT_HOOKS(adopt_region)
+IMPLEMENT_HOOKS(adventure_log)
+IMPLEMENT_HOOKS(announcelist)
+IMPLEMENT_HOOKS(assign_display_item)
+IMPLEMENT_HOOKS(barter)
+IMPLEMENT_HOOKS(buildinglist)
+IMPLEMENT_HOOKS(building)
+IMPLEMENT_HOOKS(choose_start_site)
+IMPLEMENT_HOOKS(civlist)
+IMPLEMENT_HOOKS(counterintelligence)
+IMPLEMENT_HOOKS(createquota)
+IMPLEMENT_HOOKS(customize_unit)
+IMPLEMENT_HOOKS(dungeonmode)
+IMPLEMENT_HOOKS(dungeon_monsterstatus)
+IMPLEMENT_HOOKS(dungeon_wrestle)
+IMPLEMENT_HOOKS(dwarfmode)
+IMPLEMENT_HOOKS(entity)
+IMPLEMENT_HOOKS(export_graphical_map)
+IMPLEMENT_HOOKS(export_region)
+IMPLEMENT_HOOKS(game_cleaner)
+IMPLEMENT_HOOKS(image_creator)
+IMPLEMENT_HOOKS(item)
+IMPLEMENT_HOOKS(joblist)
+IMPLEMENT_HOOKS(jobmanagement)
+IMPLEMENT_HOOKS(job)
+IMPLEMENT_HOOKS(justice)
+IMPLEMENT_HOOKS(kitchenpref)
+IMPLEMENT_HOOKS(layer_arena_creature)
+IMPLEMENT_HOOKS(layer_assigntrade)
+IMPLEMENT_HOOKS(layer_choose_language_name)
+IMPLEMENT_HOOKS(layer_currency)
+IMPLEMENT_HOOKS(layer_export_play_map)
+IMPLEMENT_HOOKS(layer_military)
+IMPLEMENT_HOOKS(layer_musicsound)
+IMPLEMENT_HOOKS(layer_noblelist)
+IMPLEMENT_HOOKS(layer_overall_health)
+IMPLEMENT_HOOKS(layer_reaction)
+IMPLEMENT_HOOKS(layer_squad_schedule)
+IMPLEMENT_HOOKS(layer_stockpile)
+IMPLEMENT_HOOKS(layer_stone_restriction)
+IMPLEMENT_HOOKS(layer_unit_action)
+IMPLEMENT_HOOKS(layer_unit_health)
+IMPLEMENT_HOOKS(layer_unit_relationship)
+IMPLEMENT_HOOKS(layer_world_gen_param_preset)
+IMPLEMENT_HOOKS(layer_world_gen_param)
+IMPLEMENT_HOOKS(legends)
+IMPLEMENT_HOOKS(loadgame)
+IMPLEMENT_HOOKS(locations)
+IMPLEMENT_HOOKS(meeting)
+IMPLEMENT_HOOKS(movieplayer)
+IMPLEMENT_HOOKS(new_region)
+IMPLEMENT_HOOKS(noble)
+IMPLEMENT_HOOKS(option)
+IMPLEMENT_HOOKS(overallstatus)
+IMPLEMENT_HOOKS(petitions)
+IMPLEMENT_HOOKS(pet)
+IMPLEMENT_HOOKS(price)
+IMPLEMENT_HOOKS(reportlist)
+IMPLEMENT_HOOKS(requestagreement)
+IMPLEMENT_HOOKS(savegame)
+IMPLEMENT_HOOKS(selectitem)
+IMPLEMENT_HOOKS(setupadventure)
+IMPLEMENT_HOOKS(setupdwarfgame)
+IMPLEMENT_HOOKS(stores)
+IMPLEMENT_HOOKS(textviewer)
+IMPLEMENT_HOOKS(title)
+IMPLEMENT_HOOKS(topicmeeting_fill_land_holder_positions)
+IMPLEMENT_HOOKS(topicmeeting)
+IMPLEMENT_HOOKS(topicmeeting_takerequests)
+IMPLEMENT_HOOKS(tradeagreement)
+IMPLEMENT_HOOKS(tradegoods)
+IMPLEMENT_HOOKS(tradelist)
+IMPLEMENT_HOOKS(treasurelist)
+IMPLEMENT_HOOKS(unitlist)
+IMPLEMENT_HOOKS(unit)
+IMPLEMENT_HOOKS(update_region)
+IMPLEMENT_HOOKS(wages)
+IMPLEMENT_HOOKS(workquota_condition)
+IMPLEMENT_HOOKS(workquota_details)
+IMPLEMENT_HOOKS(workshop_profile)
 
 #undef IMPLEMENT_HOOKS
 
@@ -155,7 +213,86 @@ DFhackCExport command_result plugin_enable(color_ostream &, bool enable) {
 
     DEBUG(control).print("%sing interpose hooks\n", enable ? "enabl" : "disabl");
 
-    if (MAP_JOIN(INTERPOSE_HOOKS_FAILED, ||, SCREEN_LIST))
+    if (INTERPOSE_HOOKS_FAILED(adopt_region) ||
+            INTERPOSE_HOOKS_FAILED(adventure_log) ||
+            INTERPOSE_HOOKS_FAILED(announcelist) ||
+            INTERPOSE_HOOKS_FAILED(assign_display_item) ||
+            INTERPOSE_HOOKS_FAILED(barter) ||
+            INTERPOSE_HOOKS_FAILED(buildinglist) ||
+            INTERPOSE_HOOKS_FAILED(building) ||
+            INTERPOSE_HOOKS_FAILED(choose_start_site) ||
+            INTERPOSE_HOOKS_FAILED(civlist) ||
+            INTERPOSE_HOOKS_FAILED(counterintelligence) ||
+            INTERPOSE_HOOKS_FAILED(createquota) ||
+            INTERPOSE_HOOKS_FAILED(customize_unit) ||
+            INTERPOSE_HOOKS_FAILED(dungeonmode) ||
+            INTERPOSE_HOOKS_FAILED(dungeon_monsterstatus) ||
+            INTERPOSE_HOOKS_FAILED(dungeon_wrestle) ||
+            INTERPOSE_HOOKS_FAILED(dwarfmode) ||
+            INTERPOSE_HOOKS_FAILED(entity) ||
+            INTERPOSE_HOOKS_FAILED(export_graphical_map) ||
+            INTERPOSE_HOOKS_FAILED(export_region) ||
+            INTERPOSE_HOOKS_FAILED(game_cleaner) ||
+            INTERPOSE_HOOKS_FAILED(image_creator) ||
+            INTERPOSE_HOOKS_FAILED(item) ||
+            INTERPOSE_HOOKS_FAILED(joblist) ||
+            INTERPOSE_HOOKS_FAILED(jobmanagement) ||
+            INTERPOSE_HOOKS_FAILED(job) ||
+            INTERPOSE_HOOKS_FAILED(justice) ||
+            INTERPOSE_HOOKS_FAILED(kitchenpref) ||
+            INTERPOSE_HOOKS_FAILED(layer_arena_creature) ||
+            INTERPOSE_HOOKS_FAILED(layer_assigntrade) ||
+            INTERPOSE_HOOKS_FAILED(layer_choose_language_name) ||
+            INTERPOSE_HOOKS_FAILED(layer_currency) ||
+            INTERPOSE_HOOKS_FAILED(layer_export_play_map) ||
+            INTERPOSE_HOOKS_FAILED(layer_military) ||
+            INTERPOSE_HOOKS_FAILED(layer_musicsound) ||
+            INTERPOSE_HOOKS_FAILED(layer_noblelist) ||
+            INTERPOSE_HOOKS_FAILED(layer_overall_health) ||
+            INTERPOSE_HOOKS_FAILED(layer_reaction) ||
+            INTERPOSE_HOOKS_FAILED(layer_squad_schedule) ||
+            INTERPOSE_HOOKS_FAILED(layer_stockpile) ||
+            INTERPOSE_HOOKS_FAILED(layer_stone_restriction) ||
+            INTERPOSE_HOOKS_FAILED(layer_unit_action) ||
+            INTERPOSE_HOOKS_FAILED(layer_unit_health) ||
+            INTERPOSE_HOOKS_FAILED(layer_unit_relationship) ||
+            INTERPOSE_HOOKS_FAILED(layer_world_gen_param_preset) ||
+            INTERPOSE_HOOKS_FAILED(layer_world_gen_param) ||
+            INTERPOSE_HOOKS_FAILED(legends) ||
+            INTERPOSE_HOOKS_FAILED(loadgame) ||
+            INTERPOSE_HOOKS_FAILED(locations) ||
+            INTERPOSE_HOOKS_FAILED(meeting) ||
+            INTERPOSE_HOOKS_FAILED(movieplayer) ||
+            INTERPOSE_HOOKS_FAILED(new_region) ||
+            INTERPOSE_HOOKS_FAILED(noble) ||
+            INTERPOSE_HOOKS_FAILED(option) ||
+            INTERPOSE_HOOKS_FAILED(overallstatus) ||
+            INTERPOSE_HOOKS_FAILED(petitions) ||
+            INTERPOSE_HOOKS_FAILED(pet) ||
+            INTERPOSE_HOOKS_FAILED(price) ||
+            INTERPOSE_HOOKS_FAILED(reportlist) ||
+            INTERPOSE_HOOKS_FAILED(requestagreement) ||
+            INTERPOSE_HOOKS_FAILED(savegame) ||
+            INTERPOSE_HOOKS_FAILED(selectitem) ||
+            INTERPOSE_HOOKS_FAILED(setupadventure) ||
+            INTERPOSE_HOOKS_FAILED(setupdwarfgame) ||
+            INTERPOSE_HOOKS_FAILED(stores) ||
+            INTERPOSE_HOOKS_FAILED(textviewer) ||
+            INTERPOSE_HOOKS_FAILED(title) ||
+            INTERPOSE_HOOKS_FAILED(topicmeeting_fill_land_holder_positions) ||
+            INTERPOSE_HOOKS_FAILED(topicmeeting) ||
+            INTERPOSE_HOOKS_FAILED(topicmeeting_takerequests) ||
+            INTERPOSE_HOOKS_FAILED(tradeagreement) ||
+            INTERPOSE_HOOKS_FAILED(tradegoods) ||
+            INTERPOSE_HOOKS_FAILED(tradelist) ||
+            INTERPOSE_HOOKS_FAILED(treasurelist) ||
+            INTERPOSE_HOOKS_FAILED(unitlist) ||
+            INTERPOSE_HOOKS_FAILED(unit) ||
+            INTERPOSE_HOOKS_FAILED(update_region) ||
+            INTERPOSE_HOOKS_FAILED(wages) ||
+            INTERPOSE_HOOKS_FAILED(workquota_condition) ||
+            INTERPOSE_HOOKS_FAILED(workquota_details) ||
+            INTERPOSE_HOOKS_FAILED(workshop_profile))
         return CR_FAILURE;
 
     is_enabled = enable;

From d95a5ac2383f5d41867dc94cdeaaf8f4e13cd994 Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Wed, 9 Nov 2022 11:55:29 -0800
Subject: [PATCH 846/854] add string_to_int to MiscUtils.h

---
 docs/changelog.txt          |  2 +-
 library/include/MiscUtils.h | 12 ++++++++++--
 plugins/autochop.cpp        | 12 ------------
 3 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/docs/changelog.txt b/docs/changelog.txt
index b90248c91..980301c27 100644
--- a/docs/changelog.txt
+++ b/docs/changelog.txt
@@ -73,7 +73,7 @@ changelog.txt uses a syntax similar to RST, with a few special sequences:
 - ``Lua::PushInterfaceKeys()``: transforms viewscreen ``feed()`` keys into something that can be interpreted by lua-based widgets
 - ``Lua::Push()``: now handles maps with otherwise supported keys and values
 - Constructions module: added ``insert()`` to insert constructions into the game's sorted list.
-- MiscUtils: moved the following string transformation functions from ``uicommon.h``: ``int_to_string``, ``ltrim``, ``rtrim``, and ``trim``
+- MiscUtils: moved the following string transformation functions from ``uicommon.h``: ``int_to_string``, ``ltrim``, ``rtrim``, and ``trim``; added ``string_to_int``
 
 ## Lua
 - ``widgets.Scrollbar``: new scrollbar widget that can be paired with an associated scrollable widget. Integrated with ``widgets.Label`` and ``widgets.List``.
diff --git a/library/include/MiscUtils.h b/library/include/MiscUtils.h
index b361bdbdb..d089640ef 100644
--- a/library/include/MiscUtils.h
+++ b/library/include/MiscUtils.h
@@ -387,13 +387,21 @@ DFHACK_EXPORT std::string toUpper(const std::string &str);
 DFHACK_EXPORT std::string toLower(const std::string &str);
 DFHACK_EXPORT std::string to_search_normalized(const std::string &str);
 
-static inline std::string int_to_string(const int n)
-{
+static inline std::string int_to_string(const int n) {
     std::ostringstream ss;
     ss << n;
     return ss.str();
 }
 
+static inline int string_to_int(const std::string s, int default_ = 0) {
+    try {
+        return std::stoi(s);
+    }
+    catch (std::exception&) {
+        return default_;
+    }
+}
+
 // trim from start
 static inline std::string &ltrim(std::string &s) {
     s.erase(s.begin(), std::find_if(s.begin(), s.end(), [](char x){ return !std::isspace(x); }));
diff --git a/plugins/autochop.cpp b/plugins/autochop.cpp
index 82c40934c..acb8959b9 100644
--- a/plugins/autochop.cpp
+++ b/plugins/autochop.cpp
@@ -185,18 +185,6 @@ private:
 
 static WatchedBurrows watchedBurrows;
 
-static int string_to_int(string s, int default_ = 0)
-{
-    try
-    {
-        return std::stoi(s);
-    }
-    catch (std::exception&)
-    {
-        return default_;
-    }
-}
-
 static void save_config()
 {
     config_autochop.val() = watchedBurrows.getSerialisedIds();

From 0344595e4e509989a1b27cbd92f6bcd71f1bd5ea Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Wed, 9 Nov 2022 14:32:09 -0800
Subject: [PATCH 847/854] add "anywhere" keybinding guard

---
 docs/changelog.txt              | 1 +
 library/include/PluginManager.h | 1 +
 library/modules/Gui.cpp         | 4 ++++
 3 files changed, 6 insertions(+)

diff --git a/docs/changelog.txt b/docs/changelog.txt
index b90248c91..c2811c7a9 100644
--- a/docs/changelog.txt
+++ b/docs/changelog.txt
@@ -70,6 +70,7 @@ changelog.txt uses a syntax similar to RST, with a few special sequences:
 - `spectate`: improved documentation of features and functionality
 
 ## API
+- ``Gui::anywhere_hotkey``: for plugin commands bound to keybindings that can be invoked on any screen
 - ``Lua::PushInterfaceKeys()``: transforms viewscreen ``feed()`` keys into something that can be interpreted by lua-based widgets
 - ``Lua::Push()``: now handles maps with otherwise supported keys and values
 - Constructions module: added ``insert()`` to insert constructions into the game's sorted list.
diff --git a/library/include/PluginManager.h b/library/include/PluginManager.h
index 79b7e0492..6bef8a74c 100644
--- a/library/include/PluginManager.h
+++ b/library/include/PluginManager.h
@@ -301,6 +301,7 @@ namespace DFHack
     {
         // Predefined hotkey guards
         DFHACK_EXPORT bool default_hotkey(df::viewscreen *);
+        DFHACK_EXPORT bool anywhere_hotkey(df::viewscreen *);
         DFHACK_EXPORT bool dwarfmode_hotkey(df::viewscreen *);
         DFHACK_EXPORT bool cursor_hotkey(df::viewscreen *);
     }
diff --git a/library/modules/Gui.cpp b/library/modules/Gui.cpp
index 56aa09b7f..7f2097f43 100644
--- a/library/modules/Gui.cpp
+++ b/library/modules/Gui.cpp
@@ -630,6 +630,10 @@ bool Gui::default_hotkey(df::viewscreen *top)
     return false;
 }
 
+bool Gui::anywhere_hotkey(df::viewscreen *) {
+    return true;
+}
+
 bool Gui::dwarfmode_hotkey(df::viewscreen *top)
 {
     // Require the main dwarf mode screen

From 8cd9c88981fa06bf77759fbbf4fd97171cdbc713 Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Wed, 9 Nov 2022 14:34:39 -0800
Subject: [PATCH 848/854] use new standard "anywhere" hotkey in Gui

---
 plugins/command-prompt.cpp | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/plugins/command-prompt.cpp b/plugins/command-prompt.cpp
index 94398837a..433b8fba3 100644
--- a/plugins/command-prompt.cpp
+++ b/plugins/command-prompt.cpp
@@ -337,17 +337,14 @@ command_result show_prompt(color_ostream &out, std::vector <std::string> & param
     Screen::show(dts::make_unique<viewscreen_commandpromptst>(params), plugin_self);
     return CR_OK;
 }
-bool hotkey_allow_all(df::viewscreen *top)
-{
-    return true;
-}
+
 DFhackCExport command_result plugin_init(color_ostream &out, std::vector <PluginCommand> &commands)
 {
     commands.push_back(PluginCommand(
                 "command-prompt",
                 "Allows you to run a DFHack command from in-game.",
                 show_prompt,
-                hotkey_allow_all));
+                Gui::anywhere_hotkey));
     return CR_OK;
 }
 

From f3ae19391420586ffa242ea3fb7955fae786b08c Mon Sep 17 00:00:00 2001
From: Josh Cooper <cppcooper@users.noreply.github.com>
Date: Wed, 9 Nov 2022 16:49:35 -0800
Subject: [PATCH 849/854] Update EventManager.cpp

---
 library/modules/EventManager.cpp | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/library/modules/EventManager.cpp b/library/modules/EventManager.cpp
index eb41bbeaf..16f21ffdd 100644
--- a/library/modules/EventManager.cpp
+++ b/library/modules/EventManager.cpp
@@ -446,13 +446,11 @@ static void manageJobStartedEvent(color_ostream& out) {
     multimap<Plugin*, EventHandler> copy(handlers[EventType::JOB_STARTED].begin(), handlers[EventType::JOB_STARTED].end());
     for (df::job_list_link* link = df::global::world->jobs.list.next; link != nullptr; link = link->next) {
         df::job* job = link->item;
-        bool send = false;
-        for (auto &key_value : copy) {
-            auto &handler = key_value.second;
-            // the jobs must have a worker to start
-            if (send || (job && Job::getWorker(job) && !startedJobs.count(job->id))) {
-                send = true;
-                startedJobs.emplace(job->id);
+        if (job && Job::getWorker(job) && !startedJobs.count(job->id)) {
+            startedJobs.emplace(job->id);
+            for (auto &key_value : copy) {
+                auto &handler = key_value.second;
+                // the jobs must have a worker to start
                 handler.eventHandler(out, job);
             }
         }

From 4d97c90f5370ce573f37b92df670a5033301bb3c Mon Sep 17 00:00:00 2001
From: DFHack-Urist via GitHub Actions
 <63161697+DFHack-Urist@users.noreply.github.com>
Date: Thu, 10 Nov 2022 07:18:00 +0000
Subject: [PATCH 850/854] Auto-update submodules

library/xml: master
scripts: master
---
 library/xml | 2 +-
 scripts     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/library/xml b/library/xml
index f2b59b8d5..ea78ed8bf 160000
--- a/library/xml
+++ b/library/xml
@@ -1 +1 @@
-Subproject commit f2b59b8d5036cca90a88245d0d7c8b2a713f60ee
+Subproject commit ea78ed8bf70c3e75b8fba90cdc61cab34788899e
diff --git a/scripts b/scripts
index e59407f7c..561b27bad 160000
--- a/scripts
+++ b/scripts
@@ -1 +1 @@
-Subproject commit e59407f7cf885ba4276d0f23c0c162c9173f8fbb
+Subproject commit 561b27bad118d49c2cea61bf2a65d4c2e56372cf

From c0f9488b61ece3ea6fe1b7b28713bbfcb1cec627 Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Thu, 10 Nov 2022 10:48:04 -0800
Subject: [PATCH 851/854] fix double "0x" when printing address in probe

---
 plugins/probe.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/probe.cpp b/plugins/probe.cpp
index b9b98ee75..0eeaced28 100644
--- a/plugins/probe.cpp
+++ b/plugins/probe.cpp
@@ -185,7 +185,7 @@ command_result df_probe (color_ostream &out, vector <string> & parameters)
     }
 
     auto &block = *b->getRaw();
-    out.print("block addr: 0x%p\n\n", &block);
+    out.print("block addr: %p\n\n", &block);
 /*
     if (showBlock)
     {

From 2d406269120b0034d498d0c0e473ad42e27844bc Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Thu, 10 Nov 2022 16:02:28 -0500
Subject: [PATCH 852/854] Change other instances of "0x%p" to "%p"

Followup to c0f9488b61ece3ea6fe1b7b28713bbfcb1cec627
---
 plugins/cleanowned.cpp | 2 +-
 plugins/probe.cpp      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/cleanowned.cpp b/plugins/cleanowned.cpp
index c1e5b31d4..387dfdd92 100644
--- a/plugins/cleanowned.cpp
+++ b/plugins/cleanowned.cpp
@@ -147,7 +147,7 @@ command_result df_cleanowned (color_ostream &out, vector <string> & parameters)
             std::string description;
             item->getItemDescription(&description, 0);
             out.print(
-                "0x%p %s (wear %d)",
+                "%p %s (wear %d)",
                 item,
                 description.c_str(),
                 item->getWear()
diff --git a/plugins/probe.cpp b/plugins/probe.cpp
index 0eeaced28..7781812b9 100644
--- a/plugins/probe.cpp
+++ b/plugins/probe.cpp
@@ -334,7 +334,7 @@ command_result df_probe (color_ostream &out, vector <string> & parameters)
         out.print("%-16s", "");
         out.print("  %4d", block.local_feature);
         out.print(" (%2d)", local.type);
-        out.print(" addr 0x%p ", local.origin);
+        out.print(" addr %p ", local.origin);
         out.print(" %s\n", sa_feature(local.type));
     }
     PRINT_FLAG( des, feature_global );

From 6c817889c8243f3483cb2451c082f36eaae08fd7 Mon Sep 17 00:00:00 2001
From: DFHack-Urist via GitHub Actions
 <63161697+DFHack-Urist@users.noreply.github.com>
Date: Fri, 11 Nov 2022 07:18:19 +0000
Subject: [PATCH 853/854] Auto-update submodules

scripts: master
---
 scripts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts b/scripts
index 561b27bad..020f2466b 160000
--- a/scripts
+++ b/scripts
@@ -1 +1 @@
-Subproject commit 561b27bad118d49c2cea61bf2a65d4c2e56372cf
+Subproject commit 020f2466bc4462e59c1c16c036881907cad9718e

From 5b1ebdf72ac6f1af7342efe19c3216b36ef21cd0 Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Fri, 11 Nov 2022 10:40:10 -0800
Subject: [PATCH 854/854] don't return list idx when mouse is on scrollbar

---
 library/lua/gui/widgets.lua | 1 +
 1 file changed, 1 insertion(+)

diff --git a/library/lua/gui/widgets.lua b/library/lua/gui/widgets.lua
index 8485529b4..2fab12f70 100644
--- a/library/lua/gui/widgets.lua
+++ b/library/lua/gui/widgets.lua
@@ -1244,6 +1244,7 @@ function List:onRenderBody(dc)
 end
 
 function List:getIdxUnderMouse()
+    if self.scrollbar:getMousePos() then return end
     local _,mouse_y = self:getMousePos()
     if mouse_y and #self.choices > 0 and
             mouse_y < (#self.choices-self.page_top+1) * self.row_height then