diff --git a/Makefile b/Makefile index c08be9e9e..e3fc13b3e 100644 --- a/Makefile +++ b/Makefile @@ -4,12 +4,12 @@ # Various contributors (see AUTHORS.txt) # http://www.tuxpaint.org/ -# June 14, 2002 - September 24, 2018 +# June 14, 2002 - December 18, 2018 # The version number, for release: -VER_VERSION:=0.9.23c +VER_VERSION:=0.9.24 ifdef SOURCE_DATE_EPOCH VER_DATE=$(shell date -u -d "@$(SOURCE_DATE_EPOCH)" "+%Y-%m-%d" 2>/dev/null || date -u -r "$(SOURCE_DATE_EPOCH)" "+%Y-%m-%d" 2>/dev/null || date -u "+%Y-%m-%d") else diff --git a/docs/CHANGES.txt b/docs/CHANGES.txt index 4d579060e..be38d57ed 100644 --- a/docs/CHANGES.txt +++ b/docs/CHANGES.txt @@ -8,7 +8,7 @@ http://www.tuxpaint.org/ $Id$ -2018.Oct.7 (0.9.23c) +2018.Dec.18 (0.9.24) * Bug Fixes --------- * Correct issue that prevented Tux Paint from lauching on Mac OS X 10.7. @@ -31,6 +31,8 @@ $Id$ * Mended link to MinGW/MSYS instructions at John Popplewell's website. (h/t "sechidis") + * Improved and expanded usage info (e.g., "tuxpaint --help" output) + * Misc ---- * Verbose debugging, and "DEBUG_PRINTF()" macro now available; diff --git a/docs/en/README.txt b/docs/en/README.txt index 535a93885..ae4278609 100644 --- a/docs/en/README.txt +++ b/docs/en/README.txt @@ -1,12 +1,12 @@ Tux Paint - version 0.9.23c + version 0.9.24 A simple drawing program for children Copyright 2002-2018 by various contributors; see AUTHORS.txt http://www.tuxpaint.org/ - June 14, 2002 - October 7, 2018 + June 14, 2002 - December 18, 2018 ---------------------------------------------------------------------- diff --git a/docs/en/html/README.html b/docs/en/html/README.html index f22e38cd6..5e09968cc 100644 --- a/docs/en/html/README.html +++ b/docs/en/html/README.html @@ -12,7 +12,7 @@ alt="Tux Paint">
version -0.9.23c +0.9.24

A simple drawing program for children

@@ -22,7 +22,7 @@ version

June 14, 2002 - - October 7, 2018

+ December 18, 2018

