From 90fe6e7ae34132a8aa1670ae6d0cb7189a1cfd6c Mon Sep 17 00:00:00 2001
From: Taxi Service <serviceoftaxi@gmail.com>
Date: Thu, 18 May 2023 11:30:21 +0200
Subject: [PATCH] swapped any instance of 'border' being after 'xyz',
 everywhere

---
 docs/dev/Lua API.rst              | 16 ++++++++--------
 library/LuaApi.cpp                | 10 +++++-----
 plugins/lua/buildingplan/pens.lua |  4 ++--
 3 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/docs/dev/Lua API.rst b/docs/dev/Lua API.rst
index 1d70647f7..6fb2aca2c 100644
--- a/docs/dev/Lua API.rst	
+++ b/docs/dev/Lua API.rst	
@@ -4347,32 +4347,32 @@ A framed screen has the following attributes:
 
 There are the following predefined frame style tables:
 
-* ``WINDOW_FRAME``
+* ``FRAME_WINDOW``
 
   A frame suitable for a draggable, optionally resizable window.
 
-* ``PANEL_FRAME``
+* ``FRAME_PANEL``
 
   A frame suitable for a static (non-draggable, non-resizable) panel.
 
-* ``MEDIUM_FRAME``
+* ``FRAME_MEDIUM``
 
   A frame suitable for overlay widget panels.
 
-* ``BOLD_FRAME``
+* ``FRAME_BOLD``
 
   A frame suitable for a non-draggable panel meant to capture the user's focus,
   like an important notification, confirmation dialog or error message.
 
-* ``INTERIOR_FRAME``
+* ``FRAME_INTERIOR``
 
   A frame suitable for light interior accent elements. This frame does *not*
   have a visible ``DFHack`` signature on it, so it must not be used as the most
   external frame for a DFHack-owned UI.
 
-* ``INTERIOR_MEDIUM_FRAME``
+* ``FRAME_INTERIOR_MEDIUM``
 
-  A copy of ``MEDIUM_FRAME`` that lacks the ``DFHack`` signature. Suitable for
+  A copy of ``FRAME_MEDIUM`` that lacks the ``DFHack`` signature. Suitable for
   panels that are part of a larger widget cluster. Must *not* be used as the
   most external frame for a DFHack-owned UI.
 
@@ -4509,7 +4509,7 @@ Has attributes:
   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``.
+  ``gui.``, e.g. ``gui.FRAME_GREY_LINE``.
 
 Has functions:
 
diff --git a/library/LuaApi.cpp b/library/LuaApi.cpp
index 08903c7bd..d21ce29e5 100644
--- a/library/LuaApi.cpp
+++ b/library/LuaApi.cpp
@@ -1716,11 +1716,11 @@ static const LuaWrapper::FunctionReg dfhack_textures_module[] = {
     WRAPM(Textures, getIconsTexposStart),
     WRAPM(Textures, getOnOffTexposStart),
     WRAPM(Textures, getControlPanelTexposStart),
-    WRAPM(Textures, getThinBordersTexposStart),
-    WRAPM(Textures, getMediumBordersTexposStart),
-    WRAPM(Textures, getBoldBordersTexposStart),
-    WRAPM(Textures, getPanelBordersTexposStart),
-    WRAPM(Textures, getWindowBordersTexposStart),
+    WRAPM(Textures, getBorderThinTexposStart),
+    WRAPM(Textures, getBorderMediumTexposStart),
+    WRAPM(Textures, getBorderBoldTexposStart),
+    WRAPM(Textures, getBorderPanelTexposStart),
+    WRAPM(Textures, getBorderWindowTexposStart),
     { NULL, NULL }
 };
 
diff --git a/plugins/lua/buildingplan/pens.lua b/plugins/lua/buildingplan/pens.lua
index e69a4c210..c68e12eae 100644
--- a/plugins/lua/buildingplan/pens.lua
+++ b/plugins/lua/buildingplan/pens.lua
@@ -18,12 +18,12 @@ function reload_pens()
     GOOD_TILE_PEN = to_pen{ch='o', fg=COLOR_GREEN, tile=dfhack.screen.findGraphicsTile('CURSORS', 1, 2)}
     BAD_TILE_PEN = to_pen{ch='X', fg=COLOR_RED, tile=dfhack.screen.findGraphicsTile('CURSORS', 3, 0)}
 
-    local tb_texpos = dfhack.textures.getThinBordersTexposStart()
+    local tb_texpos = dfhack.textures.getBorderThinTexposStart()
     VERT_TOP_PEN = to_pen{tile=tp(tb_texpos, 10), ch=194, fg=COLOR_GREY, bg=COLOR_BLACK}
     VERT_MID_PEN = to_pen{tile=tp(tb_texpos, 4), ch=179, fg=COLOR_GREY, bg=COLOR_BLACK}
     VERT_BOT_PEN = to_pen{tile=tp(tb_texpos, 11), ch=193, fg=COLOR_GREY, bg=COLOR_BLACK}
 
-    local mb_texpos = dfhack.textures.getMediumBordersTexposStart()
+    local mb_texpos = dfhack.textures.getBorderMediumTexposStart()
     HORI_LEFT_PEN = to_pen{tile=tp(mb_texpos, 12), ch=195, fg=COLOR_GREY, bg=COLOR_BLACK}
     HORI_MID_PEN = to_pen{tile=tp(mb_texpos, 5), ch=196, fg=COLOR_GREY, bg=COLOR_BLACK}
     HORI_RIGHT_PEN = to_pen{tile=tp(mb_texpos, 13), ch=180, fg=COLOR_GREY, bg=COLOR_BLACK}