Merging upstream version 4.23.0.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 80 insertions, 63 deletions

diff --git a/upstream/debian-unstable/man1/infotopam.1 b/upstream/debian-unstable/man1/infotopam.1
index f7d9ea37..b176dc78 100644
--- a/upstream/debian-unstable/man1/infotopam.1
+++ b/upstream/debian-unstable/man1/infotopam.1
@@ -3,7 +3,7 @@
 .\" Do not hand-hack it!  If you have bug fixes or improvements, please find
 .\" the corresponding HTML page on the Netpbm website, generate a patch
 .\" against that, and send it to the Netpbm maintainer.
-.TH "Infotopam User Manual" 1 "07 April 2004" "netpbm documentation"
+.TH "Infotopam User Manual" 1 "22 March 2024" "netpbm documentation"
 
 .SH NAME
 infotopam - convert Amiga .info icons to PAM
@@ -15,7 +15,8 @@ infotopam - convert Amiga .info icons to PAM
 [\fB-forcecolor\fP]
 [\fB-numcolors\fP \fInumcolors\fP]
 [\fB-selected\fP]
-[\fIindex color\fP ...]
+[\fB-verbose\fP]
+[\fIindex\fP \fIcolor\fP ...]
 [\fIfilename\fP]
 .PP
 Minimum unique abbreviation of option is acceptable.  You may use double
@@ -24,35 +25,31 @@ place of the equals sign to separate an option name from its value.
 
 .UN examples
 .SH EXAMPLES
-.PP
-By default, \fBinfotopam\fP converts the first icon in a .info file:
 
 .nf
