From d2472335fce9fb431f5ea2dc3859776116176b76 Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Thu, 12 Nov 2020 23:20:53 -0800
Subject: [PATCH] add names for quantums and zones

---
 data/quickfort/aliases-common.txt   | 15 +++++++++++++--
 dfhack-config/quickfort/aliases.txt | 12 ++++++------
 2 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/data/quickfort/aliases-common.txt b/data/quickfort/aliases-common.txt
index 59705f9f7..e4d2ef1cd 100644
--- a/data/quickfort/aliases-common.txt
+++ b/data/quickfort/aliases-common.txt
@@ -37,7 +37,8 @@ give10down: {give move={Down 10}}
 give10left: {give move={Left 10}}
 give10right: {give move={Right 10}}
 
-# usage example: {givename name="myname"}
+# Keep in mind that building, stockpile, and zone names have a maximum length
+# of 20 characters. usage example: {givename name="myname"}
 givename: {Ctrl}n{name}&
 
 # use to toggle a sequence of stockpile options. for example: {togglesequence 5}
@@ -49,7 +50,9 @@ enablesequence: e{Down}
 # clothes and armor in this quantum stockpile will rot away. If you want bones
 # in your quantum stockpile, apply this alias to a refuse stockpile (but don't
 # put useful clothes or armor in there!)
-quantum: {linksonly}{nocontainers}{enableanimals}{enablefood}{enablefurniture}{enablestone}{enableammo}{enablecoins}{enablebars}{enablegems}{enablefinishedgoods}{enableleather}{enablecloth}{enablewood}{enableweapons}{enablearmor}{enablesheet}
+# Optionally set a name for the stockpile by specifying the 'name' parameter,
+# for example: {quantum name="my name"}
+quantum: {linksonly}{nocontainers}{enableanimals}{enablefood}{enablefurniture}{enablestone}{enableammo}{enablecoins}{enablebars}{enablegems}{enablefinishedgoods}{enableleather}{enablecloth}{enablewood}{enableweapons}{enablearmor}{enablesheet}{givename}
 
 
 ##################################
@@ -84,6 +87,14 @@ quantumstopfromwest: {quantumstopprefix}s{Left}p^{Right}{quantumstopsuffix}
 quantumstopfromnorth: {quantumstopprefix}s{Up}p^{Down}{quantumstopsuffix}
 
 
+##################################
+# zone aliases
+##################################
+
+# usage example: {namezone name="my zone name"}
+namezone: ^i{givename}^q
+
+
 ##################################
 # animal stockpile adjustments
 ##################################
diff --git a/dfhack-config/quickfort/aliases.txt b/dfhack-config/quickfort/aliases.txt
index 9be32107e..1d1ebff9f 100644
--- a/dfhack-config/quickfort/aliases.txt
+++ b/dfhack-config/quickfort/aliases.txt
@@ -58,12 +58,12 @@
 # The syntax for defining aliases is:
 #   aliasname: keystrokes
 #
-# Where aliasname is at least two letters or digits long and keystrokes are
-# whatever you would type into the DF UI. A keystroke can also be a named
-# keycode from the DF interface definition file (data/init/interface.txt),
-# enclosed in curly brackets like an alias, like: "{Right}" or "{Enter}". In
-# order to avoid naming conflicts between aliases and keycodes, the convention
-# is to start aliases with a lowercase letter.
+# Where aliasname is at least two letters or digits long (including dashes and
+# underscores) and keystrokes are whatever you would type into the DF UI. A
+# keystroke can also be a named keycode from the DF interface definition file
+# (data/init/interface.txt), enclosed in curly brackets like an alias, like:
+# "{Right}" or "{Enter}". In # order to avoid naming conflicts between aliases
+# and keycodes, the convention is to start aliases with a lowercase letter.
 #
 # Anything enclosed within curly brackets can also have a number after it,
 # indicating how many times that alias or keycode should be repeated. For