diff --git a/src/tuxpaint.c b/src/tuxpaint.c index 43b85de6f..4656ae421 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 - August 28, 2018 + June 14, 2002 - December 18, 2018 */ @@ -6395,80 +6395,91 @@ void show_version(int details) void show_usage(int exitcode) { FILE *f = exitcode ? stderr : stdout; - char *blank; unsigned i; - blank = strdup(progname); - - for (i = 0; i < strlen(blank); i++) - blank[i] = ' '; - fprintf(f, "\n" "Usage: %s {--usage | --help | --version | --verbose-version | --copying}\n" "\n" - " %s [--windowed | --fullscreen]\n" - " %s [--WIDTHxHEIGHT | --native]\n" - " %s [--disablescreensaver | --allowscreensaver ]\n" - " %s [--orient=landscape | --orient=portrait]\n" - " %s [--startblank | --startlast]\n" - " %s [--sound | --nosound]\n" - " %s [--quit | --noquit]\n" - " %s [--print | --noprint]\n" - " %s [--complexshapes | --simpleshapes]\n" - " %s [--mixedcase | --uppercase]\n" - " %s [--fancycursors | --nofancycursors]\n" - " %s [--hidecursor | --showcursor]\n" - " %s [--mouse | --keyboard]\n" - " %s [--dontgrab | --grab]\n" - " %s [--noshortcuts | --shortcuts]\n" - " %s [--wheelmouse | --nowheelmouse]\n" - " %s [--nobuttondistinction | --buttondistinction]\n" - " %s [--outlines | --nooutlines]\n" - " %s [--stamps | --nostamps]\n" - " %s [--sysfonts | --nosysfonts]\n" - " %s [--nostampcontrols | --stampcontrols]\n" - " %s [--nomagiccontrols | --magiccontrols]\n" - " %s [--nolabel | --label]\n" - " %s [--mirrorstamps | --dontmirrorstamps]\n" - " %s [--stampsize=[0-10] | --stampsize=default]\n" - " %s [--saveoverask | --saveover | --saveovernew]\n" - " %s [--nosave | --save]\n" - " %s [--autosave | --noautosave]\n" " %s [--savedir DIRECTORY]\n" " %s [--datadir DIRECTORY]\n" + " Config:\n" + " [--nosysconfig]\n" + "\n" + " Video/Sound:\n" + " [--windowed | --fullscreen]\n" + " [--WIDTHxHEIGHT | --native]\n" + " [--orient=landscape | --orient=portrait]\n" + " [--disablescreensaver | --allowscreensaver ]\n" + " [--sound | --nosound]\n" + " [--colorfile FILE]\n" + "\n" + " Mouse/Keyboard:\n" + " [--fancycursors | --nofancycursors]\n" + " [--hidecursor | --showcursor]\n" + " [--noshortcuts | --shortcuts]\n" + " [--dontgrab | --grab]\n" + " [--wheelmouse | --nowheelmouse]\n" + " [--nobuttondistinction | --buttondistinction]\n" + "\n" + " Simplification:\n" + " [--complexshapes | --simpleshapes]\n" + " [--outlines | --nooutlines]\n" + " [--mixedcase | --uppercase]\n" + " [--stampsize=[0-10] | --stampsize=default]\n" + " [--quit | --noquit]\n" + " [--stamps | --nostamps]\n" + " [--nostampcontrols | --stampcontrols]\n" + " [--nomagiccontrols | --magiccontrols]\n" + " [--nolabel | --label]\n" + "\n" + " Languages:\n" + " [--lang LANGUAGE | --locale LOCALE | --lang help]\n" + " [--mirrorstamps | --dontmirrorstamps]\n" + " [--sysfonts | --nosysfonts]\n" + " [--currentlocalefont | --alllocalefonts]\n" + "\n" + " Printing:\n" + " [--print | --noprint]\n" + " [--printdelay=SECONDS]\n" + " [--altprintmod | --altprintalways | --altprintnever]\n" #if defined(WIN32) || defined(__APPLE__) - " %s [--printcfg | --noprintcfg]\n" + " [--printcfg | --noprintcfg]\n" #endif - " %s [--printdelay=SECONDS]\n" " %s [--altprintmod | --altprintalways | --altprintnever]\n" #if !defined(WIN32) && !defined(__APPLE__) && !defined(__BEOS__) && !defined(__HAIKU__) - " %s [--papersize PAPERSIZE | --papersize help]\n" + " [--printcommand=COMMAND]\n" + " [--altprintcommand=COMMAND]\n" + " [--papersize PAPERSIZE | --papersize help]\n" #endif - " %s [--lang LANGUAGE | --locale LOCALE | --lang help]\n" - " %s [--nosysconfig]\n" - " %s [--nolockfile]\n" - " %s [--colorfile FILE]\n" - " %s [--mouse-accessibility]\n" - " %s [--onscreen-keyboard]\n" - " %s [--joystick-dev N] (default=0)\n" - " %s [--joystick-slowness N] (0-500; default value is 15)\n" - " %s [--joystick-threshold N] (0-32766; default value is 3200)\n" - " %s [--joystick-maxsteps N] (1-7; default value is 7)\n" + "\n" + " Saving:\n" + " [--saveoverask | --saveover | --saveovernew]\n" + " [--startblank | --startlast]\n" + " [--savedir DIRECTORY]\n" + " [--nosave | --save]\n" + " [--autosave | --noautosave]\n" + "\n" + " Data:\n" + " [--nolockfile]\n" + " [--datadir DIRECTORY]\n" + "\n" + " Accessibility:\n" + " [--mouse-accessibility]\n" + " [--mouse | --keyboard]\n" + " [--onscreen-keyboard]\n" + " [--onscreen-keyboard-layout=LAYOUT]\n" + " [--onscreen-keyboard-disable-change]\n" + "\n" + " Joystick:\n" + " [--joystick-dev N] (default=0)\n" + " [--joystick-slowness N] (0-500; default value is 15)\n" + " [--joystick-threshold N] (0-32766; default value is 3200)\n" + " [--joystick-maxsteps N] (1-7; default value is 7)\n" + " [--joystick-hat-slowness N] (0-500; default value is 15)\n" + " [--joystick-hat-timeout N] (0-3000; default value is 1000)\n" + " [--joystick-buttons-ignore=BUTTON1,BUTTON2,...]\n" + " [--joystick-btn-COMMAND=BUTTON]\n" + /* FIXME: "--joystick-btn-help" to list available commands, like "--lang help" */ "\n", - progname, progname, - blank, blank, blank, blank, - blank, blank, blank, blank, - blank, blank, blank, blank, - blank, blank, blank, blank, - blank, blank, blank, blank, blank, blank, blank, blank, blank, blank, blank, blank, blank, -#ifdef WIN32 - blank, -#endif - blank, blank, -#if !defined(WIN32) && !defined(__APPLE__) && !defined(__BEOS__) && !defined(__HAIKU__) - blank, -#endif - blank, blank, blank, blank, blank, blank, blank, blank, blank, blank); - - free(blank); + progname); }