Remove certain command line options

Remove from the documentation the command line options that are not
preceded by a hyphen.

These are: file, File, raise, view

These options are still processed - just no longer shown in help/man.

diff --git a/doc/docbook/CommandLineOptions.xml b/doc/docbook/CommandLineOptions.xml
index 7288257..e3acac0 100644 (file)
--- a/doc/docbook/CommandLineOptions.xml
+++ b/doc/docbook/CommandLineOptions.xml
@@ -7,8 +7,8 @@
 <refmeta>
 <refentrytitle>GEEQIE</refentrytitle>
 <manvolnum>1</manvolnum>
 <refmeta>
 <refentrytitle>GEEQIE</refentrytitle>
 <manvolnum>1</manvolnum>

-<refmiscinfo class='source'>August 2023</refmiscinfo>
-<refmiscinfo class='manual'>Geeqie 2.1+git20230810-c41eb43c GTK3</refmiscinfo>
+<refmiscinfo class='source'>October 2023</refmiscinfo>
+<refmiscinfo class='manual'>Geeqie 2.1+git20231016-1a72d946 GTK3</refmiscinfo>

 </refmeta>
 <refnamediv>
 <refname>Geeqie</refname>
 </refmeta>
 <refnamediv>
 <refname>Geeqie</refname>


@@ -30,7 +30,7 @@ zooming, panning, thumbnails and sorting images into collections.</para>
 
 <para>Generated for version:</para>
 
 
 <para>Generated for version:</para>
 

-<para>Geeqie 2.1+git20230810-c41eb43c</para>
+<para>Geeqie 2.1+git20231016-1a72d946</para>

 
 <refsect2 id='valid_options'><title>Valid options:</title>
 <variablelist remap='TP'>
 
 <refsect2 id='valid_options'><title>Valid options:</title>
 <variablelist remap='TP'>


@@ -238,24 +238,12 @@ zooming, panning, thumbnails and sorting images into collections.</para>
   <varlistentry>
   <term><emphasis role='strong' remap='B'>--file</emphasis>:&lt;FILE&gt;|&lt;URL&gt;</term>
   <listitem>
   <varlistentry>
   <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>file:&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>
   <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>
   <listitem>

-<para>open FILE or URL, do not bring Geeqie window to the top</para>
-  </listitem>
-  </varlistentry>
-  <varlistentry>
-  <term>File:&lt;FILE&gt;|&lt;URL&gt;</term>
-  <listitem>

 <para>open FILE or URL, do not bring Geeqie window to the top</para>
   </listitem>
   </varlistentry>
 <para>open FILE or URL, do not bring Geeqie window to the top</para>
   </listitem>
   </varlistentry>


@@ -406,12 +394,6 @@ zooming, panning, thumbnails and sorting images into collections.</para>
   <varlistentry>
   <term><emphasis role='strong' remap='B'>--raise</emphasis></term>
   <listitem>
   <varlistentry>
   <term><emphasis role='strong' remap='B'>--raise</emphasis></term>
   <listitem>

-<para>bring the Geeqie window to the top</para>
-  </listitem>
-  </varlistentry>
-  <varlistentry>
-  <term>raise</term>
-  <listitem>

 <para>bring the Geeqie window to the top</para>
   </listitem>
   </varlistentry>
 <para>bring the Geeqie window to the top</para>
   </listitem>
   </varlistentry>


@@ -479,12 +461,6 @@ zooming, panning, thumbnails and sorting images into collections.</para>
   <term><emphasis role='strong' remap='B'>--view</emphasis>:&lt;FILE&gt;</term>
   <listitem>
 <para>open FILE in new window</para>
   <term><emphasis role='strong' remap='B'>--view</emphasis>:&lt;FILE&gt;</term>
   <listitem>
 <para>open FILE in new window</para>

-  </listitem>
-  </varlistentry>
-  <varlistentry>
-  <term>view:&lt;FILE&gt;</term>
-  <listitem>
-<para>open FILE in new window</para>

 
 <para>All other command line parameters are used as plain files if they exist.</para>
 
 
 <para>All other command line parameters are used as plain files if they exist.</para>
 

