Some command line options are not GNU/POSIX compliant

The definitions are:
https://pubs.opengroup.org/onlinepubs/9699919799/basedefs/V1_chap12.html
https://www.gnu.org/software/libc/manual/html_node/Argument-Syntax.html

Colons in an option have been replaced by an equals sign.
Multi-character short options have been deleted.

The option --cache-render-shared-recurse remains illegal because it
exceeds the three--word limit.

diff --git a/doc/docbook/CommandLineOptions.xml b/doc/docbook/CommandLineOptions.xml
index 91286d6..527779d 100644 (file)
--- a/doc/docbook/CommandLineOptions.xml
+++ b/doc/docbook/CommandLineOptions.xml
@@ -8,7 +8,7 @@
 <refentrytitle>GEEQIE</refentrytitle>
 <manvolnum>1</manvolnum>
 <refmiscinfo class='source'>April 2024</refmiscinfo>
-<refmiscinfo class='manual'>Geeqie 2.4+git20240402-d802d5f5 GTK3</refmiscinfo>
+<refmiscinfo class='manual'>Geeqie 2.4+git20240413-2a5c2a89 GTK3</refmiscinfo>
 </refmeta>
 <refnamediv>
 <refname>Geeqie</refname>
@@ -30,7 +30,7 @@ zooming, panning, thumbnails and sorting images into collections.</para>
 
 <para>Generated for version:</para>
 
-<para>Geeqie 2.4+git20240402-d802d5f5</para>
+<para>Geeqie 2.4+git20240413-2a5c2a89</para>
 
 <refsect2 id='valid_options'><title>Valid options:</title>
 <variablelist remap='TP'>
@@ -81,7 +81,7 @@ zooming, panning, thumbnails and sorting images into collections.</para>
   </listitem>
   </varlistentry>
   <varlistentry>
-  <term><emphasis role='strong' remap='B'>-o</emphasis>:, <emphasis role='strong' remap='B'>--log-file</emphasis>:&lt;file&gt;</term>
+  <term><emphasis role='strong' remap='B'>-o</emphasis>, <emphasis role='strong' remap='B'>--log-file=</emphasis>&lt;file&gt;</term>
   <listitem>
 <para>save log data to file</para>
   </listitem>
@@ -93,7 +93,7 @@ zooming, panning, thumbnails and sorting images into collections.</para>
   </listitem>
   </varlistentry>
   <varlistentry>
-  <term><emphasis role='strong' remap='B'>-rh</emphasis>, <emphasis role='strong' remap='B'>--remote-help</emphasis></term>
+  <term><emphasis role='strong' remap='B'>--remote-help</emphasis></term>
   <listitem>
 <para>print remote command list</para>
   </listitem>
@@ -135,7 +135,7 @@ zooming, panning, thumbnails and sorting images into collections.</para>
   </listitem>
   </varlistentry>
   <varlistentry>
-  <term><emphasis role='strong' remap='B'>-g</emphasis>:, <emphasis role='strong' remap='B'>--grep</emphasis>:&lt;regexp&gt;</term>
+  <term><emphasis role='strong' remap='B'>-g</emphasis>, <emphasis role='strong' remap='B'>--grep=</emphasis>&lt;regexp&gt;</term>
   <listitem>
 <para>filter debug output</para>
   </listitem>
@@ -152,7 +152,7 @@ can be used to modify this behavior on an individual basis e.g.</para>
 <refsect2 id='remote_command_list'><title>Remote command list:</title>
 <variablelist remap='TP'>
   <varlistentry>
-  <term><emphasis role='strong' remap='B'>--action</emphasis>:&lt;ACTION&gt;</term>
+  <term><emphasis role='strong' remap='B'>--action=</emphasis>&lt;ACTION&gt;</term>
   <listitem>
 <para>execute keyboard action (See Help/Reference/Remote Keyboard Actions)</para>
   </listitem>
@@ -176,55 +176,55 @@ can be used to modify this behavior on an individual basis e.g.</para>
   </listitem>
   </varlistentry>
   <varlistentry>
-  <term><emphasis role='strong' remap='B'>--config-load</emphasis>:&lt;FILE&gt;|layout ID</term>
+  <term><emphasis role='strong' remap='B'>--config-load=</emphasis>&lt;FILE&gt;|layout ID</term>
   <listitem>
 <para>load configuration from FILE</para>
   </listitem>
   </varlistentry>
   <varlistentry>
-  <term><emphasis role='strong' remap='B'>-cm</emphasis> <emphasis role='strong' remap='B'>--cache-metadata</emphasis></term>
+  <term><emphasis role='strong' remap='B'>--cache-metadata</emphasis></term>
   <listitem>
 <para>clean the metadata cache</para>
   </listitem>
   </varlistentry>
   <varlistentry>
-  <term><emphasis role='strong' remap='B'>-cr</emphasis>: <emphasis role='strong' remap='B'>--cache-render</emphasis>:&lt;folder&gt;</term>
+  <term><emphasis role='strong' remap='B'>--cache-render=</emphasis>&lt;folder&gt;</term>
   <listitem>
 <para>render thumbnails</para>
   </listitem>
   </varlistentry>
   <varlistentry>
-  <term><emphasis role='strong' remap='B'>-crr</emphasis>: <emphasis role='strong' remap='B'>--cache-render-recurse</emphasis>:&lt;folder&gt;</term>
+  <term><emphasis role='strong' remap='B'>--cache-render-recurse=</emphasis>&lt;folder&gt;</term>
   <listitem>
 <para>render thumbnails recursively</para>
   </listitem>
   </varlistentry>
   <varlistentry>
-  <term><emphasis role='strong' remap='B'>-crs</emphasis>: <emphasis role='strong' remap='B'>--cache-render-shared</emphasis>:&lt;folder&gt;</term>
+  <term><emphasis role='strong' remap='B'>--cache-render-shared=</emphasis>&lt;folder&gt;</term>
   <listitem>
 <para>render thumbnails (see Help)</para>
   </listitem>
   </varlistentry>
   <varlistentry>
