From 850b733f4bd05869a256387d41c2395756468a77 Mon Sep 17 00:00:00 2001
From: Bill Kendrick <nbs@sonic.net>
Date: Wed, 10 Apr 2024 23:03:17 -0700
Subject: [PATCH] Activate `[un]groupmagictools` option

---
 docs/CHANGES.txt             | 2 +-
 src/parse.gperf              | 2 ++
 src/parse.h                  | 1 +
 src/tuxpaint-completion.bash | 3 ++-
 src/tuxpaint.c               | 4 +++-
 5 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/docs/CHANGES.txt b/docs/CHANGES.txt
index 88d73509c..c1487a4f1 100644
--- a/docs/CHANGES.txt
+++ b/docs/CHANGES.txt
@@ -6,7 +6,7 @@ Copyright (c) 2002-2024
 Various contributors (see below, and AUTHORS.txt)
 https://tuxpaint.org/
 
-2024.April.8 (0.9.33)
+2024.April.10 (0.9.33)
   * New Magic Tools:
     ----------------
     * WIP Specular Reflection: Draws a slightly blurred, wavy, and
diff --git a/src/parse.gperf b/src/parse.gperf
index 62d4ab30a..d2a821dea 100644
--- a/src/parse.gperf
+++ b/src/parse.gperf
@@ -133,6 +133,8 @@ lang,                MULTI(parsertmp_lang)
 locale,              MULTI(parsertmp_locale)
 lockfile,            POSBOOL(ok_to_use_lockfile)
 magiccontrols,       NEGBOOL(disable_magic_controls)
+ungroupmagictools,   POSBOOL(no_magic_groups)
+groupmagictools,     NEGBOOL(no_magic_groups)
 magicsizes,          NEGBOOL(disable_magic_sizes)
 shapecontrols,       NEGBOOL(disable_shape_controls)
 mirrorstamps,        POSBOOL(mirrorstamps)
diff --git a/src/parse.h b/src/parse.h
index e216767b9..3f54e7e92 100644
--- a/src/parse.h
+++ b/src/parse.h
@@ -18,6 +18,7 @@ struct cfginfo
   const char *disable_brushspacing;
   const char *disable_magic_controls;
   const char *disable_magic_sizes;
+  const char *no_magic_groups;
   const char *disable_shape_controls;
   const char *disable_print;
   const char *disable_quit;
diff --git a/src/tuxpaint-completion.bash b/src/tuxpaint-completion.bash
index f4ccc6c60..15765a558 100644
--- a/src/tuxpaint-completion.bash
+++ b/src/tuxpaint-completion.bash
@@ -3,7 +3,7 @@
 # Bill Kendrick <bill@newbreedsoftware.com>; https://tuxpaint.org/
 # Based on inkscape's completion file, by allali@univ-mlv.fr
 #
-# Last modified 2023-12-29
+# Last modified 2024-04-10
 #
 # $Id$
 
@@ -65,6 +65,7 @@ _tuxpaint()
 			--nostamprotation --stamprotation \
 			--nomagiccontrols --magiccontrols \
 			--nomagicsizes --magicsizes \
+			--ungroupmagictools --groupmagictools \
 			--noshapecontrols --shapecontrols \
 			--notemplateexport --templateexport \
 			--mirrorstamps --dontmirrorstamps \
diff --git a/src/tuxpaint.c b/src/tuxpaint.c
index 19c50b8ee..d7d9ec5bc 100644
--- a/src/tuxpaint.c
+++ b/src/tuxpaint.c
@@ -22,7 +22,7 @@
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
   (See COPYING.txt)
 
-  June 14, 2002 - April 8, 2024
+  June 14, 2002 - April 10, 2024
 */
 
 #include "platform.h"
@@ -8113,6 +8113,7 @@ void show_usage(int exitcode)
           "  [--nostampcontrols | --stampcontrols]\n"
           "  [--nomagiccontrols | --magiccontrols]\n"
           "  [--nomagicsizes | --magicsizes]\n"
+          "  [--ungroupmagictools | --groupmagictools]\n"
           "  [--noshapecontrols | --shapecontrols]\n"
           "  [--nolabel | --label]\n"
           "  [--nobrushspacing | --brushspacing]\n"
@@ -28404,6 +28405,7 @@ static void setup_config(char *argv[])
   SETBOOL(disable_brushspacing);
   SETBOOL(disable_magic_controls);
   SETBOOL(disable_magic_sizes);
+  SETBOOL(no_magic_groups);
   SETBOOL(disable_shape_controls);
   SETBOOL(disable_print);
   SETBOOL(disable_quit);