Merge remote-tracking branch 'lethsor/master' into remote_reader

CMakeLists.txt

@@ -135,9 +135,9 @@ if (NOT EXISTS ${dfhack_SOURCE_DIR}/library/xml/codegen.pl OR NOT EXISTS ${dfhac
 endif()
 
 # set up versioning.
-set(DF_VERSION "0.44.07")
-set(DFHACK_RELEASE "alpha1")
-set(DFHACK_PRERELEASE TRUE)
+set(DF_VERSION "0.44.09")
+set(DFHACK_RELEASE "r1")
+set(DFHACK_PRERELEASE FALSE)
 
 set(DFHACK_VERSION "${DF_VERSION}-${DFHACK_RELEASE}")
 
@@ -259,21 +259,55 @@ if(APPLE)
   # libstdc++ (GCC 4.8.5 for OS X 10.6)
   # fixes crash-on-unwind bug in DF's libstdc++
   set(LIBSTDCXX_DOWNLOAD_DIR ${CMAKE_SOURCE_DIR}/package/darwin/osx${DFHACK_BUILD_ARCH})
-  if(${DFHACK_BUILD_ARCH} STREQUAL "64")
-    download_file_unzip("https://github.com/DFHack/dfhack-bin/releases/download/0.43.05/osx64-libstdcxx.6.dylib.gz"
-      "gz"
-      ${LIBSTDCXX_DOWNLOAD_DIR}/libstdc++.6.dylib.gz
-      "cf26ed588be8e83c8e3a49919793b416"
-      ${LIBSTDCXX_DOWNLOAD_DIR}/libstdc++.6.dylib
-      "16dc6dbd4ecde7f9b95bb6dc91f07404")
+
+  if(${GCC_VERSION_OUT} VERSION_LESS "4.9")
+    set(LIBSTDCXX_GCC_VER "48")
   else()
-    download_file_unzip("https://github.com/DFHack/dfhack-bin/releases/download/0.43.05/osx32-libstdcxx.6.dylib.gz"
-      "gz"
-      ${LIBSTDCXX_DOWNLOAD_DIR}/libstdc++.6.dylib.gz
-      "40f3d83871b114f0279240626311621b"
-      ${LIBSTDCXX_DOWNLOAD_DIR}/libstdc++.6.dylib
-      "c3f5678b8204917e03870834902c3e8b")
+    set(LIBSTDCXX_GCC_VER "7")
+    set(LIBSTDCXX_DOWNLOAD_DIR "${LIBSTDCXX_DOWNLOAD_DIR}-gcc7")
+  endif()
+
+  if(${DFHACK_BUILD_ARCH} STREQUAL "64")
+    if(${LIBSTDCXX_GCC_VER} STREQUAL "48")
+      download_file_unzip("https://github.com/DFHack/dfhack-bin/releases/download/0.43.05/osx64-gcc48-libstdcxx.6.dylib.gz"
+        "gz"
+        ${LIBSTDCXX_DOWNLOAD_DIR}/libstdc++.6.dylib.gz
+        "cf26ed588be8e83c8e3a49919793b416"
+        ${LIBSTDCXX_DOWNLOAD_DIR}/libstdc++.6.dylib
+        "16dc6dbd4ecde7f9b95bb6dc91f07404")
+    else()
+      # GCC 7
+      download_file_unzip("https://github.com/DFHack/dfhack-bin/releases/download/0.43.05/osx64-gcc7-libstdcxx.6.dylib.gz"
+        "gz"
+        ${LIBSTDCXX_DOWNLOAD_DIR}/libstdc++.6.dylib.gz
+        "81314b7846f9e8806409bef2160c76e6"
+        ${LIBSTDCXX_DOWNLOAD_DIR}/libstdc++.6.dylib
+        "93b6cf4b01e9a9084a508fd6a4a88992")
+    endif()
+
+  else() # 32-bit
+
+    if(${LIBSTDCXX_GCC_VER} STREQUAL "48")
+      download_file_unzip("https://github.com/DFHack/dfhack-bin/releases/download/0.43.05/osx32-gcc48-libstdcxx.6.dylib.gz"
+        "gz"
+        ${LIBSTDCXX_DOWNLOAD_DIR}/libstdc++.6.dylib.gz
+        "40f3d83871b114f0279240626311621b"
+        ${LIBSTDCXX_DOWNLOAD_DIR}/libstdc++.6.dylib
+        "c3f5678b8204917e03870834902c3e8b")
+    else()
+      # GCC 7
+      download_file_unzip("https://github.com/DFHack/dfhack-bin/releases/download/0.43.05/osx32-gcc7-libstdcxx.6.dylib.gz"
+        "gz"
+        ${LIBSTDCXX_DOWNLOAD_DIR}/libstdc++.6.dylib.gz
+        "dbd213171f66edb90d204d525f10c969"
+        ${LIBSTDCXX_DOWNLOAD_DIR}/libstdc++.6.dylib
+        "b14c857e7e485a097c70a9ccd3132da7")
+    endif()
   endif()
+
+  install(PROGRAMS ${LIBSTDCXX_DOWNLOAD_DIR}/libstdc++.6.dylib
+    DESTINATION ./hack/)
+
 endif()
 
 #### expose depends ####
@@ -331,7 +365,7 @@ endif()
 # build the lib itself
 IF(BUILD_LIBRARY)
     add_subdirectory (library)
-    install(FILES LICENSE.rst NEWS.rst DESTINATION ${DFHACK_USERDOC_DESTINATION})
+    install(FILES LICENSE.rst docs/changelog.txt DESTINATION ${DFHACK_USERDOC_DESTINATION})
 endif()
 
 file(WRITE "${CMAKE_BINARY_DIR}/dfhack_setarch.txt" ${DFHACK_SETARCH})
@@ -354,6 +388,8 @@ if (BUILD_DOCS)
 
   file(GLOB SPHINX_DEPS
     "${CMAKE_CURRENT_SOURCE_DIR}/docs/*.rst"
+    "${CMAKE_CURRENT_SOURCE_DIR}/docs/changelog.txt"
+    "${CMAKE_CURRENT_SOURCE_DIR}/docs/gen_changelog.py"
     "${CMAKE_CURRENT_SOURCE_DIR}/docs/images/*.png"
     "${CMAKE_CURRENT_SOURCE_DIR}/docs/styles/*"
     "${CMAKE_CURRENT_SOURCE_DIR}/conf.py"
@@ -366,7 +402,6 @@ if (BUILD_DOCS)
   )
   set(SPHINX_DEPS ${SPHINX_DEPS} ${SPHINX_SCRIPT_DEPS}
     "${CMAKE_CURRENT_SOURCE_DIR}/LICENSE.rst"
-    "${CMAKE_CURRENT_SOURCE_DIR}/NEWS.rst"
     "${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt"
   )
 
@@ -394,6 +429,7 @@ if (BUILD_DOCS)
   install(DIRECTORY ${dfhack_SOURCE_DIR}/docs/html/
       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()
 

Contributing.rst

@@ -32,7 +32,8 @@ How to get new code into DFHack
   (i.e. not the master or develop branch of your fork).
 * If possible, compile on multiple platforms when changing anything that compiles
 * It must pass CI - run ``python travis/all.py`` to check this.
-* Update ``NEWS.rst`` and ``docs/Authors.rst`` when applicable.
+* Update ``changelog.txt`` and ``docs/Authors.rst`` when applicable. See
+  `build-changelog` for more information on the changelog format.
 * Create a GitHub pull request once finished
 * Submit ideas and bug reports as :issue:`issues on GitHub <>`.
   Posts in the forum thread can easily get missed or forgotten.

conf.py

@@ -21,6 +21,8 @@ import re
 import shlex  # pylint:disable=unused-import
 import sys
 
+sys.path.append(os.path.join(os.path.abspath(os.path.dirname(__file__)), 'docs'))
+from gen_changelog import generate_changelog
 
 # -- Support :dfhack-keybind:`command` ------------------------------------
 # this is a custom directive that pulls info from dfhack.init-example
@@ -143,8 +145,6 @@ def write_script_docs():
     magic strings.
     """
     kinds = document_scripts()
-    if not os.path.isdir('docs/_auto'):
-        os.mkdir('docs/_auto')
     head = {
         'base': 'Basic Scripts',
         'devel': 'Development Scripts',
@@ -179,6 +179,7 @@ def all_keybinds_documented():
 
 
 # Actually call the docs generator and run test
+generate_changelog()
 write_script_docs()
 all_keybinds_documented()
 
@@ -264,6 +265,7 @@ exclude_patterns = [
     'docs/html*',
     'depends/*',
     'build*',
+    'docs/_auto/news*',
     ]
 
 # The reST default role (used for this markup: `text`) to use for all

docs/Authors.rst

@@ -123,6 +123,7 @@ stolencatkarma
 sv-esk                  sv-esk
 Tacomagic
 TheHologram             TheHologram
+ThiagoLira              ThiagoLira
 Tim Walberg             twalberg
 Timothy Collett         danaris
 Tom Jobbins             TheBloke

docs/Compile.rst

@@ -217,14 +217,14 @@ DFHack functions similarly on OS X and Linux, and the majority of the
 information above regarding the build process (cmake and make) applies here
 as well.
 
-DFHack can officially be built on OS X with GCC 4.8. Anything newer than 4.8
+DFHack can officially be built on OS X with GCC 4.8 or 7. Anything newer than 7
 will require you to perform extra steps to get DFHack to run (see `osx-new-gcc-notes`),
 and your build will likely not be redistributable.
 
 .. _osx-new-gcc-notes:
 
-Notes for GCC 4.9+ or OS X 10.10+ users
----------------------------------------
+Notes for GCC 8+ or OS X 10.10+ users
+-------------------------------------
 
 If none of these situations apply to you, skip to `osx-setup`.
 
@@ -233,7 +233,7 @@ the following environment variable::
 
     export MACOSX_DEPLOYMENT_TARGET=10.9
 
-If you build with a GCC version newer than 4.8, DFHack will probably crash
+If you build with a GCC version newer than 7, DFHack will probably crash
 immediately on startup, or soon after. To fix this, you will need to replace
 ``hack/libstdc++.6.dylib`` with a symlink to the ``libstdc++.6.dylib`` included
 in your version of GCC::
@@ -241,16 +241,16 @@ in your version of GCC::
   cd <path to df>/hack && mv libstdc++.6.dylib libstdc++.6.dylib.orig &&
   ln -s [PATH_TO_LIBSTDC++] .
 
-For example, with GCC 5.2.0, ``PATH_TO_LIBSTDC++`` would be::
+For example, with GCC 6.3.0, ``PATH_TO_LIBSTDC++`` would be::
 
-  /usr/local/Cellar/gcc5/5.2.0/lib/gcc/5/libstdc++.6.dylib  # for 64-bit DFHack
-  /usr/local/Cellar/gcc5/5.2.0/lib/gcc/5/i386/libstdc++.6.dylib  # for 32-bit DFHack
+  /usr/local/Cellar/gcc@6/6.3.0/lib/gcc/6/libstdc++.6.dylib  # for 64-bit DFHack
+  /usr/local/Cellar/gcc@6/6.3.0/lib/gcc/6/i386/libstdc++.6.dylib  # for 32-bit DFHack
 
 **Note:** If you build with a version of GCC that requires this, your DFHack
 build will *not* be redistributable. (Even if you copy the ``libstdc++.6.dylib``
 from your GCC version and distribute that too, it will fail on older OS X
 versions.) For this reason, if you plan on distributing DFHack, it is highly
-recommended to use GCC 4.8.
+recommended to use GCC 4.8 or 7.
 
 .. _osx-setup:
 
@@ -277,11 +277,11 @@ Dependencies and system set-up
         brew tap homebrew/versions
         brew install git
         brew install cmake
-        brew install gcc@4.8
+        brew install gcc@7
 
     Using `MacPorts <https://www.macports.org>`_::
 
-        sudo port install gcc48 +universal cmake +universal git-core +universal
+        sudo port install gcc7 +universal cmake +universal git-core +universal
 
     Macports will take some time - maybe hours.  At some point it may ask
     you to install a Java environment; let it do so.
@@ -323,16 +323,23 @@ Building
 
   Homebrew (if installed elsewhere, replace /usr/local with ``$(brew --prefix)``)::
 
-    export CC=/usr/local/bin/gcc-4.8
-    export CXX=/usr/local/bin/g++-4.8
+    export CC=/usr/local/bin/gcc-7
+    export CXX=/usr/local/bin/g++-7
 
   Macports::
 
-    export CC=/opt/local/bin/gcc-mp-4.8
-    export CXX=/opt/local/bin/g++-mp-4.8
+    export CC=/opt/local/bin/gcc-mp-7
+    export CXX=/opt/local/bin/g++-mp-7
 
   Change the version numbers appropriately if you installed a different version of GCC.
 
+  If you are confident that you have GCC in your path, you can omit the absolute paths::
+
+    export CC=gcc-7
+    export CXX=g++-7
+
+  etc.
+
 * Build dfhack::
 
     mkdir build-osx
@@ -666,6 +673,20 @@ Then close that Admin ``cmd.exe``, re-open another Admin ``cmd.exe``, and run::
 
   pip install sphinx
 
+.. _build-changelog:
+
+Building the changelogs
+-----------------------
+If you have Python installed, but do not want to build all of the documentation,
+you can build the changelogs with the ``docs/gen_changelog.py`` script.
+
+All changes should be listed in ``changelog.txt``. A description of this file's
+format follows:
+
+.. include:: /docs/changelog.txt
+   :start-after: ===help
+   :end-before: ===end
+
 Misc. Notes
 ===========
 

docs/NEWS-dev.rst

@@ -1,32 +1,6 @@
 .. comment
-    This is the development changelog file for DFHack.  If you add or change
-    anything, note it here under the heading "DFHack Future", in the appropriate
-    section. Items within each section are listed in alphabetical order to
-    minimise merge conflicts.  Try to match the style and level of detail of the
-    other entries.
-
-    This file contains changes that are relevant to users of prereleases. These
-    changes should include changes from just the previous release, whether that
-    release was stable or not. For instance, a feature added in 0.43.05-alpha1
-    should go under "0.43.05-alpha1" here *and* "0.43.05-r1" (or "future") in
-    NEWS.rst. A fix in one prerelease for an issue in the previous prerelease
-    should just go here in the appropriate section, not in NEWS.rst.
-
-    Sections for each release are added as required, and consist solely of the
-    following in order as subheadings::
-
-        Fixes
-        Structures
-        API Changes
-        Additions/Removals
-        Other Changes
-
-    When referring to a script, plugin, or command, use backticks (```) to
-    create a link to the relevant documentation - and check that the docs are
-    still up to date!
-
-    When adding a new release, change "DFHack future" to the appropriate title
-    before releasing, and then add a new "DFHack future" section after releasing.
+    This is the changelog for development releases. Entries are included from
+    changelog.txt.
 
 .. _dev-changelog:
 
@@ -34,346 +8,12 @@
 Development Changelog
 #####################
 
-.. contents::
-   :depth: 2
-
-DFHack 0.44.07-alpha1
-=====================
-
-Fixes
------
-- `embark-assistant`: fixed detection of reanimating biomes
-
-Structures
-----------
-- Several new names in instrument raw structures
-- ``identity``: identified ``profession``, ``civ``
-- ``manager_order_template``: fixed last field type
-- ``viewscreen_createquotast``: fixed layout
-- ``world.language``: moved ``colors``, ``shapes``, ``patterns`` to ``world.descriptors``
-- ``world.reactions``, ``world.reaction_categories``: moved to new compound, ``world.reactions``. Requires renaming:
-
-    - ``world.reactions`` to ``world.reactions.reactions``
-    - ``world.reaction_categories`` to ``world.reactions.reaction_categories``
-
-Other Changes
--------------
-- `embark-assistant`:
-
-    - Added search for adamantine
-    - Now supports saving/loading profiles
-
-- `fillneeds`: added ``-all`` option to apply to all units
-- `remotefortressreader`: added flows, instruments, tool names, campfires, ocean waves, spiderwebs
-
-
-DFHack 0.44.05-alpha1
-=====================
-
-Structures
-----------
-- ``incident``: re-aligned again to match disassembly
-
-Other Changes
--------------
-- `gui/liquids`: added more keybindings: 0-7 to change liquid level, P/B to cycle backwards
-
-DFHack 0.44.04-alpha1
-=====================
-
-Fixes
------
-- `devel/inject-raws`: now recognizes spaces in reaction names
-- `exportlegends`: fixed an error that could occur when exporting empty lists
-
-Structures
-----------
-- ``artifact_record``: fixed layout (changed in 0.44.04)
-- ``incident``: fixed layout (changed in 0.44.01) - note that many fields have moved
-
-DFHack 0.44.03-beta1
-====================
-
-Fixes
------
-- `autolabor`, `autohauler`, `labormanager`: added support for "put item on
-  display" jobs and building/destroying display furniture
-- `gui/gm-editor`: fixed an error when editing primitives in Lua tables
-
-Structures
-----------
-- Added 7 new globals from DF: ``version``, ``min_load_version``,
-  ``movie_version``, ``basic_seed``, ``title``, ``title_spaced``,
-  ``ui_building_resize_radius``
-- Added ``twbt_render_map`` code offset on x64
-- Fixed an issue preventing ``enabler`` from being allocated by DFHack
-- Added ``job_type.PutItemOnDisplay``
-- Found ``renderer`` vtable on osx64
-- ``adventure_movement_optionst``, ``adventure_movement_hold_tilest``,
-  ``adventure_movement_climbst``: named coordinate fields
-- ``mission``: added type
-- ``unit``: added 3 new vmethods: ``getCreatureTile``, ``getCorpseTile``, ``getGlowTile``
-- ``viewscreen_assign_display_itemst``: fixed layout on x64 and identified many fields
-- ``viewscreen_reportlistst``: fixed layout, added ``mission_id`` vector
-- ``world.status``: named ``missions`` vector
-
-Other Changes
--------------
-- `devel/dump-offsets`: now ignores ``index`` globals
-- `gui/pathable`: added tile types to sidebar
-- `modtools/skill-change`:
-
-    - now updates skill levels appropriately
-    - only prints output if ``-loud`` is passed
-
-DFHack 0.44.03-alpha1
-=====================
-
-Other Changes
--------------
-- Lua: Improved ``json`` I/O error messages
-- Lua: Stopped a crash when trying to create instances of classes whose vtable
-  addresses are not available
-
-DFHack 0.44.02-beta1
-====================
-
-Fixes
------
-- Fixed issues with the console output color affecting the prompt on Windows
-- `createitem`: stopped items from teleporting away in some forts
-- `gui/gm-unit`: can now edit mining skill
-- `gui/quickcmd`: stopped error from adding too many commands
-- `modtools/create-unit`: fixed error when domesticating units
-
-Structures
-----------
-- Located ``start_dwarf_count`` offset for all builds except 64-bit Linux;
-  `startdwarf` should work now
-- Added ``buildings_other_id.DISPLAY_CASE``
-- Fixed ``viewscreen_titlest.start_savegames`` alignment
-- Fixed ``unit`` alignment
-- Identified ``historical_entity.unknown1b.deities`` (deity IDs)
-
-API Changes
------------
-- Lua; Exposed ``get_vector()`` (from C++) for all types that support
-  ``find()``, e.g. ``df.unit.get_vector() == df.global.world.units.all``
-
-Additions/Removals
-------------------
-- Added `devel/check-other-ids`: Checks the validity of "other" vectors in the
-  ``world`` global
-- Added `gui/cp437-table`: An in-game CP437 table
-- Removed `warn-stuck-trees`: the corresponding DF bug was fixed in 0.44.01
-
-Other Changes
--------------
-- The console now provides suggestions for built-in commands
-- `devel/export-dt-ini`: avoid hardcoding flags
-- `exportlegends`:
+This file contains changes grouped by the release (stable or development) in
+which they first appeared. See `build-changelog` for more information.
 
-    - reordered some tags to match DF's order
-    - added progress indicators for exporting long lists
+See `changelog` for a list of changes grouped by stable releases.
 
-- `gui/gm-editor`: added enum names to enum edit dialogs
-- `gui/gm-unit`: made skill search case-insensitive
-- `gui/rename`: added "clear" and "special characters" options
-- `remotefortressreader`: includes item stack sizes and some performance improvements
-
-
-DFHack 0.44.02-alpha1
-=====================
-
-Fixes
------
-- Fixed a crash that could occur if a symbol table in symbols.xml had no content
-- The Lua API can now wrap functions with 12 or 13 parameters
-
-Structures
-----------
-- The ``ui_menu_width`` global is now a 2-byte array; the second item is the
-  former ``ui_area_map_width`` global, which is now removed
-- The former ``announcements`` global is now a field in ``d_init``
-- ``world`` fields formerly beginning with ``job_`` are now fields of
-  ``world.jobs``, e.g. ``world.job_list`` is now ``world.jobs.list``
-
-API Changes
------------
-- Lua: Added a new ``dfhack.console`` API
-
-DFHack 0.43.05-beta2
-====================
-
-Fixes
------
-- Fixed Buildings::updateBuildings(), along with building creation/deletion events
-- Fixed ``plug`` output alignment for plugins with long names
-- Fixed a crash that happened when a ``LUA_PATH`` environment variable was set
-- `add-thought`: fixed number conversion
-- `gui/workflow`: fixed range editing producing the wrong results for certain numbers
-- `modtools/create-unit`: now uses non-English names
-- `modtools/item-trigger`: fixed errors with plant growths
-- `remotefortressreader`: fixed a crash when serializing the local map
-- `stockflow`: fixed an issue with non-integer manager order limits
-- `title-folder`: fixed compatibility issues with certain SDL libraries on macOS
-
-Structures
-----------
-- Added some missing renderer VTable addresses on macOS
-- ``entity.resources.organic``: identified ``parchment``
-- ``entity_sell_category``: added ``Parchment`` and ``CupsMugsGoblets``
-- ``ui_advmode_menu``: added ``Build``
-- ``ui_unit_view_mode``: added ``PrefOccupation``
-- ``unit_skill``: identified ``natural_skill_lvl`` (was ``unk_1c``)
-- ``viewscreen_jobmanagementst``: identified ``max_workshops``
-- ``viewscreen_overallstatusst``:  made ``visible_pages`` an enum
-- ``viewscreen_pricest``: identified fields
-- ``viewscreen_workquota_conditionst``: gave some fields ``unk`` names
-
-API Changes
------------
-- Allowed the Lua API to accept integer-like floats and strings when expecting an integer
-- Lua: New ``Painter:key_string()`` method
-- Lua: Added ``dfhack.getArchitecture()`` and ``dfhack.getArchitectureName()``
-
-Additions/Removals:
--------------------
-- Added `adv-rumors` script: improves the "Bring up specific incident or rumor" menu in adventure mode
-- Added `install-info` script for basic troubleshooting
-- Added `tweak condition-material <tweak>`: fixes a crash in the work order condition material list
-- Added `tweak hotkey-clear <tweak>`: adds an option to clear bindings from DF hotkeys
-- `autofarm`: reverted local biome detection (from 0.43.05-alpha3)
-
-Other Changes
--------------
-- Added a DOWNLOAD_RUBY CMake option, to allow use of a system/external ruby library
-- Added the ability to download files manually before building
-- `gui/extended-status`: added a feature to queue beds
-- `remotefortressreader`: added building items, DF version info
-- `stonesense`: Added support for 64-bit macOS and Linux
-
-DFHack 0.43.05-beta1
-====================
-
-Fixes
------
-- Fixed various crashes on 64-bit Windows related to DFHack screens, notably `manipulator`
-- Fixed addresses of next_id globals on 64-bit Linux (fixes an `automaterial`/box-select crash)
-- ``ls`` now lists scripts in folders other than ``hack/scripts``, when applicable
-- `modtools/create-unit`: stopped permanently overwriting the creature creation
-  menu in arena mode
-- `season-palette`: fixed an issue where only part of the screen was redrawn
-  after changing the color scheme
-- `title-version`: now hidden when loading an arena
-
-Structures
-----------
-- ``file_compressorst``: fixed field sizes on x64
-- ``historical_entity``: fixed alignment on x64
-- ``ui_sidebar_menus.command_line``: fixed field sizes on x64
-- ``viewscreen_choose_start_sitest``: added 3 missing fields, renamed ``in_embark_only_warning``
-- ``viewscreen_layer_arena_creaturest``: identified more fields
-- ``world.math``: identified
-- ``world.murky_pools``: identified
-
-Additions/Removals
-------------------
-- `generated-creature-renamer`: Renames generated creature IDs for use with graphics packs
-
-Other Changes
--------------
-- `title-version`: Added a prerelease indicator
-
-DFHack 0.43.05-alpha4
-=====================
-
-Fixes
------
-- Fixed an issue with uninitialized bitfields that was causing several issues
-  (disappearing buildings in `buildingplan`'s planning mode, strange behavior in
-  the extended `stocks` screen, and likely other problems). This issue was
-  introduced in 0.43.05-alpha3.
-- `stockflow`: Fixed an "integer expected" error
-
-Structures
-----------
-- Located several globals on 64-bit Linux: flows, timed_events, ui_advmode,
-  ui_building_assign_type, ui_building_assign_is_marked,
-  ui_building_assign_units, ui_building_assign_items, and ui_look_list. This
-  fixes `search-plugin`, `zone`, and `force`, among others.
-- ``ui_sidebar_menus``: Fixed some x64 alignment issues
-
-Additions/Removals
-------------------
-- Added `fix/tile-occupancy`: Clears bad occupancy flags on the selected tile.
-  Useful for fixing blocked tiles introduced by the above buildingplan issue.
-- Added a Lua ``tile-material`` module
-
-Other Changes
--------------
-- `labormanager`: Add support for shell crafts
-- `manipulator`: Custom professions are now sorted alphabetically more reliably
-
-DFHack 0.43.05-alpha3
-=====================
-
-Fixes
------
-- `add-thought`: fixed support for emotion names
-- `autofarm`: Made surface farms detect local biome
-- `devel/export-dt-ini`: fixed squad_schedule_entry size
-- `labormanager`:
-
-    - Now accounts for unit attributes
-    - Made instrument-building jobs work (constructed instruments)
-    - Fixed deconstructing constructed instruments
-    - Fixed jobs in bowyer's shops
-    - Fixed trap component jobs
-    - Fixed multi-material construction jobs
-    - Fixed deconstruction of buildings containing items
-    - Fixed interference caused by "store item in vehicle" jobs
-
-- `manipulator`: Fixed crash when selecting a profession from an empty list
-- `ruby`:
-
-    - Fixed crash on Win64 due to truncated global addresses
-    - Fixed compilation on Win64
-    - Use correct raw string length with encodings
-
-Structures
-----------
-- Changed many ``comment`` XML attributes with version numbers to use new
-  ``since`` attribute instead
-- ``activity_event_conflictst.sides``: named many fields
-- ``building_def.build_key``: fixed size on 64-bit Linux and OS X
-- ``historical_kills``:
-
-    - ``unk_30`` -> ``killed_underground_region``
-    - ``unk_40`` -> ``killed_region``
-
-- ``historical_kills.killed_undead``: removed ``skeletal`` flag
-- ``ui_advmode``: aligned enough so that it doesn't crash (64-bit OS X/Linux)
-- ``ui_advmode.show_menu``: changed from bool to enum
-- ``unit_personality.emotions.flags``: now a bitfield
-
-API Changes
------------
-- Added ``DFHack::Job::removeJob()`` function
-- C++: Removed bitfield constructors that take an initial value. These kept
-  bitfields from being used in unions. Set ``bitfield.whole`` directly instead.
-- Lua: ``bitfield.whole`` now returns an integer, not a decimal
-
-Additions/Removals
-------------------
-- Removed source for treefarm plugin (wasn't built)
-- Added `modtools/change-build-menu`: Edit the build mode sidebar menus
-- Added `modtools/if-entity`: Run a command if the current entity matches a
-  given ID
-- Added `season-palette`: Swap color palettes with the changes of the seasons
+.. contents::
+   :depth: 2
 
-Other changes
--------------
-- Changed minimum GCC version to 4.8 on OS X and Linux (earlier versions
-  wouldn't have worked on Linux anyway)
-- Updated TinyXML from 2.5.3 to 2.6.2
+.. include:: /docs/_auto/news-dev.rst

docs/NEWS.rst

@@ -0,0 +1,26 @@
+.. comment
+    This is the changelog for stable releases. Entries are included from
+    changelog.txt.
+
+.. _changelog:
+
+#########
+Changelog
+#########
+
+This file contains changes grouped by the stable release in which they first
+appeared. See `build-changelog` for more information.
+
+See `dev-changelog` for a list of changes grouped by development releases.
+
+.. contents::
+   :depth: 2
+
+.. include:: /docs/_auto/news.rst
+
+
+Older Changelogs
+================
+Are kept in a seperate file:  `HISTORY`
+
+.. that's ``docs/history.rst``, if you're reading the raw text.

docs/_auto/.gitignore

@@ -0,0 +1 @@
+*.rst

docs/changelog.txt

@@ -0,0 +1,312 @@
+=== Scroll down for changes
+
+===[[[
+===help
+
+Entries in docs/NEWS.rst and docs/NEWS-dev.rst are generated from
+docs/changelog.txt. NEWS.rst groups entries by stable releases, and NEWS-dev.rst
+groups them by all releases (stable and development). For example, an entry
+listed under "0.44.05-alpha1" in changelog.txt will be listed under that in
+NEWS-dev.rst as well, but under "0.44.05-r1" in NEWS.rst (assuming that is the
+closest stable release after 0.44.05-alpha1). An entry listed under a stable
+release in changelog.txt will be listed under that release in both NEWS.rst and
+NEWS-dev.rst.
+
+changelog.txt uses a syntax similar to RST, with a few special sequences:
+
+- ``===`` indicates the start of a comment
+- ``#`` indicates the start of a release name (do not include "DFHack")
+- ``##`` indicates the start of a section name (this must be listed in ``gen_changelog.py``)
+- ``-`` indicates the start of a changelog entry. **Note:** an entry currently must be only one line.
+- ``:`` (colon followed by space) separates the name of a feature from a description of a change to that feature.
+    Changes made to the same feature are grouped if they end up in the same section.
+- ``:\`` (colon, backslash, space) avoids the above behavior
+- ``- @`` (the space is optional) indicates the start of an entry that should only be displayed in NEWS-dev.rst.
+    Use this sparingly, e.g. for immediate fixes to one development build in another development build that
+    are not of interest to users of stable builds only.
+- Three ``[`` characters indicate the start of a block (possibly a comment) that
+  spans multiple lines. Three ``]`` characters indicate the end of such a block.
+
+===end
+]]]
+
+================================================================================
+======== IMPORTANT: rename this, and add a new "future" section, BEFORE ========
+======== making a new DFHack release!                                   ========
+================================================================================
+# Future
+
+================================================================================
+# 0.44.09-r1
+
+## Internals
+- OS X: Can now build with GCC 7 (or older)
+
+## Fixes
+- `modtools/item-trigger`: fixed token format in help text
+
+## Misc Improvements
+- Reorganized changelogs and improved changelog editing process
+- `modtools/item-trigger`: added support for multiple type/material/contaminant conditions
+
+## Structures
+-@ ``renderer``: fixed vtable addresses on 64-bit OS X
+- ``building_type``: added human-readable ``name`` attribute
+- ``furnace_type``: added human-readable ``name`` attribute
+- ``workshop_type``: added human-readable ``name`` attribute
+- ``army``: added vector new in 0.44.07
+- ``site_reputation_report``: named ``reports`` vector
+
+================================================================================
+# 0.44.09-alpha1
+
+## Fixes
+- `digtype`: stopped designating non-vein tiles (open space, trees, etc.)
+- `labormanager`: fixed crash due to dig jobs targeting some unrevealed map blocks
+
+
+================================================================================
+# 0.44.08-alpha1
+
+## Fixes
+- `fix/dead-units`: fixed a bug that could remove some arriving (not dead) units
+
+
+================================================================================
+# 0.44.07-beta1
+
+## Structures
+-@ Added symbols for Toady's `0.44.07 Linux test build <http://www.bay12forums.com/smf/index.php?topic=169839.msg7720111#msg7720111>`_ to fix :bug:`10615`
+-@ ``world_site``: fixed alignment
+
+## Misc improvements
+- `modtools/item-trigger`: added the ability to specify inventory mode(s) to trigger on
+
+
+================================================================================
+# 0.44.07-alpha1
+
+## Fixes
+- Support for building on Ubuntu 18.04
+- Fixed some CMake warnings (CMP0022)
+- `embark-assistant`: fixed detection of reanimating biomes
+
+## Misc Improvements
+- `embark-assistant`:
+
+    - Added search for adamantine
+    - Now supports saving/loading profiles
+
+- `fillneeds`: added ``-all`` option to apply to all units
+- `remotefortressreader`: added flows, instruments, tool names, campfires, ocean waves, spiderwebs
+
+## Structures
+- Several new names in instrument raw structures
+- ``identity``: identified ``profession``, ``civ``
+- ``manager_order_template``: fixed last field type
+- ``viewscreen_createquotast``: fixed layout
+- ``world.language``: moved ``colors``, ``shapes``, ``patterns`` to ``world.descriptors``
+- ``world.reactions``, ``world.reaction_categories``:\ moved to new compound, ``world.reactions``. Requires renaming:
+
+    - ``world.reactions`` to ``world.reactions.reactions``
+    - ``world.reaction_categories`` to ``world.reactions.reaction_categories``
+
+
+================================================================================
+# 0.44.05-r2
+
+## Fixes
+- `devel/export-dt-ini`: fix language_name offsets for DT 39.2+
+- `devel/inject-raws`: fixed gloves and shoes (old typo causing errors)
+- `remotefortressreader`: fixed an issue with not all engravings being included
+- `view-item-info`: fixed an error with some shields
+
+## Misc Improvements
+- `adv-rumors`: added more keywords, including names
+- `autochop`: can now exclude trees that produce fruit, food, or cookable items
+- `remotefortressreader`: added plant type support
+
+## New Plugins
+- `embark-assistant`: adds more information and features to embark screen
+
+## New Scripts
+- `adv-fix-sleepers`: fixes units in adventure mode who refuse to wake up (:bug:`6798`)
+- `hermit`: blocks caravans, migrants, diplomats (for hermit challenge)
+
+## New Features
+- With ``PRINT_MODE:TEXT``, setting the ``DFHACK_HEADLESS`` environment variable will hide DF's display and allow the console to be used normally. (Note that this is intended for testing and is not very useful for actual gameplay.)
+
+
+================================================================================
+# 0.44.05-r1
+
+## New Scripts
+- `break-dance`: Breaks up a stuck dance activity
+- `fillneeds`: Use with a unit selected to make them focused and unstressed
+- `firestarter`: Lights things on fire: items, locations, entire inventories even!
+- `flashstep`: Teleports adventurer to cursor
+- `ghostly`: Turns an adventurer into a ghost or back
+- `questport`: Sends your adventurer to the location of your quest log cursor
+- `view-unit-reports`: opens the reports screen with combat reports for the selected unit
+
+## Fixes
+- `devel/inject-raws`: now recognizes spaces in reaction names
+- `dig`: added support for designation priorities - fixes issues with designations from ``digv`` and related commands having extremely high priority
+- `dwarfmonitor`:
+    - fixed display of creatures and poetic/music/dance forms on ``prefs`` screen
+    - added "view unit" option
+    - now exposes the selected unit to other tools
+
+- `names`: fixed many errors
+- `quicksave`: fixed an issue where the "Saving..." indicator often wouldn't appear
+
+## Misc Improvements
+- `gui/gm-unit`:
+    - added a profession editor
+    - misc. layout improvements
+- `remotefortressreader`:
+    - support for moving adventurers
+    - support for vehicles, gem shapes, item volume, art images, item improvements
+- `binpatch`: now reports errors for empty patch files
+- `force`: now provides useful help
+- `full-heal`:
+    - can now select corpses to resurrect
+    - now resets body part temperatures upon resurrection to prevent creatures from freezing/melting again
+    - now resets units' vanish countdown to reverse effects of `exterminate`
+- `launch`: can now ride creatures
+- `names`: can now edit names of units
+
+## Removed
+- `tweak`: ``kitchen-keys``: :bug:`614` fixed in DF 0.44.04
+
+## Internals
+- ``Gui::getAnyUnit()`` supports many more screens/menus
+
+## Structures
+- New globals: ``soul_next_id``
+
+================================================================================
+# 0.44.05-alpha1
+
+## Misc Improvements
+- `gui/liquids`: added more keybindings: 0-7 to change liquid level, P/B to cycle backwards
+
+## Structures
+-@ ``incident``: re-aligned again to match disassembly
+
+
+================================================================================
+# 0.44.04-alpha1
+
+## Fixes
+- `devel/inject-raws`: now recognizes spaces in reaction names
+- `exportlegends`: fixed an error that could occur when exporting empty lists
+
+
+## Structures
+- ``artifact_record``: fixed layout (changed in 0.44.04)
+- ``incident``: fixed layout (changed in 0.44.01) - note that many fields have moved
+
+
+================================================================================
+# 0.44.03-beta1
+
+## Fixes
+- `autolabor`, `autohauler`, `labormanager`: added support for "put item on display" jobs and building/destroying display furniture
+- `gui/gm-editor`: fixed an error when editing primitives in Lua tables
+
+## Misc Improvements
+- @ `devel/dump-offsets`: now ignores ``index`` globals
+- `gui/pathable`: added tile types to sidebar
+- `modtools/skill-change`:
+    - now updates skill levels appropriately
+    - only prints output if ``-loud`` is passed
+
+## Structures
+- New globals:
+    - ``version``
+    - ``min_load_version``
+    - ``movie_version``
+    - ``basic_seed``
+    - ``title``
+    - ``title_spaced``
+    - ``ui_building_resize_radius``
+- Added ``twbt_render_map`` code offset on x64
+- Fixed an issue preventing ``enabler`` from being allocated by DFHack
+- Added ``job_type.PutItemOnDisplay``
+- Found ``renderer`` vtable on osx64
+- ``adventure_movement_optionst``, ``adventure_movement_hold_tilest``, ``adventure_movement_climbst``: named coordinate fields
+- ``mission``: added type
+- ``unit``: added 3 new vmethods: ``getCreatureTile``, ``getCorpseTile``, ``getGlowTile``
+- ``viewscreen_assign_display_itemst``: fixed layout on x64 and identified many fields
+- ``viewscreen_reportlistst``: fixed layout, added ``mission_id`` vector
+- ``world.status``: named ``missions`` vector
+
+
+================================================================================
+# 0.44.03-alpha1
+
+## Lua
+- Improved ``json`` I/O error messages
+- Stopped a crash when trying to create instances of classes whose vtable addresses are not available
+
+
+================================================================================
+# 0.44.02-beta1
+
+## New Scripts
+- `devel/check-other-ids`: Checks the validity of "other" vectors in the ``world`` global
+- `gui/cp437-table`: An in-game CP437 table
+
+## Fixes
+- Fixed issues with the console output color affecting the prompt on Windows
+- `createitem`: stopped items from teleporting away in some forts
+- `gui/gm-unit`: can now edit mining skill
+- `gui/quickcmd`: stopped error from adding too many commands
+- `modtools/create-unit`: fixed error when domesticating units
+
+## Misc Improvements
+- The console now provides suggestions for built-in commands
+- `devel/export-dt-ini`: avoid hardcoding flags
+- `exportlegends`:
+    - reordered some tags to match DF's order
+    - added progress indicators for exporting long lists
+- `gui/gm-editor`: added enum names to enum edit dialogs
+- `gui/gm-unit`: made skill search case-insensitive
+- `gui/rename`: added "clear" and "special characters" options
+- `remotefortressreader`:
+    - includes item stack sizes
+    - some performance improvements
+
+## Removed
+- `warn-stuck-trees`: :bug:`9252` fixed in DF 0.44.01
+
+## Lua
+- Exposed ``get_vector()`` (from C++) for all types that support ``find()``, e.g. ``df.unit.get_vector() == df.global.world.units.all``
+
+## Structures
+- Located ``start_dwarf_count`` offset for all builds except 64-bit Linux; `startdwarf` should work now
+- Added ``buildings_other_id.DISPLAY_CASE``
+- Fixed ``viewscreen_titlest.start_savegames`` alignment
+- Fixed ``unit`` alignment
+- Identified ``historical_entity.unknown1b.deities`` (deity IDs)
+
+
+================================================================================
+# 0.44.02-alpha1
+
+## New Scripts
+- `devel/dump-offsets`: prints an XML version of the global table included in in DF
+
+## Fixes
+- Fixed a crash that could occur if a symbol table in symbols.xml had no content
+
+## Lua
+- Added a new ``dfhack.console`` API
+- API can now wrap functions with 12 or 13 parameters
+
+## Structures
+- The ``ui_menu_width`` global is now a 2-byte array; the second item is the former ``ui_area_map_width`` global, which is now removed
+- The former ``announcements`` global is now a field in ``d_init``
+- ``world`` fields formerly beginning with ``job_`` are now fields of ``world.jobs``, e.g. ``world.job_list`` is now ``world.jobs.list``
+

docs/gen_changelog.py

@@ -0,0 +1,202 @@
+import collections
+import copy
+import itertools
+import os
+import sys
+
+CHANGELOG_SECTIONS = [
+    'New Plugins',
+    'New Scripts',
+    'New Tweaks',
+    'New Features',
+    'New Internal Commands',
+    'Fixes',
+    'Misc Improvements',
+    'Removed',
+    'Internals',
+    'Structures',
+    'Lua',
+    'Ruby',
+]
+
+class ChangelogEntry(object):
+    def __init__(self, text, section, stable_version, dev_version):
+        text = text.lstrip('- ')
+        # normalize section to title case
+        self.section = ' '.join(word[0].upper() + word[1:].lower()
+                                for word in section.strip().split())
+        self.stable_version = stable_version
+        self.dev_version = dev_version
+        self.dev_only = text.startswith('@')
+        text = text.lstrip('@ ')
+        self.children = []
+
+        split_index = text.find(': ')
+        if split_index != -1:
+            self.feature, description = text[:split_index], text[split_index+1:]
+            if description.strip():
+                self.children.insert(0, description.strip())
+        else:
+            self.feature = text
+        self.feature = self.feature.replace(':\\', ':').rstrip(':')
+
+        self.sort_key = self.feature.upper()
+
+    def __repr__(self):
+        return 'ChangelogEntry(%r, %r)' % (self.feature, self.children)
+
+def parse_changelog():
+    cur_stable = None
+    cur_dev = None
+    cur_section = None
+    last_entry = None
+    entries = []
+
+    with open('docs/changelog.txt') as f:
+        multiline = ''
+        for line_id, line in enumerate(f.readlines()):
+            line_id += 1
+
+            if multiline:
+                multiline += line
+            elif '[[[' in line:
+                multiline = line.replace('[[[', '')
+
+            if ']]]' in multiline:
+                line = multiline.replace(']]]', '')
+                multiline = ''
+            elif multiline:
+                continue
+
+            if not line.strip() or line.startswith('==='):
+                continue
+
+            if line.startswith('##'):
+                cur_section = line.lstrip('#').strip()
+            elif line.startswith('#'):
+                cur_dev = line.lstrip('#').strip().lower()
+                if ('alpha' not in cur_dev and 'beta' not in cur_dev and
+                        'rc' not in cur_dev):
+                    cur_stable = cur_dev
+            elif line.startswith('-'):
+                if not cur_stable or not cur_dev or not cur_section:
+                    raise ValueError(
+                        'changelog.txt:%i: Entry without section' % line_id)
+                last_entry = ChangelogEntry(line.strip(), cur_section,
+                                            cur_stable, cur_dev)
+                entries.append(last_entry)
+            elif line.lstrip().startswith('-'):
+                if not cur_stable or not cur_dev:
+                    raise ValueError(
+                        'changelog.txt:%i: Sub-entry without section' % line_id)
+                if not last_entry:
+                    raise ValueError(
+                        'changelog.txt:%i: Sub-entry without parent' % line_id)
+                last_entry.children.append(line.strip('- \n'))
+            else:
+                raise ValueError('Invalid line: ' + line)
+
+    return entries
+
+def consolidate_changelog(all_entries):
+    for sections in all_entries.values():
+        for section, entries in sections.items():
+            # sort() is stable, so reverse entries so that older entries for the
+            # same feature are on top
+            entries.reverse()
+            entries.sort(key=lambda entry: entry.sort_key)
+            new_entries = []
+            for feature, group in itertools.groupby(entries,
+                                                    lambda e: e.feature):
+                old_entries = list(group)
+                children = list(itertools.chain(*[entry.children
+                                for entry in old_entries]))
+                new_entry = copy.deepcopy(old_entries[0])
+                new_entry.children = children
+                new_entries.append(new_entry)
+            entries[:] = new_entries
+
+
+
+def print_changelog(versions, all_entries, path):
+    # all_entries: version -> section -> entry
+    with open(path, 'w') as f:
+        write = lambda s: f.write(s + '\n')
+        for version in versions:
+            sections = all_entries[version]
+            if not sections:
+                continue
+            version = 'DFHack ' + version
+            write(version)
+            write('=' * len(version))
+            write('')
+            for section in CHANGELOG_SECTIONS:
+                entries = sections[section]
+                if not entries:
+                    continue
+                write(section)
+                write('-' * len(section))
+                for entry in entries:
+                    if len(entry.children) == 1:
+                        write('- ' + entry.feature + ': ' +
+                                entry.children[0].strip('- '))
+                        continue
+                    elif entry.children:
+                        write('- ' + entry.feature + ':')
+                        write('')
+                        for child in entry.children:
+                            write('    - ' + child)
+                        write('')
+                    else:
+                        write('- ' + entry.feature)
+                write('')
+            write('')
+
+
+def generate_changelog():
+    entries = parse_changelog()
+
+    # scan for unrecognized sections
+    for entry in entries:
+        if entry.section not in CHANGELOG_SECTIONS:
+            raise RuntimeWarning('Unknown section: ' + entry.section)
+
+    # ordered versions
+    versions = ['future']
+    # map versions to stable versions
+    stable_version_map = {}
+    # version -> section -> entry
+    stable_entries = collections.defaultdict(lambda:
+                        collections.defaultdict(list))
+    dev_entries = collections.defaultdict(lambda:
+                        collections.defaultdict(list))
+    for entry in entries:
+        if entry.dev_version not in versions:
+            versions.append(entry.dev_version)
+        stable_version_map.setdefault(entry.dev_version, entry.stable_version)
+        if not entry.dev_only:
+            stable_entries[entry.stable_version][entry.section].append(entry)
+        dev_entries[entry.dev_version][entry.section].append(entry)
+
+    consolidate_changelog(stable_entries)
+
+    print_changelog(versions, stable_entries, 'docs/_auto/news.rst')
+    print_changelog(versions, dev_entries, 'docs/_auto/news-dev.rst')
+
+    return entries
+
+if __name__ == '__main__':
+    os.chdir(os.path.abspath(os.path.dirname(__file__)))
+    os.chdir('..')
+    entries = generate_changelog()
+    if '--check' in sys.argv:
+        with open('docs/_auto/news.rst') as f:
+            content_stable = f.read()
+        with open('docs/_auto/news-dev.rst') as f:
+            content_dev = f.read()
+        for entry in entries:
+            for description in entry.children:
+                if not entry.dev_only and description not in content_stable:
+                    print('stable missing: ' + description)
+                if description not in content_dev:
+                    print('dev missing: ' + description)

index.rst

@@ -49,7 +49,7 @@ Other Contents
 
    /docs/Authors
    /LICENSE
-   /NEWS
+   /docs/NEWS
    /docs/Scripts-removed
 
 For Developers

library/CMakeLists.txt

@@ -254,7 +254,7 @@ LIST(APPEND PROJECT_SOURCES ${PROJECT_HEADERS})
 LIST(APPEND PROJECT_SOURCES ${GENERATED_HDRS})
 
 FILE(GLOB GENERATE_INPUT_SCRIPTS ${dfapi_SOURCE_DIR}/xml/*.pm ${dfapi_SOURCE_DIR}/xml/*.xslt)
-FILE(GLOB GENERATE_INPUT_XMLS ${dfapi_SOURCE_DIR}/xml/*.xml)
+FILE(GLOB GENERATE_INPUT_XMLS ${dfapi_SOURCE_DIR}/xml/df.*.xml)
 
 ADD_CUSTOM_COMMAND(
     OUTPUT ${dfapi_SOURCE_DIR}/include/df/codegen.out.xml
@@ -379,8 +379,6 @@ IF(UNIX)
                 DESTINATION .)
         install(PROGRAMS ${dfhack_SOURCE_DIR}/package/darwin/dfhack-run
                 DESTINATION .)
-        install(PROGRAMS ${dfhack_SOURCE_DIR}/package/darwin/osx${DFHACK_BUILD_ARCH}/libstdc++.6.dylib
-                DESTINATION ./hack/)
     else()
         # On linux, copy our version of the df launch script which sets LD_PRELOAD
         install(PROGRAMS ${dfhack_SOURCE_DIR}/package/linux/dfhack

library/lua/gui.lua

@@ -109,6 +109,7 @@ local function parse_inset(inset)
 end
 
 function inset_frame(rect, inset, gap)
+    if not rect then return mkdims_wh(0, 0, 0, 0) end
     gap = gap or 0
     local l,t,r,b = parse_inset(inset)
     return mkdims_xy(rect.x1+l+gap, rect.y1+t+gap, rect.x2-r-gap, rect.y2-b-gap)

library/xml

@@ -1 +1 @@
-Subproject commit abb25a2692198d90c93a61ad70d34b12d9fcef00
+Subproject commit 3c0bf63674d5430deadaf7befaec42f0ec1e8bc5

package/darwin/osx32-gcc7/.gitignore

@@ -0,0 +1 @@
+libstdc++*

package/darwin/osx64-gcc7/.gitignore

@@ -0,0 +1 @@
+libstdc++*

plugins/dig.cpp

@@ -1522,6 +1522,8 @@ command_result digtype (color_ostream &out, vector <string> & parameters)
                 tt = mCache->tiletypeAt(current);
                 if (!DFHack::isWallTerrain(tt))
                     continue;
+                if (tileMaterial(tt) != df::enums::tiletype_material::MINERAL)
+                    continue;
 
                 //designate it for digging
                 df::tile_designation des = mCache->designationAt(current);

plugins/labormanager/labormanager.cpp

@@ -1075,8 +1075,7 @@ private:
                     if (bl->designation[x][y].bits.hidden)
                     {
                         df::coord p = bl->map_pos;
-                        df::coord c(p.x, p.y, p.z - 1);
-                        if (Maps::getTileDesignation(c)->bits.hidden)
+                        if (! Maps::isTileVisible(p.x, p.y, p.z-1))
                             continue;
                     }
 

scripts

@@ -1 +1 @@
-Subproject commit cd8e1d747e081ba90f3c9a2335d3283289bb67b6
+Subproject commit 7d7dd8a7498e975a19231435e7cb225025042a78