-  <term><emphasis role='strong' remap='B'>-crsr</emphasis>: <emphasis role='strong' remap='B'>--cache-render-shared-recurse</emphasis>:&lt;folder&gt;</term>
+  <term><emphasis role='strong' remap='B'>--cache-render-shared-recurse=</emphasis>&lt;folder&gt;</term>
   <listitem>
 <para>render thumbnails recursively (see Help)</para>
   </listitem>
   </varlistentry>
   <varlistentry>
-  <term><emphasis role='strong' remap='B'>-cs</emphasis>: <emphasis role='strong' remap='B'>--cache-shared</emphasis>:clean|clear</term>
+  <term><emphasis role='strong' remap='B'>--cache-shared</emphasis>=<emphasis remap='I'>clean</emphasis>|clear</term>
   <listitem>
 <para>clean or clear shared thumbnail cache</para>
   </listitem>
   </varlistentry>
   <varlistentry>
-  <term><emphasis role='strong' remap='B'>-ct</emphasis>: <emphasis role='strong' remap='B'>--cache-thumbs</emphasis>:clean|clear</term>
+  <term><emphasis role='strong' remap='B'>--cache-thumbs</emphasis>=<emphasis remap='I'>clean</emphasis>|clear</term>
   <listitem>
 <para>clean or clear thumbnail cache</para>
   </listitem>
   </varlistentry>
   <varlistentry>
-  <term><emphasis role='strong' remap='B'>-d</emphasis> <emphasis role='strong' remap='B'>--delay=</emphasis>&lt;[H:][M:][N][.M]&gt;</term>
+  <term><emphasis role='strong' remap='B'>-d</emphasis> <emphasis role='strong' remap='B'>--delay=</emphasis>&lt;[H=][M=][N][.M]&gt;</term>
   <listitem>
 <para>set slide show delay to Hrs Mins N.M seconds</para>
   </listitem>
@@ -242,25 +242,25 @@ can be used to modify this behavior on an individual basis e.g.</para>
   </listitem>
   </varlistentry>
   <varlistentry>
-  <term><emphasis role='strong' remap='B'>--file</emphasis>:&lt;FILE&gt;|&lt;URL&gt;</term>
+  <term><emphasis role='strong' remap='B'>--file=</emphasis>&lt;FILE&gt;|&lt;URL&gt;</term>
   <listitem>
 <para>open FILE or URL, bring Geeqie window to the top</para>
   </listitem>
   </varlistentry>
   <varlistentry>
-  <term><emphasis role='strong' remap='B'>--File</emphasis>:&lt;FILE&gt;|&lt;URL&gt;</term>
+  <term><emphasis role='strong' remap='B'>--File=</emphasis>&lt;FILE&gt;|&lt;URL&gt;</term>
   <listitem>
 <para>open FILE or URL, do not bring Geeqie window to the top</para>
   </listitem>
   </varlistentry>
   <varlistentry>
-  <term><emphasis role='strong' remap='B'>-fs</emphasis> <emphasis role='strong' remap='B'>--fullscreen-start</emphasis></term>
+  <term><emphasis role='strong' remap='B'>--fullscreen-start</emphasis></term>
   <listitem>
 <para>start full screen</para>
   </listitem>
   </varlistentry>
   <varlistentry>
-  <term><emphasis role='strong' remap='B'>-fS</emphasis> <emphasis role='strong' remap='B'>--fullscreen-stop</emphasis></term>
+  <term><emphasis role='strong' remap='B'>--fullscreen-stop</emphasis></term>
   <listitem>
 <para>stop full screen</para>
   </listitem>
@@ -272,7 +272,7 @@ can be used to modify this behavior on an individual basis e.g.</para>
   </listitem>
   </varlistentry>
   <varlistentry>
-  <term><emphasis role='strong' remap='B'>--get-collection</emphasis>:&lt;COLLECTION&gt;</term>
+  <term><emphasis role='strong' remap='B'>--get-collection=</emphasis>&lt;COLLECTION&gt;</term>
   <listitem>
 <para>get collection content</para>
   </listitem>
@@ -284,7 +284,7 @@ can be used to modify this behavior on an individual basis e.g.</para>
   </listitem>
   </varlistentry>
   <varlistentry>
-  <term><emphasis role='strong' remap='B'>--get-destination</emphasis>:&lt;FILE&gt;</term>
+  <term><emphasis role='strong' remap='B'>--get-destination=</emphasis>&lt;FILE&gt;</term>
   <listitem>
 <para>get destination path of FILE (See Plugins Configuration)</para>
   </listitem>
@@ -296,13 +296,13 @@ can be used to modify this behavior on an individual basis e.g.</para>
   </listitem>
   </varlistentry>
   <varlistentry>
-  <term><emphasis role='strong' remap='B'>--get-filelist</emphasis>:[&lt;FOLDER&gt;]</term>
+  <term><emphasis role='strong' remap='B'>--get-filelist</emphasis>=<emphasis remap='I'>[</emphasis>&lt;FOLDER&gt;]</term>
   <listitem>
 <para>get list of files and class</para>
   </listitem>
   </varlistentry>
   <varlistentry>
-  <term><emphasis role='strong' remap='B'>--get-filelist-recurse</emphasis>:[&lt;FOLDER&gt;]</term>
+  <term><emphasis role='strong' remap='B'>--get-filelist-recurse</emphasis>=<emphasis remap='I'>[</emphasis>&lt;FOLDER&gt;]</term>
   <listitem>
 <para>get list of files and class recursive</para>
   </listitem>
@@ -326,7 +326,7 @@ can be used to modify this behavior on an individual basis e.g.</para>
   </listitem>
   </varlistentry>
   <varlistentry>
-  <term><emphasis role='strong' remap='B'>--get-sidecars</emphasis>:&lt;FILE&gt;</term>
+  <term><emphasis role='strong' remap='B'>--get-sidecars=</emphasis>&lt;FILE&gt;</term>
   <listitem>
 <para>get list of sidecars of FILE</para>
   </listitem>
@@ -338,7 +338,7 @@ can be used to modify this behavior on an individual basis e.g.</para>
   </listitem>
   </varlistentry>
   <varlistentry>