-    infotopam amiga.info > amiga.first.pam
+  \f(CW
+    $ infotopam amiga.info > amiga.first.pam
+  \fP
 
 .fi
 .PP
-Use the \fI-selected\fP option to convert the second icon in a .info
-file.  Here \fBinfotopam\fP reads from Standard Input:
+Use the \fI-selected\fP option to convert the 'selected' version
+of the icon rather than the regular version.  Here \fBinfotopam\fP reads from
+Standard Input:
 
 .nf
+  \f(CW
     infotopam -selected < amiga.info > amiga.second.pam
+  \fP
 
 .fi
 .PP
-Use the \fI-forcecolor\fP option to force color conversion for a 1
-bit-plane .info file:
+Use \fI-numcolors\fP to change the colors.
 
 .nf
-    infotopam -forcecolor bw.info > bw.pam
-
-.fi
-.PP
-Use \fI-numcolors\fP to override colors for indexes 0 and 3.  Notice the
-two ways to specify the color:
-
-.nf
-    infotopam -numcolors 2 0 green 3 #FF0000 icon.info > icon.pam
+  \f(CW
+    infotopam -numcolors 2 0 green 3 rgb:FF/00/00 icon.info > icon.pam
+  \fP
 
 .fi
 .PP
@@ -60,10 +57,13 @@ Since Amiga monitors do not use square pixels, some icons may appear
 squished.  Filtering the output through \fBpamscale\fP can fix this:
 
 .nf
-     infotopam squish.info | pamtopnm | pamscale -yscale 1.7 > normal.pnm
+  \f(CW
+    $ infotopam squish.info | pamtopnm | pamscale -yscale 1.7 > normal.pnm
+  \fP
 
 .fi
 
+
 .UN description
 .SH DESCRIPTION
 .PP
@@ -71,76 +71,93 @@ This program is part of
 .BR "Netpbm" (1)\c
 \&.
 .PP
-\fBinfotopam\fP converts an Amiga .info (icon) file to a PAM image.
+\fBinfotopam\fP converts an Amiga .info (icon) image to a PAM image.
 \fBinfotopam\fP reads a .info file from \fIfilename\fP, or from Standard
 Input if you do not specify a file name, and writes the converted PAM image to
 Standard Output.
 .PP
-\fBinfotopam\fP currently handles 1 and 2 bit-plane icons.  If the .info
-icon only has 1 bit-plane, \fBinfotopam\fP generates a bitmap
-(black&white) PAM image; otherwise it generates a color PAM image.  You
-can force \fBinfotopam\fP to convert 1 bit-plane images to color PAM images by
-using the \fI-forcecolor\fP option.
+\fBinfotopam\fP handles 1- and 2 bit-plane icons.  If the .info icon has
+only 1 bit-plane, \fBinfotopam\fP generates a black and white PAM image;
+otherwise it generates a color PAM image.  In the latter case, you can choose
+the colors or keep the original Amiga standard colors.  You can
+force \fBinfotopam\fP to produce a color PAM with 1 bit-plane input with
+a \fB-forcecolor\fP option.
+  
 
 .UN options
 .SH OPTIONS
 .PP
-In addition to the options common to all programs based on libnetpbm
-(most notably \fB-quiet\fP, see 
+In addition to the options common to all programs based on libnetpbm (most
+notably \fB-quiet\fP, see 
 .UR index.html#commonoptions
  Common Options
 .UE
-\&), \fBinfotopam\fP recognizes the following
-command line options:
+\&), \fBinfotopam\fP recognizes the following command line options:
 
 
 .TP
-\fB-forcecolor\fP
-
-  
-.sp
-Forces \fBinfotopam\fP to convert 1 bit-plane icons to color PAM
-  images instead of bitmap PAM images.  \fBinfotopam\fP uses the index 2
-  color for black and the index 1 color for white (more on this
-  below).
-
-.TP
 \fB-numcolors\fP \fInumcolors\fP
+This causes the program to change the colors in the conversion.  A
+  2-bit-plane Amiga .icon image has four colors, numbered 0 through 3.
+  Those colors are as follows.
 
-  
-.sp
-Tells \fBinfotopam\fP how many colors to override.  Pixels in the
-  Amiga .info files are assigned an index value rather than a specific color.
-  The standard colors for a 2 bit-plane icon are:
 
-.nf
-    Index 0:  Blue   (00, 55, AA)
-    Index 1:  White  (FF, FF, FF)
-    Index 2:  Black  (00, 00, 20)
-    Index 3:  Orange (FF, 8A, 00)
+.TP
+0
+      
+Blue   (00, 55, AA)
+.TP
+1
+      
+White  (FF, FF, FF)
+.TP
+2
+      
+Black  (00, 00, 20)
+.TP
+3
+      
+Orange (FF, 8A, 00)
 
-.fi
 .sp
-To override the colors, first specify how many colors to override using
-  \fI-numcolors\fP, then specify an (\fIindex color\fP) pair for each color
-  you want to override, where \fIindex\fP is a value from 0 to 3 and
-  \fIcolor\fP the new color for that index.  Specify \fIcolor\fP as
-  described for the 
+To specify the changes, specify the number of colors you are changing
+    as the argument of \fB-numcolors\fP and for each color, specify a pair
+    of command line arguments, the first being the color index 0 through 3
+    and the second being the color to substitute.  Specify the color
+    (\fIcolor\fP) as described for the
+    
 .UR libnetpbm_image.html#colorname
-\fBpnm_parsecolor()\fP   argument
+argument of the     \fBpnm_parsecolor()\fP library routine
 .UE
 \&.
+.sp
+\fBThese arguments go before the input file name argument,
+    if any\fP.  This is an unusual syntax for a Netpbm program.
 
 .TP
 \fB-selected\fP
 
-  
-Tells \fBinfotopam\fP to convert the selected (second) icon instead of
-  the normal (first) icon.  Each Amiga .info icon file contains two icon
-  images.  The first image is the normal, unselected icon, and the second
-  image is the selected icon.  By default \fBinfotopam\fP converts the first
-  icon.  You can tell \fBinfotopam\fP to convert the second icon by using the
-  \fI-selected\fP option.
+    
+An Amiga .info image contains two versions of the icon: one for
+      regular display and one to display when the thing represented by
+      the icon is selected.  By default, \fBinfotopam\fP converts the
+      regular icon, but this option causes it to convert the selected icon
+      instead.
+
+.TP
+\fB-forcecolor\fP
+.sp
+This causes \fBinfotopam\fP to convert 1 bit-plane icons to color
+    PAM images instead of black and white.  The colors are the index 2
+    color for black and the index 1 color for white.
+
+.TP
+\fB-verbose\fP
+.sp
+This causes \fBinfotopam\fP to issue informational messages about
+    the conversion process.
+.sp
+This option was new in Netpbm 11.06 (March 2024).
 
 
 .PP