1 files changed, 217 insertions, 181 deletions

diff --git a/renrot b/renrot
index 722d921..0b25b4c 100755
--- a/renrot
+++ b/renrot
@@ -373,6 +373,3 @@ sub getOptions {
 
-      # OTHERS
-      "backup!"              => \$backup,
-      "comment-file=s"       => \$comfile,
-      "config-file|c=s"      => \$configFile,
+      # RENAMIMG
       "counter-fixed-field!" => \$countFF,
@@ -380,2 +377,19 @@ sub getOptions {
       "counter-step=i"       => \$countStep,
+      "no-rename|norename"   => \$noRename,
+
+      # ROTATIMG
+      "no-rotate|norotate"   => \$noRotation,
+      "only-orientation"     => \$orientTag,
+      "rotate-angle|r=i"     => \$rotateAngle,
+      "rotate-thumb=i"       => \$rotateThumbnail,
+
+      # TAG WRITER
+      "comment-file=s"       => \$comfile,
+      "no-tags|notags"       => \$noTags,
+      "tag|t=s"              => \@tmpTags,
+      "user-comment=s"       => \$userComment,
+
+      # OTHERS
+      "backup!"              => \$backup,
+      "config-file|c=s"      => \$configFile,
       "dry-run"              => \$dryRun,
@@ -385,13 +399,5 @@ sub getOptions {
       "help|?"               => sub { usage(0, 2) },
-      "no-rename|norename"   => \$noRename,
-      "no-rotate|norotate"   => \$noRotation,
-      "no-tags|notags"       => \$noTags,
       "no-renrot|nochg"      => \$noRenRoTagMtm,
-      "only-orientation"     => \$orientTag,
       "quiet|q"              => \$quiet,
-      "rotate-angle|r=i"     => \$rotateAngle,
-      "rotate-thumb=i"       => \$rotateThumbnail,
       "sub-fileset=s"        => \$subFileSet,
-      "tag|t=s"              => \@tmpTags,
-      "user-comment=s"       => \$userComment,
       "v+"                   => \$verbose,
@@ -1948,67 +1954,43 @@ case-sensitive.
 
-=item B<-n> or B<--name-template> I<TEMPLATE>
-
-A template to use for creating new file names while renaming. It can also be
-defined in the configuration file (variable Name Template). The default is
-I<%Y%m%d%H%M%S>. For practical uses, see L</TEMPLATE EXAMPLES> section.
-
-Interpreted sequences are:
-
-=over
-
-B<%%>   a literal %
-
-B<%#>   a literal #
-
-B<%C>   Numeric part of the original file name. Implemented for the sake
-of cameras, that do not supply FileNumber EXIF tag (currently all makes,
-except I<Canon>). Such cameras generate file names starting with letters
-and ended with digits. No other symbols are allowed in file names, except
-C<->, C<.> and C<_>.
-
-B<%c>   Ordinal number of file in the processed file set (see also
-B<--counter-fixed-field> option).
-
-B<%d>   Day of month (01-31).
+=item B<--mtime>, B<--no-mtime>
 
-B<%E>   The value of ExposureTime tag, if defined.
+Defines whether to set the file's mtime, using DateTimeOriginal tag value.
+Use B<--no-mtime> to set it to current time stamp after processing.
 
-B<%e>   Old file extension
+=item B<--no-renrot> or B<--nochg>
 
-B<%F>   The value of FNumber tag, if defined.
+Do not rename, rotate, tag and mtime images. It saves files from any changes
+while allows to do aggregation, contact sheet generation e.t.c.
 
-B<%H>   Hour (00-23).
+=item B<--use-color>, B<--no-use-color>
 
-B<%I>   The value of ISO tag, if defined.
+Colorize output. This does NOT work under Windows.
 
-B<%i>   FileNumber tag if exists (otherwise, it is replaced by string
-C<NA>).
+=item B<--dry-run>
 
-B<%M>   Minute (00-59).
+Do not do anything, only print would have been done.
 
-B<%m>   Month (01-12).
+=item B<-g> or B<--generate-thumb>
 
-B<%n>   Previous filename (the one before B<renrot> started processing).
+Generation and writing ThumbnailImage tag. The original value of the ThumbnailImage
+tag remains intact. To rewrite it you need to delete it first (look exiftool examples).
 
-B<%O>   Base part of the original filename (see B<%o>). In other words, the
-first part from the beginning to the last dot character.
+=item B<--use-ipc>, B<--no-use-ipc>
 
-B<%o>   The name file had before it was processed by B<renrot> for the first
-time. If the file was processed only once, the tag RenRotFileNameOriginal is
-set to the original file name.
+Rotate thumbnails using pipe, rather than files. This does NOT work under
+Windows.
 
-B<%S>   Second (00-59)
+=item B<-v>
 
-B<%W>   The value of WhiteBalance tag, if defined.
+Increase debugging level by 1. Debugging levels from 1 to 4 are internal
+levels, the levels from 5 till 9 are equivalent to levels 1-5 levels ExifTool
+with the maximum verbosity for B<renrot>.
 
-B<%Y>   Year with the century (1900, 1901, and so on)
+=item B<-?> or B<--help>
 
-B<%y>   Year without a century (00..99)
+Display short usage summary and exit.
 
-You can use value of any EXIF tag to be included as name part. To do that you
-need to embrace tag name with sign B<"#">, while building name template
-(see L</TEMPLATE EXAMPLES>).
+=item B<--version>
 
-Be careful, since any binary EXIF (like ThumbnaiImage) can produce totally
-unexpected results.
+Output version information and exit.
 
@@ -2016,76 +1998,5 @@ unexpected results.
 
-=item B<--no-rename>
-
-Do not rename files (default is to rename them to YYYYmmddHHMMSS.ext)
-
-=item B<--counter-fixed-field>, B<--no-counter-fixed-field>
-
-Set fixed length for file counter, used in file name templates (see B<%c>).
-It is enabled by default. Use B<--no-counter-fixed-field> to undo its effect.
-
-=item B<--counter-start> I<NUMBER>
-
-Initial value for the file counter (default is I<1>)
-
-=item B<--counter-step> I<NUMBER>
-
-Step to increment file counter with (default is I<1>)
-
-=item B<-r> or B<--rotate-angle> I<ANGLE>
-
-Define the angle to rotate files and thumbnails. Allowed values for I<ANGLE>
-are 90, 180 or 270. It is useful for files not having Orientation tag.
-
-=item B<--rotate-thumb> I<ANGLE>
-
-Rotate only thumbnails. Allowed values for I<ANGLE> are 90, 180 or 270 degrees.
-Use if the files which were already rotated, but their thumbnails were not.
-
-=item B<--only-orientation>
-
-Rotate by changing the value of Orientation tag, no real rotation will be
-made. The sequence of values to rotate an image from normal (0 degrees) by
-90 degrees clockwise is: 0 -> 90 -> 180 -> 270 -> 0. It means. set Orientation
-tag to 90cw after the first rotation, and increase that value by 90 each time
-the rotation is applied. For 270cw the rotation algorithm uses the reverted
-sequence. Rotation by 180cw triggers values in two pairs: 0 <-> 180
-and 90 <-> 270. This option cannot be applied to mirror values of Orientation
-tag.
-
-=item B<--trim>, B<--no-trim>
-
-Pass the C<-trim> option to L<jpegtran(1)>, to trim if needed. By default,
-trimming is enabled. Use B<--no-trim> to disable it.
-
-=item B<--no-rotate>
-
-Do not rotate images (default is to rotate according to EXIF data).
-
-=item B<--mtime>, B<--no-mtime>
+=head1 B<AGGREGATION>
 
-Defines whether to set the file's mtime, using DateTimeOriginal tag value.
-Use B<--no-mtime> to set it to current time stamp after processing.
-
-=item B<--no-renrot> or B<--nochg>
-
-Do not rename, rotate, tag and mtime images. It saves files from any changes
-while allows to do aggregation, contact sheet generation e.t.c.
-
-=item B<--keywords>, B<--no-keywords>
-
-Whether to fill Keywords tag. Default is to not. Be careful, since with this option
-enabled, the existing keywords are rewriten. The keywords are taken from
-F<.keywords> file or file specified with option B<--keywords-file>.
-
-=item B<-k> or B<--keywords-file> F<FILE>
-
-Path to the file with keywords. Its format is a keyword per line. The CR and
-LF symbols are removed. Empty (only whitespace) lines are ignored. Any leading
-and trailing whitespace is removed. For example, the line C<  _Test_  CRLF> is
-read as C<_Test_>.
-
-=item B<--keywords-replace>, B<--no-keywords-replace>
-
-Replace existing Keywords tag list rather than add new values to it. Default
-is not to replace.
+=over
 
@@ -2126,50 +2037,2 @@ directory tree created. Use B<--no-aggr-virtual> to prevent virtualization.
 
-=item B<--comment-file> F<FILE>
-
-File with commentaries. It is a low priority alias to I<TagFile = Comment: FILE>.
-
-=item B<--user-comment> I<STRING>
-
-A low priority alias to I<--tag UserComment: STRING>
-
-=item B<-t> or B<--tag> I<TAG>
-
-See the section L</TAGS>, for the detailed description
-
-=item B<--no-tags>
-
-No user's defined tags will be written.