-  <term><emphasis role='strong' remap='B'>--id</emphasis>:&lt;ID&gt;</term>
+  <term><emphasis role='strong' remap='B'>--id=</emphasis>&lt;ID&gt;</term>
   <listitem>
 <para>window id for following commands</para>
   </listitem>
@@ -350,7 +350,7 @@ can be used to modify this behavior on an individual basis e.g.</para>
   </listitem>
   </varlistentry>
   <varlistentry>
-  <term><emphasis role='strong' remap='B'>--list-add</emphasis>:&lt;FILE&gt;</term>
+  <term><emphasis role='strong' remap='B'>--list-add=</emphasis>&lt;FILE&gt;</term>
   <listitem>
 <para>add FILE to command line collection list</para>
   </listitem>
@@ -362,7 +362,7 @@ can be used to modify this behavior on an individual basis e.g.</para>
   </listitem>
   </varlistentry>
   <varlistentry>
-  <term><emphasis role='strong' remap='B'>--lua</emphasis>:&lt;FILE&gt;,&lt;lua script&gt;</term>
+  <term><emphasis role='strong' remap='B'>--lua=</emphasis>&lt;FILE&gt;,&lt;lua script&gt;</term>
   <listitem>
 <para>run lua script on FILE</para>
   </listitem>
@@ -392,7 +392,7 @@ can be used to modify this behavior on an individual basis e.g.</para>
   </listitem>
   </varlistentry>
   <varlistentry>
-  <term><emphasis role='strong' remap='B'>--PWD</emphasis>:&lt;PWD&gt;</term>
+  <term><emphasis role='strong' remap='B'>--PWD=</emphasis>&lt;PWD&gt;</term>
   <listitem>
 <para>use PWD as working directory for following commands</para>
   </listitem>
@@ -410,7 +410,7 @@ can be used to modify this behavior on an individual basis e.g.</para>
   </listitem>
   </varlistentry>
   <varlistentry>
-  <term><emphasis role='strong' remap='B'>--selection-add</emphasis>:[&lt;FILE&gt;]</term>
+  <term><emphasis role='strong' remap='B'>--selection-add</emphasis>=<emphasis remap='I'>[</emphasis>&lt;FILE&gt;]</term>
   <listitem>
 <para>adds the current file (or the specified file) to the current selection</para>
   </listitem>
@@ -422,7 +422,7 @@ can be used to modify this behavior on an individual basis e.g.</para>
   </listitem>
   </varlistentry>
   <varlistentry>
-  <term><emphasis role='strong' remap='B'>--selection-remove</emphasis>:[&lt;FILE&gt;]</term>
+  <term><emphasis role='strong' remap='B'>--selection-remove</emphasis>=<emphasis remap='I'>[</emphasis>&lt;FILE&gt;]</term>
   <listitem>
 <para>removes the current file (or the specified file) from the current selection</para>
   </listitem>
@@ -434,19 +434,19 @@ can be used to modify this behavior on an individual basis e.g.</para>
   </listitem>
   </varlistentry>
   <varlistentry>
-  <term><emphasis role='strong' remap='B'>--slideshow-recurse</emphasis>:&lt;FOLDER&gt;</term>
+  <term><emphasis role='strong' remap='B'>--slideshow-recurse=</emphasis>&lt;FOLDER&gt;</term>
   <listitem>
 <para>start recursive slide show in FOLDER</para>
   </listitem>
   </varlistentry>
   <varlistentry>
-  <term><emphasis role='strong' remap='B'>-ss</emphasis> <emphasis role='strong' remap='B'>--slideshow-start</emphasis></term>
+  <term><emphasis role='strong' remap='B'>--slideshow-start</emphasis></term>
   <listitem>
 <para>start slide show</para>
   </listitem>
   </varlistentry>
   <varlistentry>
-  <term><emphasis role='strong' remap='B'>-sS</emphasis> <emphasis role='strong' remap='B'>--slideshow-stop</emphasis></term>
+  <term><emphasis role='strong' remap='B'>--slideshow-stop</emphasis></term>
   <listitem>
 <para>stop slide show</para>
   </listitem>
@@ -470,7 +470,7 @@ can be used to modify this behavior on an individual basis e.g.</para>
   </listitem>
   </varlistentry>
   <varlistentry>
-  <term><emphasis role='strong' remap='B'>--view</emphasis>:&lt;FILE&gt;</term>
+  <term><emphasis role='strong' remap='B'>--view=</emphasis>&lt;FILE&gt;</term>
   <listitem>
 <para>open FILE in new window</para>
 

diff --git a/geeqie.1 b/geeqie.1
index 071730a..def25f6 100644 (file)
--- a/geeqie.1
+++ b/geeqie.1
@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.49.3.
-.TH GEEQIE "1" "April 2024" "Geeqie 2.4+git20240402-d802d5f5 GTK3" "User Commands"
+.TH GEEQIE "1" "April 2024" "Geeqie 2.4+git20240413-2a5c2a89 GTK3" "User Commands"
 .SH NAME
 Geeqie - GTK based multiformat image viewer
 .SH SYNOPSIS
@@ -11,7 +11,7 @@ zooming, panning, thumbnails and sorting images into collections.
 
 Generated for version:
 .PP
-Geeqie 2.4+git20240402\-d802d5f5
+Geeqie 2.4+git20240413\-2a5c2a89
 .SS "Valid options:"
 .TP
 \fB\-\-blank\fR
@@ -37,13 +37,13 @@ show this message
 \fB\-n\fR, \fB\-\-new\-instance\fR
 open a new instance of Geeqie *
 .TP
-\fB\-o\fR:, \fB\-\-log\-file\fR:<file>
+\fB\-o\fR, \fB\-\-log\-file=\fR<file>
 save log data to file
 .TP
 \fB\-r\fR, \fB\-\-remote\fR
 send following commands to open window
 .TP
-\fB\-rh\fR, \fB\-\-remote\-help\fR
+\fB\-\-remote\-help\fR
 print remote command list
 .TP
 \fB\-s\fR, \fB\-\-slideshow\fR