diff --git a/geeqie.1 b/geeqie.1
index 5fc6bc5..a8bcf25 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.
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.49.3.

-.TH GEEQIE "1" "August 2023" "Geeqie 2.1+git20230810-c41eb43c GTK3" "User Commands"
+.TH GEEQIE "1" "October 2023" "Geeqie 2.1+git20231016-1a72d946 GTK3" "User Commands"

 .SH NAME
 Geeqie - GTK based multiformat image viewer
 .SH SYNOPSIS
 .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
 
 Generated for version:
 .PP

-Geeqie 2.1+git20230810\-c41eb43c
+Geeqie 2.1+git20231016\-1a72d946

 .SS "Valid options:"
 .TP
 \fB\-\-blank\fR
 .SS "Valid options:"
 .TP
 \fB\-\-blank\fR


@@ -116,15 +116,9 @@ toggle full screen
 \fB\-\-file\fR:<FILE>|<URL>
 open FILE or URL, bring Geeqie window to the top
 .TP
 \fB\-\-file\fR:<FILE>|<URL>
 open FILE or URL, bring Geeqie window to the top
 .TP

-file:<FILE>|<URL>
-open FILE or URL, bring Geeqie window to the top
-.TP

 \fB\-\-File\fR:<FILE>|<URL>
 open FILE or URL, do not bring Geeqie window to the top
 .TP
 \fB\-\-File\fR:<FILE>|<URL>
 open FILE or URL, do not bring Geeqie window to the top
 .TP

-File:<FILE>|<URL>
-open FILE or URL, do not bring Geeqie window to the top
-.TP

 \fB\-fs\fR  \fB\-\-fullscreen\-start\fR
 start full screen
 .TP
 \fB\-fs\fR  \fB\-\-fullscreen\-start\fR
 start full screen
 .TP


@@ -200,9 +194,6 @@ quit
 \fB\-\-raise\fR
 bring the Geeqie window to the top
 .TP
 \fB\-\-raise\fR
 bring the Geeqie window to the top
 .TP

-raise
-bring the Geeqie window to the top
-.TP

 \fB\-\-selection\-add\fR:[<FILE>]
 adds the current file (or the specified file) to the current selection
 .TP
 \fB\-\-selection\-add\fR:[<FILE>]
 adds the current file (or the specified file) to the current selection
 .TP


@@ -235,9 +226,6 @@ hide tools
 .TP
 \fB\-\-view\fR:<FILE>
 open FILE in new window
 .TP
 \fB\-\-view\fR:<FILE>
 open FILE in new window

-.TP
-view:<FILE>
-open FILE in new window

 .IP
 All other command line parameters are used as plain files if they exist.
 .IP
 .IP
 All other command line parameters are used as plain files if they exist.
 .IP

diff --git a/src/remote.cc b/src/remote.cc
index db6096f..d333256 100644 (file)
--- a/src/remote.cc
+++ b/src/remote.cc
@@ -1809,10 +1809,11 @@ void remote_help()
                        {
                        s_opt_param = g_strdup(remote_commands[i].opt_s  ? remote_commands[i].opt_s : "" );
                        l_opt_param = g_strconcat(remote_commands[i].opt_l, remote_commands[i].parameter, NULL);
                        {
                        s_opt_param = g_strdup(remote_commands[i].opt_s  ? remote_commands[i].opt_s : "" );
                        l_opt_param = g_strconcat(remote_commands[i].opt_l, remote_commands[i].parameter, NULL);

-                       printf_term(FALSE, "  %-4s %-40s%-s\n",
-                                       s_opt_param,
-                                       l_opt_param,
-                                       _(remote_commands[i].description));
+
+                       if (g_str_has_prefix(l_opt_param, "--"))
+                               {
+                               printf_term(FALSE, "  %-4s %-40s%-s\n", s_opt_param, l_opt_param, _(remote_commands[i].description));
+                               }

                        g_free(s_opt_param);
                        g_free(l_opt_param);
                        }
                        g_free(s_opt_param);
                        g_free(l_opt_param);
                        }