Alpha release: 20110505

configure

@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.67 for parallel 20110422.
+# Generated by GNU Autoconf 2.67 for parallel 20110505.
 #
 # Report bugs to <bug-parallel@gnu.org>.
 #
@@ -551,8 +551,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='parallel'
 PACKAGE_TARNAME='parallel'
-PACKAGE_VERSION='20110422'
+PACKAGE_VERSION='20110505'
-PACKAGE_STRING='parallel 20110422'
+PACKAGE_STRING='parallel 20110505'
 PACKAGE_BUGREPORT='bug-parallel@gnu.org'
 PACKAGE_URL=''
 
@@ -1168,7 +1168,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures parallel 20110422 to adapt to many kinds of systems.
+\`configure' configures parallel 20110505 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1234,7 +1234,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of parallel 20110422:";;
+     short | recursive ) echo "Configuration of parallel 20110505:";;
    esac
   cat <<\_ACEOF
 
@@ -1301,7 +1301,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-parallel configure 20110422
+parallel configure 20110505
 generated by GNU Autoconf 2.67
 
 Copyright (C) 2010 Free Software Foundation, Inc.
@@ -1318,7 +1318,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by parallel $as_me 20110422, which was
+It was created by parallel $as_me 20110505, which was
 generated by GNU Autoconf 2.67.  Invocation command line was
 
   $ $0 $@
@@ -2133,7 +2133,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='parallel'
- VERSION='20110422'
+ VERSION='20110505'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -2684,7 +2684,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by parallel $as_me 20110422, which was
+This file was extended by parallel $as_me 20110505, which was
 generated by GNU Autoconf 2.67.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -2746,7 +2746,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-parallel config.status 20110422
+parallel config.status 20110505
 configured by $0, generated by GNU Autoconf 2.67,
   with options \\"\$ac_cs_config\\"
 

configure.ac

@@ -1,4 +1,4 @@
-AC_INIT([parallel], [20110422], [bug-parallel@gnu.org])
+AC_INIT([parallel], [20110505], [bug-parallel@gnu.org])
 AM_INIT_AUTOMAKE([-Wall -Werror foreign])
 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_FILES([

doc/FUTURE_IDEAS

@@ -50,11 +50,22 @@ With GNU Parallel 'Pakistan' you can do this:
 
 time parallel convert -size {3} -quality {2} {1} {1.}_{3}_q{2}.jpg ::: *.png ::: 25 50 95 ::: 800 30
 
-You can also provide the arguments in a file:
+You can also provide the arguments in a file. This will do the same as above:
 
 (echo 25; echo 50; echo 95) > qualities
 ls *.png > png-files
-time parallel convert -size {3} -quality {2} {1} {1.}_{3}_q{2}.jpg :::: png-files :::: qualities ::: 800 30
+(echo 800; echo 30) > sizes
+time parallel convert -size {3} -quality {2} {1} {1.}_{3}_q{2}.jpg :::: png-files qualities sizes
+
+It is also possible to mix triple and quad colon. These will do the same as above:
+
+time parallel convert -size {3} -quality {2} {1} {1.}_{3}_q{2}.jpg :::: png-files ::: 25 50 95 ::: 800 30
+
+time parallel convert -size {3} -quality {2} {1} {1.}_{3}_q{2}.jpg :::: png-files ::: 25 50 95 :::: sizes
+
+The special file '-' reads from standard input. This will do the same as above:
+
+ls *.png | time parallel convert -size {3} -quality {2} {1} {1.}_{3}_q{2}.jpg :::: - ::: 25 50 95 :::: sizes
 
 
 Test with first argument == END_OF_FILE string

doc/release_new_version

@@ -163,8 +163,26 @@ Subject: GNU Parallel 2011XX22 ('Pakistan') released
 GNU Parallel 2011XX22 ('Pakistan') has been released. It is
 available for download at: http://ftp.gnu.org/gnu/parallel/
 
+This is a major release. So far GNU Parallel has been focused on
+replacing a single for-loop. The Pakistan release introduces ways to
+replace nested loops.
+
 New in this release:
 
+* Multiple ::: can be put on the command line and will be treated
+  similar to contents from multiple -a's.
+
+* ::: and :::: can now be mixed on the command line. Use {1} .. {n} to
+  refer to the arguments from the different arguments.
+
+* --xapply is now needed to get xapply's behaviour of reading one line
+  from arguments from each of multiple input files.
+
+* Multiple input source will cause all combinations of arguments from
+  the sources to be generated. E.g. ::: 1 2 ::: a b c will result in
+  the combinations (1,a) (1,b) (1,c) (2,a) (2,b) (2,c). This can often
+  replace nested loops.
+
 * Implemented {//} for the input line with the basename removed (dirname).
 
 * Using GNU Parallel with EC2. Thanks to Kevin Wu.

src/niceload

@@ -236,7 +236,7 @@ B<parallel>(1), B<nice>(1)
 use strict;
 use Getopt::Long;
 $Global::progname="niceload";
-$Global::version = 20110422;
+$Global::version = 20110505;
 Getopt::Long::Configure("bundling","require_order");
 get_options_from_array(\@ARGV) || die_usage();
 if($::opt_version) {

src/parallel

@@ -404,7 +404,7 @@ sub get_options_from_array {
 sub parse_options {
     # Returns: N/A
     # Defaults:
-    $Global::version = 20110503;
+    $Global::version = 20110505;
     $Global::progname = 'parallel';
     $Global::infinity = 2**31;
     $Global::debug = 0;

src/parallel.pod

@@ -186,13 +186,14 @@ replacing nested for-loops.
 
 B<:::> and B<::::> can be mixed. So these are equivalent:
 
-  parallel echo {1} {2} {3} :::: <(seq 6 7) ::: 4 5 ::: 1 2 3
+  parallel echo {1} {2} {3} ::: 6 7 ::: 4 5 ::: 1 2 3
   parallel echo {1} {2} {3} :::: <(seq 6 7) <(seq 4 5) :::: <(seq 1 3)
   parallel -a <(seq 6 7) echo {1} {2} {3} :::: <(seq 4 5) :::: <(seq 1 3)
   parallel -a <(seq 6 7) -a <(seq 4 5) echo {1} {2} {3} ::: 1 2 3
   seq 6 7 | parallel -a - -a <(seq 4 5) echo {1} {2} {3} ::: 1 2 3
   seq 4 5 | parallel echo {1} {2} {3} :::: <(seq 6 7) - ::: 1 2 3
 
+
 =item B<::::> I<argfiles> (alpha testing)
 
 Another way to write B<-a> I<argfile1> B<-a> I<argfile2> ...
@@ -1169,7 +1170,7 @@ See also B<-m>.
 Exit if the size (see the B<-s> option) is exceeded.
 
 
-=item B<--xapply> (Unimplimented)
+=item B<--xapply> (alpha testing)
 
 Read multiple files like B<xapply>. If multiple B<-a> are given, one
 line will be read from each of the files. The arguments can be
@@ -1177,6 +1178,11 @@ accessed in the command as B<{1}> .. B<{>I<n>B<}>, so B<{1}> will be a
 line from the first file, and B<{6}> will refer to the line with the
 same line number from the 6th file.
 
+Compare these two:
+
+  parallel echo {1} {2} ::: 1 2 3 ::: a b c
+  parallel --xapply echo {1} {2} ::: 1 2 3 ::: a b c
+
 
 =item B<--shebang>
 

src/sql

@@ -536,7 +536,7 @@ $Global::Initfile && unlink $Global::Initfile;
 exit ($err);
 
 sub parse_options {
-    $Global::version = 20110422;
+    $Global::version = 20110505;
     $Global::progname = 'sql';
 
     # This must be done first as this may exec myself