@@ -64,7 +64,7 @@ show log window
 \fB\-\-debug\fR[=\fI\,level\/\fR]
 turn on debug output
 .TP
-\fB\-g\fR:, \fB\-\-grep\fR:<regexp>
+\fB\-g\fR, \fB\-\-grep=\fR<regexp>
 filter debug output
 .PP
 * Normally a single set of configuration files is used for all instances.
@@ -74,7 +74,7 @@ can be used to modify this behavior on an individual basis e.g.
 XDG_CONFIG_HOME=/tmp/a XDG_CACHE_HOME=/tmp/b geeqie
 .SS "Remote command list:"
 .TP
-\fB\-\-action\fR:<ACTION>
+\fB\-\-action=\fR<ACTION>
 execute keyboard action (See Help/Reference/Remote Keyboard Actions)
 .TP
 \fB\-\-action\-list\fR
@@ -86,31 +86,31 @@ previous image
 \fB\-\-close\-window\fR
 close window
 .TP
-\fB\-\-config\-load\fR:<FILE>|layout ID
+\fB\-\-config\-load=\fR<FILE>|layout ID
 load configuration from FILE
 .TP
-\fB\-cm\fR  \fB\-\-cache\-metadata\fR
+\fB\-\-cache\-metadata\fR
 clean the metadata cache
 .TP
-\fB\-cr\fR: \fB\-\-cache\-render\fR:<folder>
+\fB\-\-cache\-render=\fR<folder>
 render thumbnails
 .TP
-\fB\-crr\fR: \fB\-\-cache\-render\-recurse\fR:<folder>
+\fB\-\-cache\-render\-recurse=\fR<folder>
 render thumbnails recursively
 .TP
-\fB\-crs\fR: \fB\-\-cache\-render\-shared\fR:<folder>
+\fB\-\-cache\-render\-shared=\fR<folder>
 render thumbnails (see Help)
 .TP
-\fB\-crsr\fR: \fB\-\-cache\-render\-shared\-recurse\fR:<folder>
+\fB\-\-cache\-render\-shared\-recurse=\fR<folder>
 render thumbnails recursively (see Help)
 .TP
-\fB\-cs\fR: \fB\-\-cache\-shared\fR:clean|clear
+\fB\-\-cache\-shared\fR=\fI\,clean\/\fR|clear
 clean or clear shared thumbnail cache
 .TP
-\fB\-ct\fR: \fB\-\-cache\-thumbs\fR:clean|clear
+\fB\-\-cache\-thumbs\fR=\fI\,clean\/\fR|clear
 clean or clear thumbnail cache
 .TP
-\fB\-d\fR   \fB\-\-delay=\fR<[H:][M:][N][.M]>
+\fB\-d\fR   \fB\-\-delay=\fR<[H=][M=][N][.M]>
 set slide show delay to Hrs Mins N.M seconds
 .TP
 \fB\-\-first\fR
@@ -119,37 +119,37 @@ first image
 \fB\-f\fR   \fB\-\-fullscreen\fR
 toggle full screen
 .TP
-\fB\-\-file\fR:<FILE>|<URL>
+\fB\-\-file=\fR<FILE>|<URL>
 open FILE or URL, bring Geeqie window to the top
 .TP
-\fB\-\-File\fR:<FILE>|<URL>
+\fB\-\-File=\fR<FILE>|<URL>
 open FILE or URL, do not bring Geeqie window to the top
 .TP
-\fB\-fs\fR  \fB\-\-fullscreen\-start\fR
+\fB\-\-fullscreen\-start\fR
 start full screen
 .TP
-\fB\-fS\fR  \fB\-\-fullscreen\-stop\fR
+\fB\-\-fullscreen\-stop\fR
 stop full screen
 .TP
 \fB\-\-geometry=\fR<GEOMETRY>
 set window geometry
 .TP
-\fB\-\-get\-collection\fR:<COLLECTION>
+\fB\-\-get\-collection=\fR<COLLECTION>
 get collection content
 .TP
 \fB\-\-get\-collection\-list\fR
 get collection list
 .TP
-\fB\-\-get\-destination\fR:<FILE>
+\fB\-\-get\-destination=\fR<FILE>
 get destination path of FILE (See Plugins Configuration)
 .TP
 \fB\-\-get\-file\-info\fR
 get file info
 .TP
-\fB\-\-get\-filelist\fR:[<FOLDER>]
+\fB\-\-get\-filelist\fR=\fI\,[\/\fR<FOLDER>]
 get list of files and class
 .TP
-\fB\-\-get\-filelist\-recurse\fR:[<FOLDER>]
+\fB\-\-get\-filelist\-recurse\fR=\fI\,[\/\fR<FOLDER>]
 get list of files and class recursive
 .TP
 \fB\-\-get\-rectangle\fR
@@ -161,25 +161,25 @@ get render intent
 \fB\-\-get\-selection\fR
 get list of selected files
 .TP
-\fB\-\-get\-sidecars\fR:<FILE>
+\fB\-\-get\-sidecars=\fR<FILE>
 get list of sidecars of FILE
 .TP
 \fB\-\-get\-window\-list\fR
 get window list
 .TP
-\fB\-\-id\fR:<ID>
+\fB\-\-id=\fR<ID>
 window id for following commands
 .TP
 \fB\-\-last\fR
 last image
 .TP
-\fB\-\-list\-add\fR:<FILE>
+\fB\-\-list\-add=\fR<FILE>
 add FILE to command line collection list
 .TP
 \fB\-\-list\-clear\fR
 clear command line collection list
 .TP
-\fB\-\-lua\fR:<FILE>,<lua script>
+\fB\-\-lua=\fR<FILE>,<lua script>
 run lua script on FILE
 .TP
 \fB\-\-new\-window\fR
@@ -194,7 +194,7 @@ print pixel info of mouse pointer on current image
 \fB\-\-print0\fR
 terminate returned data with null character instead of newline
 .TP
