From b688629a9df077bbc85ab555dd2f8f302711b610 Mon Sep 17 00:00:00 2001
From: William Kendrick <wkendrick@users.sourceforge.net>
Date: Sat, 27 Sep 2003 07:53:51 +0000
Subject: [PATCH] Updated man page to show new (upcoming) options.  Made sure
 options were up to date.  Prepared for new options.

---
 src/manpage/tuxpaint.1 | 39 ++++++++++++++++++++++++++++----------
 src/tuxpaint.c         | 43 +++++++++++++++++++++++++++++++++++++++---
 2 files changed, 69 insertions(+), 13 deletions(-)

diff --git a/src/manpage/tuxpaint.1 b/src/manpage/tuxpaint.1
index 7aa16033b..63c45ea77 100644
--- a/src/manpage/tuxpaint.1
+++ b/src/manpage/tuxpaint.1
@@ -1,5 +1,5 @@
-.\" tuxpaint.1 - 2003.09.14
-.TH TUXPAINT 1 "14 Sep 2003" "0.9.13" "Tux Paint"
+.\" tuxpaint.1 - 2003.09.27
+.TH TUXPAINT 1 "27 Sep 2003" "0.9.13" "Tux Paint"
 .SH NAME
 tuxpaint -- A drawing program for young children.
 
@@ -24,6 +24,8 @@ tuxpaint -- A drawing program for young children.
 [\-\-nofancycursors]
 [\-\-nooutlines]
 [\-\-nostamps]
+[\-\-nostampcontrols]
+[\-\-mirrorstamps]
 [\-\-keyboard]
 [\-\-savedir \fIDIR\fP]
 [\-\-saveover]
@@ -43,10 +45,12 @@ tuxpaint -- A drawing program for young children.
 [\-\-dontgrab]
 [\-\-shortcuts]
 [\-\-wheelmouse]
-[\-\-mouse]
+[\-\-fancycursors]
 [\-\-outlines]
 [\-\-stamps]
-[\-\-fancycursors]
+[\-\-stampcontrols]
+[\-\-dontmirrorstamps]
+[\-\-mouse]
 [\-\-saveoverask]
 
 .TP 9
@@ -165,12 +169,6 @@ Disable or enable (default) the 'fancy' mouse pointer shapes in \fITux Paint\fP.
 While the shapes are larger, and context sensitive, some environments have
 trouble displaying the mouse pointer, and/or leave 'trails' on the screen.
 
-.TP 8
-.B \-\-keyboard \-\-mouse
-The \fIkeyboard\fP option lets the mouse pointer in \fITux Paint\fP be
-controlled with the keyboard.  The \fIarrow keys\fP move the pointer.
-\fISpacebar\fP acts as the mouse button.
-
 .TP 8
 .B \-\-nooutlines \-\-outlines
 In \fInooutlines\fP mode, much simpler outlines and 'rubber-band' lines are
@@ -184,6 +182,24 @@ With \fInostamps\fP set, Rubber Stamp images are not loaded, so the
 \fIStamps\fP tool will not be available.  This option can be used to reduce
 the time Tux Paint takes to load, and reduce the amount of RAM it requires.
 
+.TP 8
+.B \-\-nostampcontrols \-\-stampcontrols
+Disable or enable (default) buttons to control stamps.  Controls include
+mirror, flip, shrink and grow.  (Note: Not all stamps will be controllable
+in all ways.)
+
+.TP 8
+.B \-\-mirrorstamps \-\-dontmirrorstamps
+With \fImirrorstamps\fP set, stamps which can be mirrored will appear
+mirrored by default.  This can be useful when used by people who prefer
+things right-to-left over left-to-right.
+
+.TP 8
+.B \-\-keyboard \-\-mouse
+The \fIkeyboard\fP option lets the mouse pointer in \fITux Paint\fP be
+controlled with the keyboard.  The \fIarrow keys\fP move the pointer.
+\fISpacebar\fP acts as the mouse button.
+
 .TP 8
 .B \-\-savedir \fIDIR\fP
 Specify where \fITux Paint\fP should save files.  By default, this is
@@ -317,6 +333,9 @@ spanish | espanol
 swedish | svenska
 .TP 2
 -
+tamil
+.TP 2
+-
 turkish
 .TP 2
 -
diff --git a/src/tuxpaint.c b/src/tuxpaint.c
index 700fb14e4..afe0b3113 100644
--- a/src/tuxpaint.c
+++ b/src/tuxpaint.c
@@ -7,12 +7,12 @@
   bill@newbreedsoftware.com
   http://www.newbreedsoftware.com/tuxpaint/
   
-  June 14, 2002 - September 14, 2003
+  June 14, 2002 - September 27, 2003
 */
 
 
 #define VER_VERSION     "0.9.13"
-#define VER_DATE        "2003.09.14"
+#define VER_DATE        "2003.09.27"
 
 
 /* #define DEBUG */
@@ -376,7 +376,8 @@ int use_sound, fullscreen, disable_quit, simple_shapes, language,
   disable_print, print_delay, only_uppercase, promptless_save, grab_input,
   wheely, no_fancy_cursors, keymouse, mouse_x, mouse_y,
   mousekey_up, mousekey_down, mousekey_left, mousekey_right,
-  dont_do_xor, use_print_config, dont_load_stamps, noshortcuts;
+  dont_do_xor, use_print_config, dont_load_stamps, noshortcuts,
+  mirrorstamps, disable_stamp_controls;
 int recording, playing;
 char * playfile;
 FILE * demofi;
@@ -3583,6 +3584,8 @@ void setup(int argc, char * argv[])
   printcommand = "pngtopnm | pnmtops | lpr";
   langstr = NULL;
   use_print_config = 0;
+  mirrorstamps = 0;
+  disable_stamp_controls = 0;
   WINDOW_WIDTH = 640;
   WINDOW_HEIGHT = 480;
   playfile = NULL;
@@ -3682,6 +3685,22 @@ void setup(int argc, char * argv[])
     {
       fullscreen = 0;
     }
+    else if (strcmp(argv[i], "--mirrorstamps") == 0)
+    {
+      mirrorstamps = 1;
+    }
+    else if (strcmp(argv[i], "--dontmirrorstamps") == 0)
+    {
+      mirrorstamps = 0;
+    }
+    else if (strcmp(argv[i], "--nostampcontrols") == 0)
+    {
+      disable_stamp_controls = 1;
+    }
+    else if (strcmp(argv[i], "--stampcontrols") == 0)
+    {
+      disable_stamp_controls = 0;
+    }
     else if (strcmp(argv[i], "--noshortcuts") == 0)
     {
       noshortcuts = 1;
@@ -10988,6 +11007,24 @@ void parse_options(FILE * fi)
 	{
 	  fullscreen = 0;
 	}
+      else if (strcmp(str, "nostampcontrols=yes") == 0)
+	{
+	  disable_stamp_controls = 1;
+	}
+      else if (strcmp(str, "nostampcontrols=no") == 0 ||
+	       strcmp(str, "stampcontrols=yes") == 0)
+	{
+	  disable_stamp_controls = 0;
+	}
+      else if (strcmp(str, "mirrorstamps=yes") == 0)
+	{
+	  mirrorstamps = 1;
+	}
+      else if (strcmp(str, "mirrorstamps=no") == 0 ||
+	       strcmp(str, "dontmirrorstamps=yes") == 0)
+	{
+	  mirrorstamps = 0;
+	}
       else if (strcmp(str, "noshortcuts=yes") == 0)
         {
 	  noshortcuts = 1;