-\fB\-\-PWD\fR:<PWD>
+\fB\-\-PWD=\fR<PWD>
 use PWD as working directory for following commands
 .TP
 \fB\-q\fR   \fB\-\-quit\fR
@@ -203,25 +203,25 @@ quit
 \fB\-\-raise\fR
 bring the Geeqie window to the top
 .TP
-\fB\-\-selection\-add\fR:[<FILE>]
+\fB\-\-selection\-add\fR=\fI\,[\/\fR<FILE>]
 adds the current file (or the specified file) to the current selection
 .TP
 \fB\-\-selection\-clear\fR
 clears the current selection
 .TP
-\fB\-\-selection\-remove\fR:[<FILE>]
+\fB\-\-selection\-remove\fR=\fI\,[\/\fR<FILE>]
 removes the current file (or the specified file) from the current selection
 .TP
 \fB\-s\fR   \fB\-\-slideshow\fR
 toggle slide show
 .TP
-\fB\-\-slideshow\-recurse\fR:<FOLDER>
+\fB\-\-slideshow\-recurse=\fR<FOLDER>
 start recursive slide show in FOLDER
 .TP
-\fB\-ss\fR  \fB\-\-slideshow\-start\fR
+\fB\-\-slideshow\-start\fR
 start slide show
 .TP
-\fB\-sS\fR  \fB\-\-slideshow\-stop\fR
+\fB\-\-slideshow\-stop\fR
 stop slide show
 .TP
 \fB\-\-tell\fR
@@ -233,7 +233,7 @@ show tools
 \fB\-t\fR   \fB\-\-tools\-hide\fR
 hide tools
 .TP
-\fB\-\-view\fR:<FILE>
+\fB\-\-view=\fR<FILE>
 open FILE in new window
 .IP
 All other command line parameters are used as plain files if they exist.

diff --git a/scripts/lua-test.sh b/scripts/lua-test.sh
index 4e1feb5..37d94f4 100755 (executable)
--- a/scripts/lua-test.sh
+++ b/scripts/lua-test.sh
@@ -69,7 +69,7 @@ done
 sleep 2
 
 base_lua=$(basename "$lua_test_file")
-result=$(xvfb-run --auto-servernum "$1" --remote --lua:"$lua_test_image","$base_lua")
+result=$(xvfb-run --auto-servernum "$1" --remote --lua="$lua_test_image","$base_lua")
 xvfb-run --auto-servernum "$1" --remote --quit
 
 ## @FIXME Running on GitHub gives additional dbind-WARNINGs. The data required is the last n lines.

diff --git a/src/main.cc b/src/main.cc
index a0b7332..7e4b86a 100644 (file)
--- a/src/main.cc
+++ b/src/main.cc
@@ -438,21 +438,21 @@ static void parse_command_line(gint argc, gchar *argv[])
                                {
                                command_line->log_window_show = TRUE;
                                }
-                       else if (strncmp(cmd_line, "-o:", 3) == 0)
+                       else if (strncmp(cmd_line, "-o", 2) == 0)
                                {
-                               command_line->log_file = g_strdup(cmd_line + 3);
+                               command_line->log_file = g_strdup(cmd_line + 2);
                                }
-                       else if (strncmp(cmd_line, "--log-file:", 11) == 0)
+                       else if (strncmp(cmd_line, "--log-file=", 11) == 0)
                                {
                                command_line->log_file = g_strdup(cmd_line + 11);
                                }
-                       else if (strncmp(cmd_line, "-g:", 3) == 0)
+                       else if (strncmp(cmd_line, "-g", 2) == 0)
                                {
-                               set_regexp(g_strdup(cmd_line+3));
+                               set_regexp(g_strdup(cmd_line + 2));
                                }
-                       else if (strncmp(cmd_line, "-grep:", 6) == 0)
+                       else if (strncmp(cmd_line, "--grep=", 7) == 0)
                                {
-                               set_regexp(g_strdup(cmd_line+3));
+                               set_regexp(g_strdup(cmd_line + 7));
                                }
                        else if (strncmp(cmd_line, "-n", 2) == 0)
                                {
@@ -462,8 +462,7 @@ static void parse_command_line(gint argc, gchar *argv[])
                                {
                                command_line->new_instance = TRUE;
                                }
-                       else if (strcmp(cmd_line, "-rh") == 0 ||
-                                strcmp(cmd_line, "--remote-help") == 0)
+                       else if (strcmp(cmd_line, "--remote-help") == 0)
                                {
                                remote_help();
                                exit(0);
@@ -492,9 +491,9 @@ static void parse_command_line(gint argc, gchar *argv[])
                                print_term(FALSE, _("  -h, --help                       show this message\n"));
                                print_term(FALSE, _("  -l, --list [files] [collections] open collection window for command line\n"));
                                print_term(FALSE, _("  -n, --new-instance               open a new instance of Geeqie *\n"));
-                               print_term(FALSE, _("  -o:, --log-file:<file>           save log data to file\n"));
+                               print_term(FALSE, _("  -o, --log-file=<file>            save log data to file\n"));
                                print_term(FALSE, _("  -r, --remote                     send following commands to open window\n"));
-                               print_term(FALSE, _("  -rh, --remote-help               print remote command list\n"));
+                               print_term(FALSE, _("      --remote-help                print remote command list\n"));
                                print_term(FALSE, _("  -s, --slideshow                  start in slideshow mode\n"));
                                print_term(FALSE, _("  -T, --with-tools                 force show of tools\n"));
                                print_term(FALSE, _("  -t, --without-tools              force hide of tools\n"));
@@ -502,7 +501,7 @@ static void parse_command_line(gint argc, gchar *argv[])
                                print_term(FALSE, _("  -w, --show-log-window            show log window\n"));
 #ifdef DEBUG
                                print_term(FALSE, _("      --debug[=level]              turn on debug output\n"));
-                               print_term(FALSE, _("  -g:, --grep:<regexp>             filter debug output\n"));
+                               print_term(FALSE, _("  -g, --grep=<regexp>              filter debug output\n"));
 #endif
 
                                print_term(FALSE, "\n");

diff --git a/src/remote.cc b/src/remote.cc
index e6e6de7..1a21c11 100644 (file)
--- a/src/remote.cc
+++ b/src/remote.cc
@@ -1718,67 +1718,67 @@ struct RemoteCommandEntry {
 };
 
 static RemoteCommandEntry remote_commands[] = {
-       /* short, long                  callback,               extra, prefer, parameter, description */
-       { nullptr, "--action:",          gr_action,            TRUE,  FALSE, N_("<ACTION>"), N_("execute keyboard action (See Help/Reference/Remote Keyboard Actions)") },
-       { nullptr, "--action-list",          gr_action_list,    FALSE,  FALSE, nullptr, N_("list available keyboard actions (some are redundant)") },
-       { "-b", "--back",               gr_image_prev,          FALSE, FALSE, nullptr, N_("previous image") },
-       { nullptr, "--close-window",       gr_close_window,        FALSE, FALSE, nullptr, N_("close window") },
-       { nullptr, "--config-load:",       gr_config_load,         TRUE,  FALSE, N_("<FILE>|layout ID"), N_("load configuration from FILE") },
-       { "-cm","--cache-metadata",      gr_cache_metadata,               FALSE, FALSE, nullptr, N_("clean the metadata cache") },
-       { "-cr:", "--cache-render:",    gr_cache_render,        TRUE, FALSE, N_("<folder>  "), N_(" render thumbnails") },
-       { "-crr:", "--cache-render-recurse:", gr_cache_render_recurse, TRUE, FALSE, N_("<folder> "), N_("render thumbnails recursively") },
-       { "-crs:", "--cache-render-shared:", gr_cache_render_standard, TRUE, FALSE, N_("<folder> "), N_(" render thumbnails (see Help)") },
-       { "-crsr:", "--cache-render-shared-recurse:", gr_cache_render_standard_recurse, TRUE, FALSE, N_("<folder>"), N_(" render thumbnails recursively (see Help)") },
-       { "-cs:", "--cache-shared:",    gr_cache_shared,        TRUE, FALSE, N_("clean|clear"), N_("clean or clear shared thumbnail cache") },
-       { "-ct:", "--cache-thumbs:",    gr_cache_thumb,         TRUE, FALSE, N_("clean|clear"), N_("clean or clear thumbnail cache") },
-       { "-d", "--delay=",             gr_slideshow_delay,     TRUE,  FALSE, N_("<[H:][M:][N][.M]>"), N_("set slide show delay to Hrs Mins N.M seconds") },
-       { nullptr, "--first",              gr_image_first,         FALSE, FALSE, nullptr, N_("first image") },
-       { "-f", "--fullscreen",         gr_fullscreen_toggle,   FALSE, TRUE,  nullptr, N_("toggle full screen") },
-       { nullptr, "--file:",              gr_file_load,           TRUE,  FALSE, N_("<FILE>|<URL>"), N_("open FILE or URL, bring Geeqie window to the top") },
-       { nullptr, "file:",                gr_file_load,           TRUE,  FALSE, N_("<FILE>|<URL>"), N_("open FILE or URL, bring Geeqie window to the top") },
-       { nullptr, "--File:",              gr_file_load_no_raise,  TRUE,  FALSE, N_("<FILE>|<URL>"), N_("open FILE or URL, do not bring Geeqie window to the top") },
-       { nullptr, "File:",                gr_file_load_no_raise,  TRUE,  FALSE, N_("<FILE>|<URL>"), N_("open FILE or URL, do not bring Geeqie window to the top") },
-       { "-fs","--fullscreen-start",   gr_fullscreen_start,    FALSE, FALSE, nullptr, N_("start full screen") },
-       { "-fS","--fullscreen-stop",    gr_fullscreen_stop,     FALSE, FALSE, nullptr, N_("stop full screen") },
-       { nullptr, "--geometry=",          gr_geometry,            TRUE, FALSE, N_("<GEOMETRY>"), N_("set window geometry") },
-       { nullptr, "--get-collection:",    gr_collection,          TRUE,  FALSE, N_("<COLLECTION>"), N_("get collection content") },
-       { nullptr, "--get-collection-list", gr_collection_list,    FALSE, FALSE, nullptr, N_("get collection list") },
-       { nullptr, "--get-destination:",        gr_get_destination,     TRUE,  FALSE, N_("<FILE>"), N_("get destination path of FILE (See Plugins Configuration)") },
-       { nullptr, "--get-file-info",      gr_file_info,           FALSE, FALSE, nullptr, N_("get file info") },
-       { nullptr, "--get-filelist:",      gr_filelist,            TRUE,  FALSE, N_("[<FOLDER>]"), N_("get list of files and class") },
-       { nullptr, "--get-filelist-recurse:", gr_filelist_recurse, TRUE,  FALSE, N_("[<FOLDER>]"), N_("get list of files and class recursive") },
-       { nullptr, "--get-rectangle",      gr_rectangle,           FALSE, FALSE, nullptr, N_("get rectangle co-ordinates") },
-       { nullptr, "--get-render-intent",  gr_render_intent,       FALSE, FALSE, nullptr, N_("get render intent") },
-       { nullptr, "--get-selection",      gr_get_selection,       FALSE, FALSE, nullptr, N_("get list of selected files") },
-       { nullptr, "--get-sidecars:",      gr_get_sidecars,        TRUE,  FALSE, N_("<FILE>"), N_("get list of sidecars of FILE") },
-       { nullptr, "--get-window-list",    gr_window_list,         FALSE, FALSE, nullptr, N_("get window list") },
-       { nullptr, "--id:",                gr_lw_id,               TRUE, FALSE, N_("<ID>"), N_("window id for following commands") },
-       { nullptr, "--last",               gr_image_last,          FALSE, FALSE, nullptr, N_("last image") },
-       { nullptr, "--list-add:",          gr_list_add,            TRUE,  FALSE, N_("<FILE>"), N_("add FILE to command line collection list") },
-       { nullptr, "--list-clear",         gr_list_clear,          FALSE, FALSE, nullptr, N_("clear command line collection list") },
+       /* short,     long                    callback,                extra, prefer,  parameter,               description */
+       { nullptr, "--action=",               gr_action,               TRUE,  FALSE, N_("<ACTION>"),          N_("execute keyboard action (See Help/Reference/Remote Keyboard Actions)") },
+       { nullptr, "--action-list",           gr_action_list,          FALSE, FALSE, nullptr,                 N_("list available keyboard actions (some are redundant)") },
+       { "-b",    "--back",                  gr_image_prev,           FALSE, FALSE, nullptr,                 N_("previous image") },
+       { nullptr, "--close-window",          gr_close_window,         FALSE, FALSE, nullptr,                 N_("close window") },
+       { nullptr, "--config-load=",          gr_config_load,          TRUE,  FALSE, N_("<FILE>|layout ID"),  N_("load configuration from FILE") },
+       { nullptr, "--cache-metadata",        gr_cache_metadata,       FALSE, FALSE, nullptr,                 N_("clean the metadata cache") },
+       { nullptr, "--cache-render=",         gr_cache_render,         TRUE,  FALSE, N_("<folder>  "),        N_(" render thumbnails") },
+       { nullptr, "--cache-render-recurse=", gr_cache_render_recurse, TRUE,  FALSE, N_("<folder> "),         N_("render thumbnails recursively") },
+       { nullptr, "--cache-render-shared=",  gr_cache_render_standard,TRUE,  FALSE, N_("<folder> "),         N_(" render thumbnails (see Help)") },
+       { nullptr, "--cache-render-shared-recurse=", gr_cache_render_standard_recurse, TRUE, FALSE, N_("<folder>"), N_(" render thumbnails recursively (see Help)") },
+       { nullptr, "--cache-shared=",         gr_cache_shared,         TRUE,  FALSE, N_("clean|clear"),       N_("clean or clear shared thumbnail cache") },
+       { nullptr, "--cache-thumbs=",         gr_cache_thumb,          TRUE,  FALSE, N_("clean|clear"),       N_("clean or clear thumbnail cache") },
+       { "-d",    "--delay=",                gr_slideshow_delay,      TRUE,  FALSE, N_("<[H=][M=][N][.M]>"), N_("set slide show delay to Hrs Mins N.M seconds") },
+       { nullptr, "--first",                 gr_image_first,          FALSE, FALSE, nullptr,                 N_("first image") },
+       { "-f",    "--fullscreen",            gr_fullscreen_toggle,    FALSE, TRUE,  nullptr,                 N_("toggle full screen") },
+       { nullptr, "--file=",                 gr_file_load,            TRUE,  FALSE, N_("<FILE>|<URL>"),      N_("open FILE or URL, bring Geeqie window to the top") },
+       { nullptr, "file=",                   gr_file_load,            TRUE,  FALSE, N_("<FILE>|<URL>"),      N_("open FILE or URL, bring Geeqie window to the top") },
+       { nullptr, "--File=",                 gr_file_load_no_raise,   TRUE,  FALSE, N_("<FILE>|<URL>"),      N_("open FILE or URL, do not bring Geeqie window to the top") },
+       { nullptr, "File=",                   gr_file_load_no_raise,   TRUE,  FALSE, N_("<FILE>|<URL>"),      N_("open FILE or URL, do not bring Geeqie window to the top") },
+       { nullptr, "--fullscreen-start",      gr_fullscreen_start,     FALSE, FALSE, nullptr,                 N_("start full screen") },
+       { nullptr, "--fullscreen-stop",       gr_fullscreen_stop,      FALSE, FALSE, nullptr,                 N_("stop full screen") },
+       { nullptr, "--geometry=",             gr_geometry,             TRUE,  FALSE, N_("<GEOMETRY>"),        N_("set window geometry") },
+       { nullptr, "--get-collection=",       gr_collection,           TRUE,  FALSE, N_("<COLLECTION>"),      N_("get collection content") },
+       { nullptr, "--get-collection-list",   gr_collection_list,      FALSE, FALSE, nullptr,                 N_("get collection list") },
+       { nullptr, "--get-destination=",      gr_get_destination,      TRUE,  FALSE, N_("<FILE>"),            N_("get destination path of FILE (See Plugins Configuration)") },
+       { nullptr, "--get-file-info",         gr_file_info,            FALSE, FALSE, nullptr,                 N_("get file info") },
+       { nullptr, "--get-filelist=",         gr_filelist,             TRUE,  FALSE, N_("[<FOLDER>]"),        N_("get list of files and class") },
+       { nullptr, "--get-filelist-recurse=", gr_filelist_recurse,     TRUE,  FALSE, N_("[<FOLDER>]"),        N_("get list of files and class recursive") },
+       { nullptr, "--get-rectangle",         gr_rectangle,            FALSE, FALSE, nullptr,                 N_("get rectangle co-ordinates") },
+       { nullptr, "--get-render-intent",     gr_render_intent,        FALSE, FALSE, nullptr,                 N_("get render intent") },
+       { nullptr, "--get-selection",         gr_get_selection,        FALSE, FALSE, nullptr,                 N_("get list of selected files") },
+       { nullptr, "--get-sidecars=",         gr_get_sidecars,         TRUE,  FALSE, N_("<FILE>"),            N_("get list of sidecars of FILE") },
+       { nullptr, "--get-window-list",       gr_window_list,          FALSE, FALSE, nullptr,                 N_("get window list") },
+       { nullptr, "--id=",                   gr_lw_id,                TRUE,  FALSE, N_("<ID>"),              N_("window id for following commands") },
+       { nullptr, "--last",                  gr_image_last,           FALSE, FALSE, nullptr,                 N_("last image") },
+       { nullptr, "--list-add=",             gr_list_add,             TRUE,  FALSE, N_("<FILE>"),            N_("add FILE to command line collection list") },
+       { nullptr, "--list-clear",            gr_list_clear,           FALSE, FALSE, nullptr,                 N_("clear command line collection list") },
 #if HAVE_LUA
-       { nullptr, "--lua:",               gr_lua,                 TRUE, FALSE, N_("<FILE>,<lua script>"), N_("run lua script on FILE") },
+       { nullptr, "--lua=",                  gr_lua,                  TRUE,  FALSE, N_("<FILE>,<lua script>"), N_("run lua script on FILE") },
 #endif
-       { nullptr, "--new-window",         gr_new_window,          FALSE, FALSE, nullptr, N_("new window") },
-       { "-n", "--next",               gr_image_next,          FALSE, FALSE, nullptr, N_("next image") },
-       { nullptr, "--pixel-info",         gr_pixel_info,          FALSE, FALSE, nullptr, N_("print pixel info of mouse pointer on current image") },
-       { nullptr, "--print0",             gr_print0,              TRUE, FALSE, nullptr, N_("terminate returned data with null character instead of newline") },
-       { nullptr, "--PWD:",               gr_pwd,                 TRUE, FALSE, N_("<PWD>"), N_("use PWD as working directory for following commands") },
-       { "-q", "--quit",               gr_quit,                FALSE, FALSE, nullptr, N_("quit") },
-       { nullptr, "--raise",              gr_raise,               FALSE, FALSE, nullptr, N_("bring the Geeqie window to the top") },
-       { nullptr, "raise",                gr_raise,               FALSE, FALSE, nullptr, N_("bring the Geeqie window to the top") },
-       { nullptr, "--selection-add:",     gr_selection_add,       TRUE,  FALSE, N_("[<FILE>]"), N_("adds the current file (or the specified file) to the current selection") },
-       { nullptr, "--selection-clear",    gr_selection_clear,     FALSE, FALSE, nullptr, N_("clears the current selection") },
-       { nullptr, "--selection-remove:",  gr_selection_remove,    TRUE,  FALSE, N_("[<FILE>]"), N_("removes the current file (or the specified file) from the current selection") },
-       { "-s", "--slideshow",          gr_slideshow_toggle,    FALSE, TRUE,  nullptr, N_("toggle slide show") },
-       { nullptr, "--slideshow-recurse:", gr_slideshow_start_rec, TRUE,  FALSE, N_("<FOLDER>"), N_("start recursive slide show in FOLDER") },
-       { "-ss","--slideshow-start",    gr_slideshow_start,     FALSE, FALSE, nullptr, N_("start slide show") },
-       { "-sS","--slideshow-stop",     gr_slideshow_stop,      FALSE, FALSE, nullptr, N_("stop slide show") },
-       { nullptr, "--tell",               gr_file_tell,           FALSE, FALSE, nullptr, N_("print filename [and Collection] of current image") },
-       { "-T", "--tools-show",         gr_tools_show,          FALSE, TRUE,  nullptr, N_("show tools") },
-       { "-t", "--tools-hide",         gr_tools_hide,          FALSE, TRUE,  nullptr, N_("hide tools") },
-       { nullptr, "--view:",              gr_file_view,           TRUE,  FALSE, N_("<FILE>"), N_("open FILE in new window") },
-       { nullptr, "view:",                gr_file_view,           TRUE,  FALSE, N_("<FILE>"), N_("open FILE in new window") },
+       { nullptr, "--new-window",            gr_new_window,           FALSE, FALSE, nullptr,                 N_("new window") },
+       { "-n",    "--next",                  gr_image_next,           FALSE, FALSE, nullptr,                 N_("next image") },
+       { nullptr, "--pixel-info",            gr_pixel_info,           FALSE, FALSE, nullptr,                 N_("print pixel info of mouse pointer on current image") },
+       { nullptr, "--print0",                gr_print0,               TRUE,  FALSE, nullptr,                 N_("terminate returned data with null character instead of newline") },
+       { nullptr, "--PWD=",                  gr_pwd,                  TRUE,  FALSE, N_("<PWD>"),             N_("use PWD as working directory for following commands") },
+       { "-q",    "--quit",                  gr_quit,                 FALSE, FALSE, nullptr,                 N_("quit") },
+       { nullptr, "--raise",                 gr_raise,                FALSE, FALSE, nullptr,                 N_("bring the Geeqie window to the top") },
+       { nullptr, "raise",                   gr_raise,                FALSE, FALSE, nullptr,                 N_("bring the Geeqie window to the top") },
+       { nullptr, "--selection-add=",        gr_selection_add,        TRUE,  FALSE, N_("[<FILE>]"),          N_("adds the current file (or the specified file) to the current selection") },
+       { nullptr, "--selection-clear",       gr_selection_clear,      FALSE, FALSE, nullptr,                 N_("clears the current selection") },
+       { nullptr, "--selection-remove=",     gr_selection_remove,     TRUE,  FALSE, N_("[<FILE>]"),          N_("removes the current file (or the specified file) from the current selection") },
+       { "-s",    "--slideshow",             gr_slideshow_toggle,     FALSE, TRUE,  nullptr,                 N_("toggle slide show") },
+       { nullptr, "--slideshow-recurse=",    gr_slideshow_start_rec,  TRUE,  FALSE, N_("<FOLDER>"),          N_("start recursive slide show in FOLDER") },
+       { nullptr, "--slideshow-start",       gr_slideshow_start,      FALSE, FALSE, nullptr,                 N_("start slide show") },
+       { nullptr, "--slideshow-stop",        gr_slideshow_stop,       FALSE, FALSE, nullptr,                 N_("stop slide show") },
+       { nullptr, "--tell",                  gr_file_tell,            FALSE, FALSE, nullptr,                 N_("print filename [and Collection] of current image") },
+       { "-T",    "--tools-show",            gr_tools_show,           FALSE, TRUE,  nullptr,                 N_("show tools") },
+       { "-t",    "--tools-hide",                gr_tools_hide,           FALSE, TRUE,  nullptr,                 N_("hide tools") },
+       { nullptr, "--view=",                 gr_file_view,            TRUE,  FALSE, N_("<FILE>"),            N_("open FILE in new window") },
+       { nullptr, "view=",                   gr_file_view,            TRUE,  FALSE, N_("<FILE>"),            N_("open FILE in new window") },
        { nullptr, nullptr, nullptr, FALSE, FALSE, nullptr, nullptr }
 };